Merge branch 'bug/stops-overwriting-roles-with-nothing'

365Werk · Feb 24, 2022 · 65d1a95 · 65d1a95
2 parents 9214509 + 0a09a2a
commit 65d1a95
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "werk365/jwtauthroles",
     "description": "Made to use fusionauth users in Laravel using JWT. Possible to either use pem keys directly or use the jwks endpoint.",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "license": "MIT",
     "authors": [
         {

diff --git a/src/JwtAuthRoles.php b/src/JwtAuthRoles.php
@@ -153,28 +153,26 @@ public static function authUser(object $request)
                 $user[config('jwtauthroles.userId')] = $claims->sub;
                 if (config('jwtauthroles.storeRoles')){
                     $user->roles = json_encode($claims->roles);
-                } else {
-                    $user->roles = json_encode(array());
+                } elseif (!$user->exists) {
+                    $user->roles = json_encode([]);
                 }
                 $user->claims = json_encode($claims);
                 $user->save();
             } else {
                 $user = JwtUser::where(config('jwtauthroles.userId'), '=', $claims->sub)->firstOrFail();
                 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;
-            if (config('jwtauthroles.storeRoles')){
+            if (config('jwtauthroles.storeRoles') && isset($claims->roles)){
                 $user->roles = $claims->roles;
             } else {
-                $user->roles = json_encode(array());
+                $user->roles = json_encode([]);
             }
             $user->claims = $claims;
         }