@gandalan/weblibs 1.1.61 → 1.1.63

package/api/fluentApi.js

@@ -290,9 +290,12 @@ export function createApi() {
                 globalThis.idasTokens.token = this.token;
                 // eslint-disable-next-line no-undef
                 globalThis.idasTokens.refreshToken = this.refreshToken;
+                // eslint-disable-next-line no-undef
+                globalThis.idasTokens.userInfo = jwtDecode(this.token);
                 localStorage.setItem("idas-refresh-token", this.refreshToken);
             } catch (e) {
-                this.redirectToLogin();
+                //this.redirectToLogin();
+                console.error("not authenticated", e);
             }
         },
         
@@ -318,30 +321,7 @@ export function createApi() {
             if (!this.authUrl) {
                 throw new Error("authUrl not set");
             }
-        },
-
-        /**
-         * Redirect to the login page
-         *
-         * @param {string} [authPath=""]
-         * @private
-         */
-        redirectToLogin(authPath = "") {
-            if (!window) {
-                return;
-            }
-
-            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));
-
-            const url = new URL(this.authUrl);
-            url.pathname = "/Session";
-            url.search = `?a=${this.appToken}&r=${encodeURIComponent(authUrlCallback)}`;
-            let loginUrl = url.toString();
-
-            window.location.href = loginUrl;
-        },
+        }
     };
 }
 

package/api/fluentAuthBuilder.js

@@ -166,7 +166,7 @@ export function authBuilder() {
             }
 
             // eslint-disable-next-line no-undef
-            globalThis.idasTokens = { token: this.token, refreshToken: this.refreshToken, appToken: this.appToken };
+            globalThis.idasTokens = { token: this.token, refreshToken: this.refreshToken, appToken: this.appToken, userInfo: jwtDecode(this.token) };
         },
         
         /**
@@ -179,14 +179,13 @@ export function authBuilder() {
             }
 
             const redirectAfterAuth = new URL(window.location.href).origin;
-            let redirectUrl = `${redirectAfterAuth}?r=%target%&j=%jwt%&m=%mandant%`;
-            redirectUrl = redirectUrl.replace("%target%", encodeURIComponent(window.location.href));
-
+            //let redirectUrl = `${redirectAfterAuth}?r=%target%&j=%jwt%&m=%mandant%`;
+            //redirectUrl = redirectUrl.replace("%target%", encodeURIComponent(window.location.href));
+            let redirectUrl = `${redirectAfterAuth}?t=%token%`;
             const url = new URL(this.authUrl);
             url.pathname = "/Session";
             url.search = `?a=${this.appToken}&r=${encodeURIComponent(redirectUrl)}`;
             let loginUrl = url.toString();
-
             window.location.href = loginUrl;
         }
     };

package/package.json

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