@vc-shell/framework 1.0.251 → 1.0.253

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.0.253](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.252...v1.0.253) (2024-07-12)
+
+
+### Features
+
+* **shared:** update login logic to redirect to the previous page after successful login ([8701044](https://github.com/VirtoCommerce/vc-shell/commit/8701044315a7b13609474e00e83a069d542bb256))
+
+
+
+## [1.0.252](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.251...v1.0.252) (2024-07-08)
+
+
+
 ## [1.0.251](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.250...v1.0.251) (2024-07-08)
 
 

package/dist/framework.js

@@ -61601,7 +61601,12 @@ const zLe = (t) => function() {
     }), D = Bn({
       loginOrEmail: ""
     }), S = async () => {
-      g.value && (l.value.error = "", l.value = await d(O.username, O.password), l.value.succeeded ? await n.push("/") : l.value.status ? l.value.status === 401 ? (l.value.error = "The login or password is incorrect.", O.password = "", r("password")) : l.value.error = "Authentication error (code: " + l.value.status + ")." : l.value.error = "Authentication error: " + l.value.error);
+      if (g.value)
+        if (l.value.error = "", l.value = await d(O.username, O.password), l.value.succeeded) {
+          const I = localStorage.getItem("redirectAfterLogin") || "/";
+          localStorage.removeItem("redirectAfterLogin"), await n.push(I);
+        } else
+          l.value.status ? l.value.status === 401 ? (l.value.error = "The login or password is incorrect.", O.password = "", r("password")) : l.value.error = "Authentication error (code: " + l.value.status + ")." : l.value.error = "Authentication error: " + l.value.error;
     }, A = async () => {
       if (g.value && b)
         try {
@@ -76080,15 +76085,16 @@ const R9 = {
       let a = {};
       return Object.keys(i.params).length > 0 && (a = Object.fromEntries(Object.entries(i.params).filter(([o]) => o !== "pathMatch"))), a;
     };
-    e.router.beforeEach(async (i) => {
-      const { isAuthenticated: a } = so();
+    e.router.beforeEach(async (i, a, o) => {
+      const { isAuthenticated: s } = so();
       if (i.name !== "Login" && i.name !== "ResetPassword" && i.name !== "Invite")
         try {
-          return a.value ? !0 : { name: "Login" };
+          s.value ? o() : (localStorage.setItem("redirectAfterLogin", i.fullPath), o({ name: "Login" }));
         } catch {
-          return { name: "Login" };
+          localStorage.setItem("redirectAfterLogin", i.fullPath), o({ name: "Login" });
         }
-      else return !0;
+      else
+        o();
     }), e.router.beforeEach((i, a) => {
       const { hasAccess: o } = pp();
       if (i.meta.permissions) {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAa,MAAM,KAAK,CAAC;AAIrC,OAAO,EAAE,IAAI,EAAe,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAU5D,OAAO,eAAe,CAAC;AACvB,OAAO,4BAA4B,CAAC;;iBAK3B,GAAG,QACF;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,CAAC,EAAE;YACL,MAAM,EAAE,MAAM,CAAC;YACf,cAAc,EAAE,MAAM,CAAC;SACxB,CAAC;QACF,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,mBAAmB,CAAC,EAAE;YACpB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;SAC5B,CAAC;KACH,GACA,IAAI;;AApBT,wBAwME;AAEF,cAAc,iBAAiB,CAAC;AAEhC,cAAc,YAAY,CAAC;AAE3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAa,MAAM,KAAK,CAAC;AAIrC,OAAO,EAAE,IAAI,EAAe,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAU5D,OAAO,eAAe,CAAC;AACvB,OAAO,4BAA4B,CAAC;;iBAK3B,GAAG,QACF;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,CAAC,EAAE;YACL,MAAM,EAAE,MAAM,CAAC;YACf,cAAc,EAAE,MAAM,CAAC;SACxB,CAAC;QACF,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,mBAAmB,CAAC,EAAE;YACpB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;SAC5B,CAAC;KACH,GACA,IAAI;;AApBT,wBA8ME;AAEF,cAAc,iBAAiB,CAAC;AAEhC,cAAc,YAAY,CAAC;AAE3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,UAAU,CAAC"}

package/dist/shared/pages/LoginPage/components/login/Login.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Login.vue.d.ts","sourceRoot":"","sources":["../../../../../../shared/pages/LoginPage/components/login/Login.vue.ts"],"names":[],"mappings":"AAaA,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5E,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM;QAAE,cAAc,EAAE,kBAAkB,CAAA;KAAE,CAAC;CAC3D;;AAyjBD,wBAMG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC"}
+{"version":3,"file":"Login.vue.d.ts","sourceRoot":"","sources":["../../../../../../shared/pages/LoginPage/components/login/Login.vue.ts"],"names":[],"mappings":"AAaA,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5E,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM;QAAE,cAAc,EAAE,kBAAkB,CAAA;KAAE,CAAC;CAC3D;;AA2jBD,wBAMG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.251",
+  "version": "1.0.253",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -61,9 +61,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.251",
-    "@vc-shell/config-generator": "^1.0.251",
-    "@vc-shell/ts-config": "^1.0.251",
+    "@vc-shell/api-client-generator": "^1.0.253",
+    "@vc-shell/config-generator": "^1.0.253",
+    "@vc-shell/ts-config": "^1.0.253",
     "@vitejs/plugin-vue": "^5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/shared/pages/LoginPage/components/login/Login.vue

@@ -259,7 +259,9 @@ const login = async () => {
     };
 
     if (signInResult.value.succeeded) {
-      await router.push("/");
+      const redirectTo = localStorage.getItem("redirectAfterLogin") || "/";
+      localStorage.removeItem("redirectAfterLogin");
+      await router.push(redirectTo);
     } else {
       if (signInResult.value.status) {
         if (signInResult.value.status === 401) {