@gandalan/weblibs 1.0.28 → 1.0.30

package/api/IDAS.js

@@ -4,33 +4,22 @@ import jwt_decode from 'jwt-decode';
 
 export function IDASFactory(settings)
 {
-    /*let defaultSettings = {
-        appToken: localStorage.getItem("IDAS_AppToken"),
-        mandantGuid: localStorage.getItem("IDAS_MandantGuid"),
-        apiBaseurl: localStorage.getItem("IDAS_ApiBaseUrl"),
-        authUrl : localStorage.getItem("IDAS_ApiBaseUrl"),
-        jwtRefreshToken: localStorage.getItem("IDAS_AuthJwtRefreshToken"),
-        jwtCallbackPath: localStorage.getItem("IDAS_AuthJwtCallbackPath"),
-    };
-    settings = { ...defaultSettings, ...settings };*/
-    let idas = undefined;
     if (!isInvalid(settings))
     { 
-        console.log("init: with JWT token");
-        idas = new IDAS(settings);
+        return new IDAS(settings);
     } 
-    else throw("Invalid settings: call setup first to obtain a valid JWT token!");
-    return idas;
+    else throw("Invalid settings: call initIDAS() first to obtain a valid settings!");
 }
 
 class IDAS 
 {
     restClient = undefined;
-    mandantGuid = localStorage.getItem("IDAS_MandantGuid");
+    mandantGuid = undefined;
 
     constructor(settings) 
     {
         this.settings = settings;
+        this.mandantGuid = settings.mandantGuid; // for backwards compatiblity only
         this.restClient = new RESTClient(settings);
     }
 

package/api/authUtils.js

@@ -14,15 +14,7 @@ export async function initIDAS(appToken) {
     if (urlParams.has("j")) jwtToken = urlParams.get("j");
     if (urlParams.has("t")) jwtRefreshToken = urlParams.get("t");
 
-    let settings = {
-        appToken,
-        mandantGuid,
-        apiBaseurl,
-        jwtToken: jwtToken,
-        jwtRefreshToken,
-        //jwtCallbackPath: localStorage.getItem("IDAS_AuthJwtCallbackPath")
-    }
-
+    let settings = { appToken, mandantGuid, apiBaseurl, jwtToken, jwtRefreshToken };
     try {
         await setup(settings);
         if (isInvalid(settings))
@@ -35,7 +27,6 @@ export async function initIDAS(appToken) {
     return settings;
 }
 
-
 export async function setup(settings)
 {
     console.log("Setup IDAS");
@@ -95,13 +86,16 @@ export async function tryRenew(settings)
         localStorage.setItem("IDAS_AuthJwtRefreshToken", refreshToken);
     }
 
+    let mandantGuid = decoded["mandantGuid"] || "";
+    if (mandantGuid)
+        settings.mandantGuid = mandantGuid;
+
     if (isInvalid(settings))
         console.log("Token is already expired!");
 }
 
 export function redirectToLogin(settings, authPath) 
 {
-    //localStorage.setItem("IDAS_AuthJwtCallbackPath", authPath || "");
     const authEndpoint = (new URL(window.location.href).origin) + authPath;
     let authUrlCallback = `${authEndpoint}?r=%target%&j=%jwt%&m=%mandant%`;
     authUrlCallback = authUrlCallback.replace("%target%", encodeURIComponent(window.location.href));

package/package.json

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