Skip to content

Commit

Permalink
Adds option to disable storing roles in the DB
Browse files Browse the repository at this point in the history
This option defaults to 'true', which was the default behaviour before this change. When set to 'false', an empty array is stored instead of the actual roles.
  • Loading branch information
B_W_B committed Feb 23, 2022
1 parent 2e576f3 commit b3d7093
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
3 changes: 3 additions & 0 deletions config/jwtauthroles.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
// If enabled, stores every user in the database
'useDB' => env('FA_USE_DB', false),

// If enabled, stores the user's roles in the database
'storeRoles' => env('FA_STORE_ROLES', true),

// Only if useDB = true
// Column name in the users table where uuid should be stored.'
'userId' => env('FA_USR_ID', 'uuid'),
Expand Down
20 changes: 16 additions & 4 deletions src/JwtAuthRoles.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,22 +151,34 @@ public static function authUser(object $request)
if (config('jwtauthroles.autoCreateUser')) {
$user = JwtUser::firstOrNew([config('jwtauthroles.userId') => $claims->sub]);
$user[config('jwtauthroles.userId')] = $claims->sub;
$user->roles = json_encode($claims->roles);
if (config('jwtauthroles.storeRoles')){
$user->roles = json_encode($claims->roles);
} else {
$user->roles = json_encode(array());
}
$user->claims = json_encode($claims);
$user->save();
} else {
$user = JwtUser::where(config('jwtauthroles.userId'), '=', $claims->sub)->firstOrFail();
$user->roles = json_encode($claims->roles);
if (config('jwtauthroles.storeRoles')){
$user->roles = json_encode($claims->roles);
} else {
$user->roles = json_encode(array());
}
$user->claims = json_encode($claims);
$user->save();
}
} else {
$user = new JwtUser;
$user->uuid = $claims->sub;
$user->roles = $claims->roles;
if (config('jwtauthroles.storeRoles')){
$user->roles = $claims->roles;
} else {
$user->roles = json_encode(array());
}
$user->claims = $claims;
}

return $user;
}
}
}

0 comments on commit b3d7093

Please sign in to comment.