Skip to content

Commit f17f971

Browse files
committed
updated user response
1 parent 83bed5f commit f17f971

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

app/Http/Controllers/Api/V1/Auth/AuthController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(
3333
public function login(LoginRequest $request)
3434
{
3535
$user = User::where('email', $request->email)
36-
->with('roles.permissions')
36+
->with('roles.permissions', 'permissions')
3737
->first();
3838
$authData = $this->authService->login(
3939
$user,

app/Http/Resources/Auth/UserResource.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Http\Request;
66
use Illuminate\Http\Resources\Json\JsonResource;
7+
use Illuminate\Http\Resources\MissingValue;
78

89
class UserResource extends JsonResource
910
{
@@ -14,10 +15,14 @@ class UserResource extends JsonResource
1415
*/
1516
public function toArray(Request $request): array
1617
{
17-
return [
18+
$isPermissionLoaded = !$this->whenLoaded('permissions') instanceof MissingValue;
19+
$data = [
1820
...parent::toArray($request),
1921
'roles' => $this->whenLoaded('roles') ? $this->getRoleNames() : [],
20-
'permissions' => PermissionResource::collection($this->whenLoaded('permissions')),
2122
];
23+
if ($isPermissionLoaded) {
24+
$data['permissions'] = PermissionResource::collection($this->getPermissionsViaRoles());
25+
}
26+
return $data;
2227
}
2328
}

0 commit comments

Comments
 (0)