@supersoniks/concorde 1.1.44 → 1.1.45

package/core/utils/api.d.ts

@@ -4,6 +4,7 @@ export type APIConfiguration = {
     token: string | null;
     userName: string | null;
     password: string | null;
+    authToken: string | null;
     tokenProvider: string | null;
     addHTTPResponse?: boolean;
     credentials?: RequestCredentials;
@@ -12,6 +13,13 @@ export type ResultTypeInterface = CoreJSType & {
     _sonic_http_response_?: Response;
     text?: string;
 };
+export type APICall = {
+    apiMethod: "get" | "send" | "submitFormData";
+    path: string;
+    additionalHeaders: HeadersInit | undefined;
+    method?: string | undefined;
+    data?: unknown;
+};
 declare class API {
     /**
      * Ce tableau static permet de ne pas appeler plusieurs fois le même service lors d'appel concurrents en GET.
@@ -32,11 +40,17 @@ declare class API {
     /**
      * le bearer token a passer pour les appels REST
      */
-    token: string | null | undefined;
+    private _token;
+    set token(token: string | null | undefined);
+    get token(): string | null | undefined;
     /**
      * Le endPoint pour obtenir le bearer token qui sera concaténé à l'url du service
      */
     tokenProvider: string | null;
+    /**
+     * le bearer token à passer pour un éventuel renouvellement de token automatique
+     */
+    authToken: string | null;
     /**
      * credentials
      */
@@ -45,13 +59,22 @@ declare class API {
      * Tableau static des tokens stokés en memoire vive (comportement à revoir à l'occasion)
      */
     static tokens: Map<string | null, string | null | undefined>;
+    /**
+     * Tableau stockant l'ensemble des tokens invalides
+     */
+    static invalidTokens: (string | null | undefined)[];
+    handleInvalidToken(token: string | null | undefined): void;
+    /**
+     * Tableau static des tentatives échouées de récupération auto du token
+     */
+    static failledTokenUpdates: Map<string | null, true>;
     /**
      * Le endPoint pour obtenir le bearer token qui sera concaténé à l'url du service
      */
     addHTTPResponse: boolean;
     lastResult?: Response;
     constructor(config: APIConfiguration);
-    handleResult(fetchResult?: Response): Promise<ResultTypeInterface>;
+    handleResult(fetchResult: Response, lastCall: APICall): Promise<ResultTypeInterface>;
     /**
      * Basic auth
      */
@@ -65,7 +88,7 @@ declare class API {
     /**
      * Concatène le serviceURL et le endpoint donné en paramètre
      */
-    computeURL(path: string): string;
+    computeURL(path: string, query?: Record<string, string>): string;
     send<T, SendType = CoreJSType>(path: string, data: SendType, method?: string, additionalHeaders?: HeadersInit): Promise<T & ResultTypeInterface>;
     /**
      * Agit comme une soumission de formulaire, mais attends un json en réponse

package/core/utils/api.js

@@ -12,6 +12,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import HTML from "@supersoniks/concorde/core/utils/HTML";
 import Objects from "@supersoniks/concorde/core/utils/Objects";
 class API {
+    set token(token) {
+        this._token = token;
+        if (!token) {
+            API.tokens.delete(this.serviceURL);
+            return;
+        }
+        if (API.invalidTokens.includes(token))
+            return;
+        API.tokens.set(this.serviceURL, token);
+    }
+    get token() {
+        // si le token est marqué invalide, on utilise utilise la dernière version valide connue du token pour ce serviceURL
+        return API.invalidTokens.includes(this._token) ? API.tokens.get(this.serviceURL) : this._token;
+    }
+    handleInvalidToken(token) {
+        if (!token)
+            return;
+        if (API.invalidTokens.includes(token))
+            return;
+        API.invalidTokens.push(token);
+        this.token = null;
+    }
     constructor(config) {
         /**
          * Le endPoint pour obtenir le bearer token qui sera concaténé à l'url du service
@@ -22,24 +44,27 @@ class API {
             this.serviceURL = document.location.origin;
         this.userName = config.userName;
         this.password = config.password;
-        this.token = config.token;
+        if (config.token)
+            this.token = config.token;
         this.tokenProvider = config.tokenProvider;
+        this.authToken = config.authToken;
         this.addHTTPResponse = config.addHTTPResponse || false;
         this.credentials = config.credentials;
     }
-    handleResult(fetchResult) {
+    handleResult(fetchResult, lastCall) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.lastResult = fetchResult;
-            const contentType = (_a = fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.headers.get("content-type")) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+            const contentType = (_a = fetchResult.headers.get("content-type")) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+            const httpCode = fetchResult.status;
             let result = {};
-            if (contentType && contentType.indexOf("text/") == 0) {
-                const str = yield (fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.text());
+            if (!contentType || contentType.indexOf("text/") == 0) {
+                const str = yield fetchResult.text();
                 result = { text: str };
             }
             else {
                 try {
-                    result = yield (fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.json());
+                    result = yield fetchResult.json();
                 }
                 catch (e) {
                     result = {};
@@ -48,6 +73,15 @@ class API {
             if (this.addHTTPResponse && Objects.isObject(result)) {
                 result._sonic_http_response_ = fetchResult;
             }
+            if (httpCode === 498 && !API.failledTokenUpdates.has(this.serviceURL)) {
+                this.handleInvalidToken(this.token);
+                if (lastCall.apiMethod === "get") {
+                    result = yield this[lastCall.apiMethod](lastCall.path, lastCall.additionalHeaders);
+                }
+                else {
+                    result = yield this[lastCall.apiMethod](lastCall.path, lastCall.data, lastCall.method, lastCall.additionalHeaders);
+                }
+            }
             return result;
         });
     }
@@ -62,39 +96,63 @@ class API {
                 this.token = API.tokens.get(this.serviceURL);
                 return;
             }
-            if (!this.userName || !this.password || !this.tokenProvider)
+            if (!this.tokenProvider)
                 return;
-            const headers = {
-                Authorization: "Basic " + window.btoa(unescape(encodeURIComponent(this.userName + ":" + this.password))),
-            };
-            const result = yield fetch(this.computeURL(this.tokenProvider), {
+            let headers = {};
+            if (this.userName && this.password) {
+                headers = {
+                    Authorization: "Basic " + window.btoa(unescape(encodeURIComponent(this.userName + ":" + this.password))),
+                };
+            }
+            else if (this.authToken) {
+                headers = {
+                    Authorization: "Bearer " + this.authToken,
+                };
+            }
+            const serviceURL = new URL(this.serviceURL);
+            const serviceHost = serviceURL.protocol + "//" + serviceURL.host;
+            const result = yield fetch(this.computeURL(this.tokenProvider, { serviceHost: serviceHost }), {
                 headers: headers,
                 credentials: this.credentials,
             });
             try {
                 const json = yield result.json();
-                this.token = json.token;
-                API.tokens.set(this.serviceURL, this.token);
+                const newToken = json.token;
+                if (newToken) {
+                    this.token = json.token;
+                }
+                else {
+                    API.failledTokenUpdates.set(this.serviceURL, true);
+                }
             }
             catch (e) {
-                console.log("Problème au moment du parsing du json au retour de l'authentification");
+                API.failledTokenUpdates.set(this.serviceURL, true);
             }
         });
     }
     get(path, additionalHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
+            const lastCall = {
+                apiMethod: "get",
+                path: path,
+                additionalHeaders: additionalHeaders,
+            };
             const headers = yield this.createHeaders(additionalHeaders);
             const url = this.computeURL(path);
-            if (!API.loadingGetPromises.has(url)) {
+            const mapKey = JSON.stringify({
+                url: url,
+                headers: headers,
+            });
+            if (!API.loadingGetPromises.has(mapKey)) {
                 const promise = new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                     const result = yield fetch(url, { headers: headers, credentials: this.credentials });
-                    const handledResult = yield this.handleResult(result);
+                    const handledResult = yield this.handleResult(result, lastCall);
                     resolve(handledResult);
                 }));
-                API.loadingGetPromises.set(url, promise);
+                API.loadingGetPromises.set(mapKey, promise);
             }
-            const result = (yield API.loadingGetPromises.get(url));
-            API.loadingGetPromises.delete(url);
+            const result = (yield API.loadingGetPromises.get(mapKey));
+            API.loadingGetPromises.delete(mapKey);
             return result;
         });
     }
@@ -118,14 +176,32 @@ class API {
     /**
      * Concatène le serviceURL et le endpoint donné en paramètre
      */
-    computeURL(path) {
-        return (this.serviceURL + "/" + path).replace(/([^(https?:)])\/{2,}/g, "$1/");
+    computeURL(path, query = {}) {
+        let url = "";
+        if (path.startsWith("http"))
+            url = path;
+        else
+            url = this.serviceURL + "/" + path;
+        if (!url.startsWith("http"))
+            url = window.location.origin + url;
+        const computedUrl = new URL(url);
+        for (const key in query) {
+            computedUrl.searchParams.set(key, query[key]);
+        }
+        return computedUrl.toString().replace(/([^(https?:)])\/{2,}/g, "$1/");
     }
     /*
      * Envoie des données au endPoint passé en paramètre. par défaut en POST
      */
     send(path, data, method = "POST", additionalHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
+            const lastCall = {
+                apiMethod: "send",
+                path: path,
+                additionalHeaders: additionalHeaders,
+                method: method,
+                data: data,
+            };
             const headers = yield this.createHeaders(additionalHeaders);
             headers["Accept"] = "application/json";
             headers["Content-Type"] = "application/json";
@@ -135,7 +211,7 @@ class API {
                 method: method,
                 body: JSON.stringify(data),
             });
-            return (yield this.handleResult(result));
+            return (yield this.handleResult(result, lastCall));
         });
     }
     /**
@@ -143,6 +219,13 @@ class API {
      */
     submitFormData(path, data, method = "POST", additionalHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
+            const lastCall = {
+                apiMethod: "submitFormData",
+                path: path,
+                additionalHeaders: additionalHeaders,
+                method: method,
+                data: data,
+            };
             const headers = yield this.createHeaders(additionalHeaders);
             headers["Accept"] = "application/json";
             const formData = new FormData();
@@ -155,7 +238,7 @@ class API {
                 method: method,
                 body: formData,
             });
-            return (yield this.handleResult(result));
+            return (yield this.handleResult(result, lastCall));
         });
     }
     /**
@@ -191,4 +274,12 @@ API.loadingGetPromises = new Map();
  * Tableau static des tokens stokés en memoire vive (comportement à revoir à l'occasion)
  */
 API.tokens = new Map();
+/**
+ * Tableau stockant l'ensemble des tokens invalides
+ */
+API.invalidTokens = [];
+/**
+ * Tableau static des tentatives échouées de récupération auto du token
+ */
+API.failledTokenUpdates = new Map();
 export default API;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supersoniks/concorde",
-  "version": "1.1.44",
+  "version": "1.1.45",
   "customElements": "custom-elements.json",
   "license": "MIT",
   "publishConfig": {
@@ -73,6 +73,8 @@
     "./functional/sdui/SDUIDescriptorTransformer": "./core/components/functional/sdui/SDUIDescriptorTransformer.js",
     "./core/components/functional/sdui/default-library.json": "./core/components/functional/sdui/default-library.json",
     "./functional/sdui/default-library.json": "./core/components/functional/sdui/default-library.json",
+    "./core/components/functional/sdui/example.json": "./core/components/functional/sdui/example.json",
+    "./functional/sdui/example.json": "./core/components/functional/sdui/example.json",
     "./core/components/functional/sdui/sdui-utils": "./core/components/functional/sdui/sdui-utils.js",
     "./functional/sdui/sdui-utils": "./core/components/functional/sdui/sdui-utils.js",
     "./core/components/functional/sdui/sdui": "./core/components/functional/sdui/sdui.js",
@@ -260,7 +262,6 @@
     "./docs/navigation/navigation": "./docs/navigation/navigation.js",
     "./docs/navigation": "./docs/navigation/navigation.js",
     "./docs/prism/index": "./docs/prism/index.js",
-    "./docs/search/doc-search.json": "./docs/search/doc-search.json",
     "./docs/search/docs-search.json": "./docs/search/docs-search.json",
     "./docs/search/markdown-renderer": "./docs/search/markdown-renderer.js",
     "./docs/search/page": "./docs/search/page.js",