@legalplace/wizardx-core 4.13.3 → 4.14.0

package/dist/helpers/redirectToLogin.d.ts

@@ -0,0 +1 @@
+export declare const redirectToLogin: (redirectUrl: string, redirectParams?: boolean) => void;

package/dist/helpers/redirectToLogin.js

@@ -0,0 +1,12 @@
+export const redirectToLogin = (redirectUrl, redirectParams = false) => {
+    const currentParams = new URLSearchParams(window.location.search);
+    const redirectURL = new URL(redirectUrl, window.location.origin);
+    currentParams.forEach((value, key) => {
+        redirectURL.searchParams.append(key, value);
+    });
+    if (redirectParams) {
+        redirectURL.searchParams.append("redirectUrl", encodeURIComponent(window.location.href));
+    }
+    window.onbeforeunload = null;
+    window.location.href = redirectURL.toString();
+};

package/dist/redux/sagas/fetchModel.js

@@ -21,6 +21,7 @@ import { FETCH_MODEL, FETCH_MODEL_PREREQUISITES, } from "../constants/sagas/mode
 import { fetchModelAction } from "../actions/sagas/model";
 import { initInputsDecorator } from "./initInputs";
 import { cancelOnResetState } from "../../helpers/sagaCancelOnResetState";
+import { redirectToLogin } from "../../helpers/redirectToLogin";
 const cookies = new Cookies();
 function* setFetchModelToNonBlocking(firstCurrentAppState) {
     yield put(initPaginationAction({
@@ -82,10 +83,7 @@ function* getWizardConfig(permalink, uniqidParam, prefix, queryParams) {
     }
     response = yield call([response, "json"]);
     if (response.redirect) {
-        window.onbeforeunload = null;
-        window.location.href = `${response.redirect}${response.redirectParams
-            ? `?redirectUrl=${encodeURIComponent(window.location.href)}`
-            : ""}`;
+        redirectToLogin(response.redirect, response.redirectParams);
     }
     yield put(setModelUuidAction(response.modelUuid));
     return { modelUuid: response.modelUuid };
@@ -132,10 +130,7 @@ function* fetchInstanceInformation(appStates, permalink, uniqid, uniqidParam, pr
     }
     response = yield call([response, "json"]);
     if (response.redirect) {
-        window.onbeforeunload = null;
-        window.location.href = `${response.redirect}${response.redirectParams
-            ? `?redirectUrl=${encodeURIComponent(window.location.href)}`
-            : ""}`;
+        redirectToLogin(response.redirect, response.redirectParams);
     }
     if (response.errors || response.status === "error") {
         throw new Error(`Unable to fetch ${permalink}${uniqid && uniqid.trim().length > 0 ? `/${uniqid}` : ""}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.13.3",
+  "version": "4.14.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -96,5 +96,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "cc93b324728874d719c5d9fd544bbf3d8498c1a4"
+  "gitHead": "9c5402206e418e9aba10b90da7c95d088d85961f"
 }