@gandalan/weblibs 1.0.19 → 1.0.21

package/api/IDAS.js

@@ -40,14 +40,14 @@ class IDAS
             const token = this._self.settings.jwtToken;
             if (!token)
                 return [];
-            const decoded = jwt_decode(authJwtToken);
+            const decoded = jwt_decode(token);
             return decoded.rights;
         },
         getRoles() {
             const token = this._self.settings.jwtToken;
             if (!token)
                 return [];
-            const decoded = jwt_decode(authJwtToken);
+            const decoded = jwt_decode(token);
             return decoded.role;
         },
         hasRight(code)
@@ -61,8 +61,8 @@ class IDAS
         getUsername() {
             const token = this._self.settings.jwtToken;
             if (!token)
-                return [];
-            const decoded = jwt_decode(authJwtToken);
+                return undefined;
+            const decoded = jwt_decode(token);
             return decoded.id;
         }
     };

package/api/authUtils.js

@@ -9,22 +9,20 @@ export async function setup(settings)
 
     if (settings.jwtRefreshToken && jwtTokenInvalid(settings))
     {
-        const payload = { "Token" : settings.jwtRefreshToken };
-        // Fetch Token from IDAS API
-        let api = new RESTClient(settings);
-        const response = await api.put("Login/Update", payload);
-        const iat = response.data;
-        console.log("Got IDAS token: ", iat);
-
-        // If valid, check roles and authenticate against JWT API
-        if (iat)
-            await jwtTokenRenew(settings);
-        
+        await jwtTokenRenew(settings);
         if (jwtTokenInvalid(settings))
-            console.log("Attention: no valid JWT token!");
+            console.log("Refresh failed, invalid JWT token!");
 
     } else {
         console.log("Settings already have a valid JWT token, nothing to do");
+        let decoded = jwt_decode(settings.jwtToken);
+        let refreshToken = decoded["refreshToken"] || "";
+        if (refreshToken)
+        {
+            console.log("Got new refresh token:", refreshToken);
+            settings.jwtRefreshToken = refreshToken;
+            localStorage.setItem("IDAS_AuthJwtRefreshToken", refreshToken);
+        }
     }
     console.log("Setup finished", settings);
 }
@@ -42,6 +40,7 @@ export function jwtTokenInvalid(settings)
 
 export async function jwtTokenRenew(settings) 
 {
+    console.log("try to refresh");
     const renewSettings = { ...settings, jwtToken : undefined };
     let api = new RESTClient(renewSettings);
     const payload = { "Token" : settings.jwtRefreshToken };
@@ -55,6 +54,7 @@ export async function jwtTokenRenew(settings)
     {
         console.log("Got new refresh token:", refreshToken);
         settings.jwtRefreshToken = refreshToken;
+        localStorage.setItem("IDAS_AuthJwtRefreshToken", refreshToken);
     }
 
     if (jwtTokenInvalid(settings))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gandalan/weblibs",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "WebLibs for Gandalan JS/TS/Svelte projects",
   "keywords": [
     "gandalan"