1.0.2

Small fixes

composer.json

@@ -1,13 +1,13 @@
 {
     "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.0.1",
+    "version": "1.0.2",
     "license": "MIT",
     "authors": [
         {
             "name": "Hergen Dillema",
             "email": "[email protected]",
-            "homepage": "https://365werk/nl"
+            "homepage": "https://365werk.nl"
         }
     ],
     "homepage": "https://github.com/365werk/jwtauthroles",

src/JwtAuthRoles.php

@@ -52,6 +52,10 @@ private static function jwkToPem(object $jwk): ?string
             'n' => new BigInteger(JWT::urlsafeB64Decode($jwk->n), 256),
         ]);
 
+        if($rsa->getPublicKey() ===  false){
+            return null;
+        }
+
         return $rsa->getPublicKey();
     }
 
@@ -107,6 +111,9 @@ private static function verifyToken(string $jwt, string $uri, bool $jwk = false)
         if (! $kid) {
             throw AuthException::auth(422, 'Malformed JWT');
         }
+
+        $row = null;
+
         if (config('jwtauthroles.cache.enabled')) {
             if (config('jwtauthroles.cache.type') === 'database') {
                 $row = JwtKey::where('kid', $kid)
@@ -125,8 +132,8 @@ private static function verifyToken(string $jwt, string $uri, bool $jwk = false)
         }
 
         if (config('jwtauthroles.cache.enabled')) {
-            if (config('jwtauthroles.cache.type') === 'database') {
-                $row = $row ?? JwtKey::create(['kid' => $kid, 'key' => $publicKey]);
+            if (config('jwtauthroles.cache.type') === 'database' && !$row) {
+                JwtKey::create(['kid' => $kid, 'key' => $publicKey]);
             }
         }
 

src/Middlewares/RoleMiddleware.php

@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $role)
         $user_roles = array_map('strtolower', Auth::user()->roles);
         $same = (array_intersect($roles, $user_roles));
 
-        if (! $same) {
+        if (empty($same)) {
             throw AuthException::auth('401', 'User does not have right roles');
         }