@gandalan/weblibs 1.1.55 → 1.1.59

package/api/fluentApi.js

@@ -197,6 +197,8 @@ export function createApi() {
             this.token = globalThis.idasTokens.token; 
             // eslint-disable-next-line no-undef
             this.refreshToken = globalThis.idasTokens.refreshToken; 
+            // eslint-disable-next-line no-undef
+            this.appToken = globalThis.idasTokens.appToken;
             return this;
         },
         

package/api/fluentAuthBuilder.js

@@ -7,12 +7,15 @@ import { isTokenValid, getRefreshToken } from "./fluentApi";
  * @property {string} appToken - The application token.
  * @property {string} token - The JWT token.
  * @property {string} refreshToken - The refresh token.
- * @property {function(string) : FluentApi} useAppToken - Sets the application token and returns the FluentApi object.
- * @property {function(string) : FluentApi} useBaseUrl - Sets the base URL for authentication and returns the FluentApi object.
- * @property {function(string) : FluentApi} useToken - Sets the JWT token and returns the FluentApi object.
- * @property {function(string) : FluentApi} useRefreshToken - Sets the refresh token and returns the FluentApi object.
- * @property {Function} authenticate - Authenticates the user with username and password, or refreshes the token.
+ * @property {function(string) : FluentAuth} useAppToken - Sets the application token and returns the FluentApi object.
+ * @property {function(string) : FluentAuth} useBaseUrl - Sets the base URL for authentication and returns the FluentApi object.
+ * @property {function(string|null) : FluentAuth} useToken - Sets the JWT token and returns the FluentApi object.
+ * @property {function(string|null) : FluentAuth} useRefreshToken - Sets the refresh token and returns the FluentApi object.
+ * @property {function() : string} authenticate - Authenticates the user with username and password, or refreshes the token.
  * @property {Function} tryRefreshToken - Attempts to refresh the authentication token using the refresh token.
+ * @property {Function} redirectToLogin - Redirects to the login page.
+ * @property {Function} init - Initializes the authentication object.
+ * @property {function(string,string) : string} login - Logs in with the provided credentials.
  */
 
 /**
@@ -68,14 +71,12 @@ export function authBuilder() {
         },
 
         /**
-         * Authenticates the user with username and password, or refreshes the token.
-         *
-         * @param {string} username
-         * @param {string} password
-         * @returns
+         * Authenticates the user with the JWT token or refreshes the token with 
+         * the refreshToken set before
+         * @return {string} the JWT token
          */
-        async authenticate(username = "", password = "") {
-            console.log("authenticating:", this.token ? `token set, exp: ${jwtDecode(this.token).exp - (Date.now() / 1000)}` : "no token,", this.refreshToken);
+        async authenticate() {
+            console.log("authenticating:", this.token ? `token set, exp: ${jwtDecode(this.token).exp - (Date.now() / 1000)}` : "no token,", this.refreshToken, this.appToken);
 
             if (this.token && isTokenValid(this.token))
                 return this.token;
@@ -97,6 +98,17 @@ export function authBuilder() {
                 return this.token;
             }
 
+            throw new Error("not authenticated");
+        },
+
+        /**
+         * Login with credentials and return the JWT token
+         * @param {string} username 
+         * @param {string} password 
+         * @return {string} the JWT token
+         */
+        async login(username = "", password = "") 
+        {
             if (username && password) {
                 const payload = { "Email": username, "Password": password, "AppToken": this.appToken };
                 const res = await fetch(`${this.authUrl}/LoginJwt`,
@@ -104,16 +116,15 @@ export function authBuilder() {
                 const temptoken = await res.json();
                 if (temptoken) {
                     this.token = temptoken;
+                    this.refreshToken = getRefreshToken(temptoken);
                     return this.token;
                 }
             }
-
             throw new Error("not authenticated");
         },
 
         /**
-         * try to refresh the token using the refresh token
-         *
+         * try to refresh the JWT token by using the refreshToken
          * @async
          * @private
          * @param {string} [refreshToken=""]
@@ -129,5 +140,54 @@ export function authBuilder() {
                 });
             return res.ok ? await res.json() : null;
         },
+
+        /**
+         * Initializes the authentication object. Before calling, set the token and refresh token if available.
+         * If the token is not set, the refresh token will be used to try to refresh the token.
+         * If the token is not valid, the user will be redirected to the login page.
+         * If tokens are valid, they will be stored in the global variable idasTokens.
+         */
+        async init()
+        {
+            if (!this.token && this.refreshToken)
+            {
+                this.token = await this.tryRefreshToken(this.refreshToken);
+            }
+    
+            if (this.token && isTokenValid(this.token))
+            {
+                this.refreshToken = getRefreshToken(this.token);
+                localStorage.setItem("idas-refresh-token", this.refreshToken);
+            }
+
+            if (!isTokenValid(this.token))
+            {
+                this.redirectToLogin();
+            }
+
+            // eslint-disable-next-line no-undef
+            globalThis.idasTokens = { token: this.token, refreshToken: this.refreshToken, appToken: this.appToken };
+        },
+        
+        /**
+         * Redirect to the login page
+         * @private
+         */
+        redirectToLogin() {
+            if (!window) {
+                return;
+            }
+
+            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));
+
+            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.55",
+  "version": "1.1.59",
   "description": "WebLibs for Gandalan JS/TS/Svelte projects",
   "keywords": [
     "gandalan"