hamzus-ui 0.0.226 → 0.0.227

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hamzus-ui",
-	"version": "0.0.226",
+	"version": "0.0.227",
 	"type": "module",
 	"main": "index.js",
 	"svelte": "index.js",

package/src/utils/request.js

@@ -12,55 +12,61 @@ export function sendRequest(request) {
             ...request
         }
 
-
-        const formData = new FormData();
-
-        if (request.data) {
-            for (const [key, value] of Object.entries(request.data)) {
-                formData.append(key, value);
+        function buildFormData() {
+            const formData = new FormData();
+            if (request.data) {
+                for (const [key, value] of Object.entries(request.data)) {
+                    formData.append(key, value);
+                }
             }
-        }
-        if (request.includeToken) {
-            const myToken = getCookie(config['sessionTokenName']);
-
-            formData.append(config['sessionTokenName'], myToken)
-        }
-
-        if (request.formData) {
-            for (const [key, value] of request.formData.entries()) {
-                formData.append(key, value);
+            if (request.includeToken) {
+                const myToken = getCookie(config['sessionTokenName']);
+                formData.append(config['sessionTokenName'], myToken)
             }
+            if (request.formData) {
+                for (const [key, value] of request.formData.entries()) {
+                    formData.append(key, value);
+                }
+            }
+            return formData;
         }
 
-        // Création de la requête XHR
-        var scriptPath = request.url + request.path;
-        const xhr = new XMLHttpRequest();
-        xhr.open('POST', scriptPath, true);
-        xhr.withCredentials = config.requestWithCredentials;
-
-        xhr.onload = function () {
-
-            if (xhr.status === 200) {
-
+        function executeRequest(isRetry = false) {
+            var scriptPath = request.url + request.path;
+            const xhr = new XMLHttpRequest();
+            xhr.open('POST', scriptPath, true);
+            xhr.withCredentials = config.requestWithCredentials;
 
-                const response = JSON.parse(xhr.responseText)
-                resolve(response)
-            } else if (xhr.status === 400 || xhr.status === 409) {
-                const response = JSON.parse(xhr.responseText)
-                resolve(response)
-            } else if (xhr.status === 401) {
-                if (config.on401 !== null) {
-                    config.on401()
+            xhr.onload = function () {
+                if (xhr.status === 200) {
+                    const response = JSON.parse(xhr.responseText)
+                    resolve(response)
+                } else if (xhr.status === 400 || xhr.status === 409) {
+                    const response = JSON.parse(xhr.responseText)
+                    resolve(response)
+                } else if (xhr.status === 401) {
+                    if (config.on401 !== null) {
+                        const result = config.on401()
+                        if (config.replayAfter401 === true && !isRetry) {
+                            const replay = () => executeRequest(true);
+                            result instanceof Promise
+                                ? result.then(replay)
+                                : replay();
+                            return;
+                        }
+                    }
+                    resolve(false)
                 }
-            }
+            };
+
+            xhr.onerror = function () {
+                console.error('Erreur réseau.');
+                reject(new Error('Erreur réseau.'));
+            };
 
-            resolve(false)
-        };
+            xhr.send(buildFormData());
+        }
 
-        xhr.onerror = function () {
-            console.error('Erreur réseau.');
-        };
-        // Envoi des données sous forme JSON
-        xhr.send(formData);
+        executeRequest();
     })
 }