@vc-shell/framework 1.0.300 → 1.0.301

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.301](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.300...v1.0.301) (2024-10-01)
+
+
+
 ## [1.0.300](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.299...v1.0.300) (2024-10-01)
 
 

package/dist/{azuread-36Jpmrhw.js → azuread-BLZ8u__x.js}

@@ -1,6 +1,6 @@
 import { defineComponent as a, openBlock as i, createBlock as r, unref as t } from "vue";
-import { _ as p } from "./external-provider.vue_vue_type_script_setup_true_lang-i8UevzqR.js";
-import { u as s } from "./index-brymheD-.js";
+import { _ as p } from "./external-provider.vue_vue_type_script_setup_true_lang-LOFUQw3T.js";
+import { u as s } from "./index-BPscLY-3.js";
 const g = /* @__PURE__ */ a({
   __name: "azuread",
   props: {

package/dist/{external-provider-C8gSyvJw.js → external-provider-BLMlIQHa.js}

@@ -1,4 +1,4 @@
-import { _ as f } from "./external-provider.vue_vue_type_script_setup_true_lang-i8UevzqR.js";
+import { _ as f } from "./external-provider.vue_vue_type_script_setup_true_lang-LOFUQw3T.js";
 export {
   f as default
 };

package/dist/{external-provider.vue_vue_type_script_setup_true_lang-i8UevzqR.js → external-provider.vue_vue_type_script_setup_true_lang-LOFUQw3T.js}

@@ -1,5 +1,5 @@
 import { defineComponent as r, openBlock as s, createBlock as n, unref as o, withCtx as i, createElementVNode as a, createVNode as l, createTextVNode as p, toDisplayString as c } from "vue";
-import { _ as m, a as _ } from "./index-brymheD-.js";
+import { _ as m, a as _ } from "./index-BPscLY-3.js";
 import "vee-validate";
 import "vue-router";
 const d = { class: "tw-flex tw-flex-row tw-items-center tw-gap-2" }, N = /* @__PURE__ */ r({

package/dist/external-providers-BXnXf0Vm.js

@@ -0,0 +1,4 @@
+import { b as f } from "./index-BPscLY-3.js";
+export {
+  f as default
+};

package/dist/framework.js

@@ -1,5 +1,5 @@
 import "vue-router";
-import { az as i, bV as n, cx as o, aA as c, aB as r, aC as l, bM as u, ao as p, c2 as b, c1 as d, c4 as y, c3 as g, al as V, am as m, bL as S, ap as C, aG as P, aH as h, cs as D, cD as A, aI as I, aD as R, aE as f, aF as L, aJ as M, aK as T, aL as B, aq as E, aM as N, ca as w, c9 as U, aN as O, bN as v, ar as k, aO as q, aP as x, aQ as F, aR as j, aS as z, aT as J, aU as K, bP as H, aV as W, aW as G, aX as Q, bO as X, aY as Y, cm as Z, b as _, an as $, aZ as aa, a_ as sa, a$ as ea, cA as ta, b0 as ia, as as na, b1 as oa, bQ as ca, b2 as ra, b3 as la, ct as ua, b4 as pa, b5 as ba, b6 as da, b7 as ya, at as ga, b8 as Va, cB as ma, b9 as Sa, ba as Ca, bb as Pa, bc as ha, bd as Da, be as Aa, au as Ia, ci as Ra, cv as fa, cw as La, bf as Ma, bg as Ta, av as Ba, bh as Ea, bR as Na, bi as wa, bj as Ua, bk as Oa, bS as va, bl as ka, bm as qa, bn as xa, bo as Fa, bT as ja, bp as za, aw as Ja, bq as Ka, br as Ha, cC as Wa, bs as Ga, bt as Qa, bu as Xa, bv as Ya, ax as Za, bw as _a, bx as $a, ay as as, by as ss, c0 as es, cy as ts, bz as is, bA as ns, bB as os, bU as cs, bC as rs, bD as ls, cz as us, bE as ps, bF as bs, cu as ds, bG as ys, bH as gs, bI as Vs, bJ as ms, K as Ss, cc as Cs, cb as Ps, c as hs, L as Ds, cg as As, cf as Is, t as Rs, _ as fs, V as Ls, J as Ms, d as Ts, e as Bs, M as Es, v as Ns, H as ws, x as Us, w as Os, N as vs, f as ks, g as qs, a as xs, y as Fs, z as js, h as zs, j as Js, k as Ks, O as Hs, G as Ws, A as Gs, B as Qs, P as Xs, cp as Ys, co as Zs, l as _s, I as $s, C as ae, m as se, D as ee, E as te, n as ie, o as ne, p as oe, Q as ce, F as re, s as le, q as ue, r as pe, bK as be, ae as de, a7 as ye, ad as ge, af as Ve, ce as me, bW as Se, bZ as Ce, ah as Pe, c5 as he, ag as De, i as Ae, ac as Ie, b_ as Re, cr as fe, aa as Le, bX as Me, bY as Te, b$ as Be, a8 as Ee, ab as Ne, a9 as we, cl as Ue, ak as Oe, cn as ve, aj as ke, a4 as qe, X as xe, cd as Fe, R as je, a3 as ze, T as Je, ch as Ke, W as He, cj as We, c7 as Ge, ai as Qe, c6 as Xe, a6 as Ye, Z as Ze, ck as _e, U as $e, c8 as at, a5 as st, S as et, a0 as tt, a2 as it, cq as nt, a1 as ot, Y as ct, $ as rt } from "./index-brymheD-.js";
+import { az as i, bV as n, cx as o, aA as c, aB as r, aC as l, bM as u, ao as p, c2 as b, c1 as d, c4 as y, c3 as g, al as V, am as m, bL as S, ap as C, aG as P, aH as h, cs as D, cD as A, aI as I, aD as R, aE as f, aF as L, aJ as M, aK as T, aL as B, aq as E, aM as N, ca as w, c9 as U, aN as O, bN as v, ar as k, aO as q, aP as x, aQ as F, aR as j, aS as z, aT as J, aU as K, bP as H, aV as W, aW as G, aX as Q, bO as X, aY as Y, cm as Z, b as _, an as $, aZ as aa, a_ as sa, a$ as ea, cA as ta, b0 as ia, as as na, b1 as oa, bQ as ca, b2 as ra, b3 as la, ct as ua, b4 as pa, b5 as ba, b6 as da, b7 as ya, at as ga, b8 as Va, cB as ma, b9 as Sa, ba as Ca, bb as Pa, bc as ha, bd as Da, be as Aa, au as Ia, ci as Ra, cv as fa, cw as La, bf as Ma, bg as Ta, av as Ba, bh as Ea, bR as Na, bi as wa, bj as Ua, bk as Oa, bS as va, bl as ka, bm as qa, bn as xa, bo as Fa, bT as ja, bp as za, aw as Ja, bq as Ka, br as Ha, cC as Wa, bs as Ga, bt as Qa, bu as Xa, bv as Ya, ax as Za, bw as _a, bx as $a, ay as as, by as ss, c0 as es, cy as ts, bz as is, bA as ns, bB as os, bU as cs, bC as rs, bD as ls, cz as us, bE as ps, bF as bs, cu as ds, bG as ys, bH as gs, bI as Vs, bJ as ms, K as Ss, cc as Cs, cb as Ps, c as hs, L as Ds, cg as As, cf as Is, t as Rs, _ as fs, V as Ls, J as Ms, d as Ts, e as Bs, M as Es, v as Ns, H as ws, x as Us, w as Os, N as vs, f as ks, g as qs, a as xs, y as Fs, z as js, h as zs, j as Js, k as Ks, O as Hs, G as Ws, A as Gs, B as Qs, P as Xs, cp as Ys, co as Zs, l as _s, I as $s, C as ae, m as se, D as ee, E as te, n as ie, o as ne, p as oe, Q as ce, F as re, s as le, q as ue, r as pe, bK as be, ae as de, a7 as ye, ad as ge, af as Ve, ce as me, bW as Se, bZ as Ce, ah as Pe, c5 as he, ag as De, i as Ae, ac as Ie, b_ as Re, cr as fe, aa as Le, bX as Me, bY as Te, b$ as Be, a8 as Ee, ab as Ne, a9 as we, cl as Ue, ak as Oe, cn as ve, aj as ke, a4 as qe, X as xe, cd as Fe, R as je, a3 as ze, T as Je, ch as Ke, W as He, cj as We, c7 as Ge, ai as Qe, c6 as Xe, a6 as Ye, Z as Ze, ck as _e, U as $e, c8 as at, a5 as st, S as et, a0 as tt, a2 as it, cq as nt, a1 as ot, Y as ct, $ as rt } from "./index-BPscLY-3.js";
 import "vue";
 export {
   i as AccountState,

package/dist/{index-brymheD-.js → index-BPscLY-3.js}

@@ -39270,40 +39270,43 @@ const qSe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
       deep: !0
     }
   );
-  async function n(a, s) {
+  function n() {
+    const { searchParams: s } = new URL(location.href);
+    return s.get("returnUrl") || s.get("ReturnUrl");
+  }
+  async function r(s, o) {
     try {
-      let o = window.location.origin + "/externalsignin?";
-      const l = window.location.pathname ?? "/", c = {
-        providerType: a
-      };
-      if (e.value = c, a === null) throw new Error("The parameter 'authenticationType' cannot be null.");
-      a !== void 0 && (o += "authenticationType=" + encodeURIComponent("" + a) + "&"), l !== void 0 && (o += "returnUrl=" + encodeURIComponent("" + l) + "&"), o = o.replace(/[?&]$/, ""), window.location.href = o;
-    } catch (o) {
-      throw console.error(o), o;
+      const l = window.location.origin, c = window.location.pathname ?? n() ?? "/";
+      if (!s)
+        throw new Error("The parameter 'authenticationType' cannot be null or undefined.");
+      const u = new URL("/externalsignin", l);
+      u.searchParams.set("authenticationType", s), u.searchParams.set("returnUrl", c), e.value = { providerType: s }, console.log("url", u), window.location.assign(u);
+    } catch (l) {
+      throw console.error(l), l;
     }
   }
-  async function r(a) {
+  async function i(s) {
     try {
-      let s = window.location.origin + "/externalsignin/signout?";
-      a !== void 0 && (s += "authenticationType=" + encodeURIComponent("" + a) + "&"), window.location.pathname !== void 0 && (s += "returnUrl=" + encodeURIComponent("" + window.location.pathname) + "&"), s = s.replace(/[?&]$/, ""), window.location.href = s, e.value = {};
-    } catch (s) {
-      throw console.error(s), s;
+      const o = window.location.origin, l = window.location.pathname ?? "/", c = new URL("/externalsignin/signout", o);
+      c.searchParams.set("authenticationType", s), c.searchParams.set("returnUrl", l), e.value = {}, window.location.assign(c);
+    } catch (o) {
+      throw console.error(o), o;
     }
   }
-  async function i() {
-    let a;
+  async function a() {
+    let s;
     try {
-      a = await t.getExternalLoginProviders();
-    } catch (s) {
-      console.error(s);
+      s = await t.getExternalLoginProviders();
+    } catch (o) {
+      console.error(o);
     }
-    return a;
+    return s;
   }
   return {
     storage: e,
-    signIn: n,
-    signOut: r,
-    getProviders: i
+    signIn: r,
+    signOut: i,
+    getProviders: a
   };
 }, qc = re();
 function WSe() {
@@ -60500,7 +60503,7 @@ const D6e = {
     providers: {}
   },
   setup(t) {
-    const e = /* @__PURE__ */ Object.assign({ "./azuread.vue": () => import("./azuread-36Jpmrhw.js"), "./external-provider.vue": () => import("./external-provider-C8gSyvJw.js"), "./external-providers.vue": () => import("./external-providers-B0oU_R3n.js") }), n = (r) => {
+    const e = /* @__PURE__ */ Object.assign({ "./azuread.vue": () => import("./azuread-BLZ8u__x.js"), "./external-provider.vue": () => import("./external-provider-BLMlIQHa.js"), "./external-providers.vue": () => import("./external-providers-BXnXf0Vm.js") }), n = (r) => {
       const i = `./${r.toLowerCase()}.vue`, a = e[i];
       return a !== void 0 ? one({
         loader: a,

package/dist/shared/components/sign-in/useExternalProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExternalProvider.d.ts","sourceRoot":"","sources":["../../../../shared/components/sign-in/useExternalProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAwB,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE9F,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC;QAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,OAAO,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,GAAG,SAAS,CAAC,CAAC;CACvE;AAID,eAAO,MAAM,mBAAmB,QAAO,oBAgFtC,CAAC"}
+{"version":3,"file":"useExternalProvider.d.ts","sourceRoot":"","sources":["../../../../shared/components/sign-in/useExternalProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAwB,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE9F,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC;QAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,OAAO,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,GAAG,SAAS,CAAC,CAAC;CACvE;AAID,eAAO,MAAM,mBAAmB,QAAO,oBAuFtC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.300",
+  "version": "1.0.301",
   "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.300",
-    "@vc-shell/config-generator": "^1.0.300",
-    "@vc-shell/ts-config": "^1.0.300",
+    "@vc-shell/api-client-generator": "^1.0.301",
+    "@vc-shell/config-generator": "^1.0.301",
+    "@vc-shell/ts-config": "^1.0.301",
     "@vitejs/plugin-vue": "5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/shared/components/sign-in/useExternalProvider.ts

@@ -29,44 +29,51 @@ export const useExternalProvider = (): IUseExternalProvider => {
 
   async function externalSignIn(authenticationType: string, oidcUrl: string) {
     try {
-      let url_ = window.location.origin + "/externalsignin?";
-      const returnUrl = window.location.pathname ?? "/";
+      const origin = window.location.origin;
+      const finalReturnUrl = window.location.pathname ?? getReturnUrlValue() ?? "/";
+
+      if (!authenticationType) {
+        throw new Error("The parameter 'authenticationType' cannot be null or undefined.");
+      }
 
-      const signInData = {
-        providerType: authenticationType,
-      };
+      // const oidcUrlObject = new URL(oidcUrl, origin);
+      // const callbackUrl = new URL("/auth/callback", origin);
+      const url = new URL("/externalsignin", origin);
 
-      externalSignInStorage.value = signInData;
+      // Set query parameters
+      // callbackUrl.searchParams.set("returnUrl", finalReturnUrl);
+      url.searchParams.set("authenticationType", authenticationType);
+      // url.searchParams.set("callbackUrl", callbackUrl.href);
+      url.searchParams.set("returnUrl", finalReturnUrl);
 
-      if (authenticationType === null) throw new Error("The parameter 'authenticationType' cannot be null.");
-      else {
-        if (authenticationType !== undefined)
-          url_ += "authenticationType=" + encodeURIComponent("" + authenticationType) + "&";
-        if (returnUrl !== undefined) url_ += "returnUrl=" + encodeURIComponent("" + returnUrl) + "&";
-      }
-      url_ = url_.replace(/[?&]$/, "");
+      // Store sign-in data
+      externalSignInStorage.value = { providerType: authenticationType };
 
-      window.location.href = url_;
+      console.log("url", url);
+      // Redirect to the constructed URL
+      window.location.assign(url);
     } catch (e) {
       console.error(e);
-
       throw e;
     }
   }
 
   async function externalSignOut(authenticationType: string): Promise<void> {
     try {
-      let url_ = window.location.origin + "/externalsignin/signout?";
+      const origin = window.location.origin;
+      const returnUrl = window.location.pathname ?? "/";
 
-      if (authenticationType !== undefined)
-        url_ += "authenticationType=" + encodeURIComponent("" + authenticationType) + "&";
-      if (window.location.pathname !== undefined)
-        url_ += "returnUrl=" + encodeURIComponent("" + window.location.pathname) + "&";
+      const url = new URL("/externalsignin/signout", origin);
 
-      url_ = url_.replace(/[?&]$/, "");
-      window.location.href = url_;
+      // Set query parameters
+      url.searchParams.set("authenticationType", authenticationType);
+      url.searchParams.set("returnUrl", returnUrl);
 
+      // Clear sign-in data
       externalSignInStorage.value = {};
+
+      // Redirect to the sign-out URL
+      window.location.assign(url);
     } catch (e) {
       console.error(e);
       throw e;

package/dist/external-providers-B0oU_R3n.js

@@ -1,4 +0,0 @@
-import { b as f } from "./index-brymheD-.js";
-export {
-  f as default
-};