@gandalan/weblibs 1.0.26 → 1.0.27

package/api/IDAS.js

@@ -1,4 +1,4 @@
-import { jwtTokenInvalid } from "./authUtils";
+import { isInvalid } from "./authUtils";
 import { RESTClient } from "./RESTClient";
 import jwt_decode from 'jwt-decode';
 
@@ -14,7 +14,7 @@ export function IDASFactory(settings)
     };
     settings = { ...defaultSettings, ...settings };
     let idas = undefined;
-    if (!jwtTokenInvalid(settings))
+    if (!isInvalid(settings))
     { 
         console.log("init: with JWT token");
         idas = new IDAS(settings);

package/api/RESTClient.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { jwtTokenInvalid, jwtTokenRenew } from "./authUtils";
+import { isInvalid, tryRenew } from "./authUtils";
 
 export class RESTClient {
     lastError = "";
@@ -23,8 +23,8 @@ export class RESTClient {
     }
 
     async checkTokenBeforeRequest(config) {
-        if (this.settings.jwtToken && jwtTokenInvalid(this.settings)) { // ignore custom/different JWT tokens
-            await jwtTokenRenew(this.settings);
+        if (this.settings.jwtToken && isInvalid(this.settings)) { // ignore custom/different JWT tokens
+            await tryRenew(this.settings);
             console.log(`Updating Header with new JWT Token: ${this.settings.jwtToken}`);
             this.axiosInstance.headers = {
                 "Authorization" : `Bearer ${ this.settings.jwtToken }`

package/api/authUtils.js

@@ -1,16 +1,51 @@
 import { RESTClient } from "./RESTClient";
 import jwt_decode from "jwt-decode";
 
+export async function initIDAS(appToken) {
+    
+    let jwtToken = "";
+    let mandantGuid = "";
+    let apiBaseurl = "https://api.dev.idas-cloudservices.net/api/";
+    let jwtRefreshToken = localStorage.getItem("IDAS_AuthJwtRefreshToken");
+
+    let urlParams = new URLSearchParams(location.search);
+    if (urlParams.has("m")) mandantGuid = urlParams.get("m");
+    if (urlParams.has("a")) apiBaseurl = urlParams.get("a");
+    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")
+    }
+
+    try {
+        await setup(settings);
+        if (isInvalid(settings))
+            redirectToLogin(settings, "/");
+    }
+    catch
+    {
+        redirectToLogin(settings, "/");
+    }
+    return settings;
+}
+
+
 export async function setup(settings)
 {
-    console.log("Setup");
+    console.log("Setup IDAS");
     if (!settings.jwtToken && !settings.jwtRefreshToken)
         throw("Either jwtToken or jwtRefreshToken must be set to authenticate");
 
-    if (settings.jwtRefreshToken && jwtTokenInvalid(settings))
+    if (settings.jwtRefreshToken && isInvalid(settings))
     {
-        await jwtTokenRenew(settings);
-        if (jwtTokenInvalid(settings))
+        await tryRenew(settings);
+        if (isInvalid(settings))
             console.log("Refresh failed, invalid JWT token!");
 
     } else {
@@ -27,7 +62,7 @@ export async function setup(settings)
     console.log("Setup finished", settings);
 }
 
-export function jwtTokenInvalid(settings)
+export function isInvalid(settings)
 {
     if (!settings.jwtToken) 
         return true;
@@ -38,7 +73,7 @@ export function jwtTokenInvalid(settings)
     return true;
 }
 
-export async function jwtTokenRenew(settings) 
+export async function tryRenew(settings) 
 {
     console.log("try to refresh");
     const renewSettings = { ...settings, jwtToken : undefined };
@@ -57,13 +92,13 @@ export async function jwtTokenRenew(settings)
         localStorage.setItem("IDAS_AuthJwtRefreshToken", refreshToken);
     }
 
-    if (jwtTokenInvalid(settings))
+    if (isInvalid(settings))
         console.log("Token is already expired!");
 }
 
-export function jwtAuthenticateOnBackend(settings, authPath) 
+export function redirectToLogin(settings, authPath) 
 {
-    localStorage.setItem("IDAS_AuthJwtCallbackPath", 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/index.js

@@ -9,10 +9,10 @@ import SaveButton from "./components/SaveButton.svelte";
 
 export {
     DataGrid, Datepicker, Inputbox, Dialog, GanTable,
-    AddButton, RemoveButton, SaveButton,
+    AddButton, RemoveButton, SaveButton
 }
 
 import { IDASFactory } from "./api/IDAS";
 import { RESTClient } from "./api/RESTClient";
-
-export { IDASFactory, RESTClient };
+import { initIDAS } from "./api/authUtils";
+export { IDASFactory, RESTClient, initIDAS };

package/package.json

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