@gandalan/weblibs 1.0.8 → 1.0.10

package/api/IDAS.js

@@ -8,82 +8,71 @@ let authJwtCallbackPath = localStorage.getItem("IDAS_AuthJwtCallbackPath") || ""
 let authJwtToken;
 
 export let IDASFactory = {
-    async create() {
-        return new Promise((resolve, reject) => {
-            let promise = this.authorize()
-                .then(() => {
-                    let idas = new IDAS();
-                    return idas.authenticateWithJwt(authJwtCallbackPath)
-                });
-            resolve(promise);
-        });
-    },
-
-    async authorize() {
-        let urlParams = new URLSearchParams(location.search);
-        if (urlParams.has("m")) {
-            localStorage.setItem("IDAS_MandantGuid", urlParams.get("m"));
-        }
-        if (urlParams.has("a")) {
-            localStorage.setItem("IDAS_ApiBaseUrl", urlParams.get("a"));
-            apiBaseUrl = urlParams.get("a");
-        }
-        if (urlParams.has("j")) { // it is JWT
-            let idas = new IDAS();
-            idas.authorizeWithJwt(urlParams.get("j"));
-            window.location.search = "";
-            return Promise.reject("redirect is required");
-        }
-        if (urlParams.has("t")) { // it is authToken
-            localStorage.setItem("IDAS_AuthJwtRefreshToken", urlParams.get("t"));
+    async create(settings = {
+        appToken : localStorage.getItem("IDAS_AppToken"),
+        mandantGuid : localStorage.getItem("IDAS_MandantGuid"),
+        apiBaseurl : localStorage.getItem("IDAS_ApiBaseUrl"),
+        jwtRefreshToken : localStorage.getItem("IDAS_AuthJwtRefreshToken"),
+        jwtCallbackPath : localStorage.getItem("IDAS_AuthJwtCallbackPath")
+      }) 
+    {
+        apiBaseUrl = settings.apiBaseurl;
+        let idas = undefined;
+
+        if (settings.jwtToken) // it is JWT
+        { 
+            console.log("init: with JWT token");
+            idas = new IDAS();
+            idas.initWithJWTtoken(settings.jwtToken);
+        } 
+        else if (settings.jwtRefreshToken) // it is authToken
+        { 
+            console.log("init: with refresh/classic token");
             let refreshClient = new RESTClient(apiBaseUrl, "");
-            await refreshClient.refreshToken()
-                .then(() => {
-                    window.location.search = "";
-                });
-            return Promise.reject("redirect is required");
+            await refreshClient.refreshToken();
+            idas = new IDAS();
+            await idas.authenticateWithJwt(authJwtCallbackPath);
         }
-    },
+        
+        return idas;
+    }
 }
 
-class IDAS {
+class IDAS 
+{
     restClient = undefined;
 
-    authorizeWithJwt(jwtToken, mandant = "") {
+    initWithJWTtoken(jwtToken) 
+    {
         authJwtToken = jwtToken;
-        mandant && localStorage.setItem("IDAS_MandantGuid", mandant);
         this.restClient = new RESTClient(apiBaseUrl, jwtToken, true);
     }
 
-    async authenticateWithJwt(authPath) {
-        return new Promise(async (resolve, reject) => {
-            // no valid JWT, but try to use "refresh token" first to retrive new JWT
-            let refreshClient = new RESTClient(apiBaseUrl, "");
-            await refreshClient.checkRefreshToken(authJwtToken, () => {
-                authJwtToken = undefined;
-                // ... so repeat authenticate (should lead to /Session login page)
-                new IDAS().authenticateWithJwt(authPath);
-            });
-
-            // still not valid JWT -> authenticate
-            if (!refreshClient.token) {
-                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));
-
-                const url = new URL(apiBaseUrl);
-                url.pathname = "/Session";
-                url.search = `?a=${appToken}&r=${encodeURIComponent(authUrlCallback)}`;
-                let jwtUrl = url.toString();
-
-                window.location = jwtUrl;
-                reject("not authenticated yet");
-            } else {
-                this.authorizeWithJwt(refreshClient.token);
-                resolve(this);
-            }
+    async authenticateWithJwt(authPath) 
+    {
+        let refreshClient = new RESTClient(apiBaseUrl, "");
+        await refreshClient.checkRefreshToken(authJwtToken, () => {
+            authJwtToken = undefined;
+            // ... so repeat authenticate (should lead to /Session login page)
+            new IDAS().authenticateWithJwt(authPath);
         });
+
+        // still not valid JWT -> authenticate
+        if (!refreshClient.token) {
+            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));
+
+            const url = new URL(apiBaseUrl);
+            url.pathname = "/Session";
+            url.search = `?a=${appToken}&r=${encodeURIComponent(authUrlCallback)}`;
+            let jwtUrl = url.toString();
+
+            window.location = jwtUrl;
+        } else {
+            this.initWithJWTtoken(refreshClient.token);
+        }
     }
 
     mandantGuid = localStorage.getItem("IDAS_MandantGuid");

package/api/RESTClient.js

@@ -21,6 +21,8 @@ export class RESTClient {
         this.token = token;
         this.isJWT = isJWT;
 
+        axios.defaults.baseURL = url;
+
         if (this.token && !isJWT) {
             axios.defaults.headers.common["X-Gdl-AuthToken"] = this.token;
         }
@@ -96,7 +98,7 @@ export class RESTClient {
 
     async refreshToken() {
         try {
-            await axios.put(`${this.baseurl}/LoginJwt/Refresh`, { token: localStorage.getItem("IDAS_AuthJwtRefreshToken") })
+            await this.put("/LoginJwt/Refresh", { token: localStorage.getItem("IDAS_AuthJwtRefreshToken") })
                 .then(resp => {
                     this.updateJwtToken(resp.data);
                 });
@@ -120,7 +122,7 @@ export class RESTClient {
 
     async get(uri, noJWT = false) {
         try {
-            const response = await axios.get(this.baseurl + uri, this.getUrlOptions(noJWT));
+            const response = await axios.get(uri, this.getUrlOptions(noJWT));
             this.lastError = "";
             return response.data;
         } catch (error) {
@@ -130,7 +132,7 @@ export class RESTClient {
 
     async getFile(uri) {
         try {
-            const response = await axios.get(this.baseurl + uri, { responseType: "blob" });
+            const response = await axios.get(uri, { responseType: "blob" });
             let fileName = "1000.pdf";
             if (response.headers["content-disposition"]) {
                 fileName = response.headers["content-disposition"].split(";")[1];
@@ -146,7 +148,7 @@ export class RESTClient {
     async getRaw(uri, noJWT = false) {
         let response = {};
         try {
-            response = await axios.get(this.baseurl + uri, this.getUrlOptions(noJWT))
+            response = await axios.get(uri, this.getUrlOptions(noJWT))
             this.lastError = "";
         } catch (error) {
             this.handleError(error);
@@ -156,7 +158,7 @@ export class RESTClient {
 
     async post(uri, formData, noJWT = false) {
         try {
-            const response = await axios.post(this.baseurl + uri, formData, this.getUrlOptions(noJWT));
+            const response = await axios.post(uri, formData, this.getUrlOptions(noJWT));
             this.lastError = "";
             return response;
         } catch (error) {
@@ -166,7 +168,7 @@ export class RESTClient {
 
     async put(uri, formData, noJWT = false) {
         try {
-            const response = await axios.put(this.baseurl + uri, formData, this.getUrlOptions(noJWT));
+            const response = await axios.put(uri, formData, this.getUrlOptions(noJWT));
             this.lastError = "";
             return response;
         } catch (error) {
@@ -176,7 +178,7 @@ export class RESTClient {
 
     async delete(uri, noJWT = false) {
         try {
-            const response = await axios.delete(this.baseurl + uri, this.getUrlOptions(noJWT));
+            const response = await axios.delete(uri, this.getUrlOptions(noJWT));
             this.lastError = "";
             return response;
         } catch (error) {

package/package.json

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