diff --git a/backend/app/Controller/api/v1/AuthController.php b/backend/app/Controller/api/v1/AuthController.php index db3429f..6cdde16 100644 --- a/backend/app/Controller/api/v1/AuthController.php +++ b/backend/app/Controller/api/v1/AuthController.php @@ -189,6 +189,7 @@ class AuthController extends AbstractController new OA\Property(property: 'id', type: 'integer'), new OA\Property(property: 'username', type: 'string'), new OA\Property(property: 'email', type: 'string'), + new OA\Property(property: 'role', type: 'string', example: 'administrator'), ], type: 'object'), ], type: 'object'), ]) @@ -254,6 +255,8 @@ class AuthController extends AbstractController $user->refresh_token_expires_at = Carbon::now()->addDays(30); $user->save(); + $user->load('role'); + OperationLogService::log( user_id: $user->id, action: 'auth.login', @@ -275,6 +278,7 @@ class AuthController extends AbstractController 'id' => $user->id, 'username' => $user->username, 'email' => $user->email, + 'role' => $user->role?->name ?? 'accessor', ], ], ]; diff --git a/backend/app/Model/User.php b/backend/app/Model/User.php index 87a5fee..abebba7 100644 --- a/backend/app/Model/User.php +++ b/backend/app/Model/User.php @@ -35,6 +35,15 @@ use Qbhy\HyperfAuth\Authenticatable; new OA\Property(property: 'role_id', type: 'integer', nullable: true, example: 1), new OA\Property(property: 'api_key_enabled', type: 'boolean', example: false), new OA\Property(property: 'ext', type: 'object', nullable: true, example: ['nickname' => 'user']), + new OA\Property( + property: 'role', + type: 'object', + nullable: true, + properties: [ + new OA\Property(property: 'id', type: 'integer', example: 1), + new OA\Property(property: 'name', type: 'string', example: 'administrator'), + ] + ), new OA\Property(property: 'refresh_token_expires_at', type: 'string', format: 'date-time', nullable: true), new OA\Property(property: 'created_at', type: 'string', format: 'date-time'), new OA\Property(property: 'updated_at', type: 'string', format: 'date-time'), diff --git a/frontend/src/components/UserFormModal.vue b/frontend/src/components/UserFormModal.vue index cea4149..4105b6d 100644 --- a/frontend/src/components/UserFormModal.vue +++ b/frontend/src/components/UserFormModal.vue @@ -167,7 +167,7 @@ function handleCancel() { - + {{ role.name }}