@legalplace/wizardx-core 4.13.2 → 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.2",
+  "version": "4.14.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -24,7 +24,7 @@
     "@legalplace/lp-events": "1.14.0",
     "@legalplace/lplogic": "2.3.1",
     "@legalplace/model-healthcheck": "^1.1.5",
-    "@legalplace/referencesparser": "^3.1.16",
+    "@legalplace/referencesparser": "^3.1.17",
     "@legalplace/storybook": "^2.171.0",
     "@legalplace/typeorm-constants": "^3.32.0",
     "@loadable/component": "^5.15.0",
@@ -54,11 +54,11 @@
     "xss": "^1.0.9"
   },
   "devDependencies": {
-    "@legalplace/data-gouv": "^1.5.10",
+    "@legalplace/data-gouv": "^1.5.11",
     "@legalplace/eslint-config": "^2.2.0",
     "@legalplace/models-v3-types": "^5.11.4",
     "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/typeorm-entities": "^5.29.6",
+    "@legalplace/typeorm-entities": "^5.29.7",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -96,5 +96,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "3240a0186197e2448190353665f556d64d945bf5"
+  "gitHead": "9c5402206e418e9aba10b90da7c95d088d85961f"
 }