File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ public function __construct(
33
33
public function login (LoginRequest $ request )
34
34
{
35
35
$ user = User::where ('email ' , $ request ->email )
36
- ->with ('roles.permissions ' )
36
+ ->with ('roles.permissions ' , ' permissions ' )
37
37
->first ();
38
38
$ authData = $ this ->authService ->login (
39
39
$ user ,
Original file line number Diff line number Diff line change 4
4
5
5
use Illuminate \Http \Request ;
6
6
use Illuminate \Http \Resources \Json \JsonResource ;
7
+ use Illuminate \Http \Resources \MissingValue ;
7
8
8
9
class UserResource extends JsonResource
9
10
{
@@ -14,10 +15,14 @@ class UserResource extends JsonResource
14
15
*/
15
16
public function toArray (Request $ request ): array
16
17
{
17
- return [
18
+ $ isPermissionLoaded = !$ this ->whenLoaded ('permissions ' ) instanceof MissingValue;
19
+ $ data = [
18
20
...parent ::toArray ($ request ),
19
21
'roles ' => $ this ->whenLoaded ('roles ' ) ? $ this ->getRoleNames () : [],
20
- 'permissions ' => PermissionResource::collection ($ this ->whenLoaded ('permissions ' )),
21
22
];
23
+ if ($ isPermissionLoaded ) {
24
+ $ data ['permissions ' ] = PermissionResource::collection ($ this ->getPermissionsViaRoles ());
25
+ }
26
+ return $ data ;
22
27
}
23
28
}
You can’t perform that action at this time.
0 commit comments