@vc-shell/framework 1.0.83 → 1.0.85

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.0.85](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.84...v1.0.85) (2023-06-23)
+
+
+### Bug Fixes
+
+* check permissions plugin ([cc65272](https://github.com/VirtoCommerce/vc-shell/commit/cc65272d933e29f427b1403df2bdd627b15dd1e6))
+
+
+
+## [1.0.84](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.83...v1.0.84) (2023-06-23)
+
+
+
 ## [1.0.83](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.82...v1.0.83) (2023-06-23)
 
 

package/core/composables/useUser/index.ts

@@ -1,4 +1,4 @@
-import { computed, Ref, ref, ComputedRef } from "vue";
+import { computed, Ref, ref, ComputedRef, getCurrentInstance, inject } from "vue";
 import ClientOAuth2 from "client-oauth2";
 import {
   UserDetail,
@@ -48,6 +48,8 @@ interface IUseUser {
 }
 
 export function useUser(): IUseUser {
+  const instance = getCurrentInstance();
+  const base = instance && inject("platformUrl");
   const externalSignInStorage = useLocalStorage<{ providerType: string }>("externalSignIn", { providerType: null });
 
   const isAuthenticated = async () => {
@@ -112,8 +114,7 @@ export function useUser(): IUseUser {
     console.debug(`[@vc-shell/framework#useUser:signOut] - Entry point`);
 
     if (externalSignInStorage.value && externalSignInStorage.value.providerType) {
-      externalSignOut(externalSignInStorage.value.providerType);
-      externalSignInStorage.value = null;
+      externalSignOut(externalSignInStorage.value.providerType, window.location.pathname);
     } else {
       user.value = undefined;
       authData.value = undefined;
@@ -247,9 +248,9 @@ export function useUser(): IUseUser {
     return result;
   }
 
-  async function externalSignIn(authenticationType: string | undefined, returnUrl: string | undefined) {
+  async function externalSignIn(authenticationType: string, returnUrl: string) {
     try {
-      let url_ = "externalsignin?";
+      let url_ = base + "externalsignin?";
 
       const signInData = {
         providerType: authenticationType,
@@ -273,10 +274,21 @@ export function useUser(): IUseUser {
     }
   }
 
-  async function externalSignOut(authenticationType: string | undefined): Promise<void> {
+  async function externalSignOut(authenticationType: string, returnUrl: string): Promise<void> {
     try {
-      const url = "externalsignin/signout?authenticationType=" + authenticationType;
-      window.location.href = url;
+      let url_ = base + "externalsignin/signout?";
+
+      externalSignInStorage.value = null;
+
+      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(/[?&]$/, "");
+
+      window.location.href = url_;
     } catch (e) {
       console.error(e);
       throw e;

package/core/directives/index.ts

@@ -1,3 +1,2 @@
-export * from "./permissions";
 export * from "./autofocus";
 export * from "./loading";

package/core/plugins/index.ts

@@ -3,3 +3,4 @@ export * from "./i18n";
 export * from "./validation";
 export * from "./modularity";
 export * from "./signalR";
+export * from "./permissions";

package/core/plugins/permissions/index.ts

@@ -0,0 +1,10 @@
+import { usePermissions } from "./../../composables";
+import { App } from "vue";
+
+export const permissions = {
+  install(app: App) {
+    const { checkPermission } = usePermissions();
+    app.config.globalProperties.$hasAccess = checkPermission;
+    app.provide("$hasAccess", checkPermission);
+  },
+};

package/dist/core/composables/useUser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,KAAK,CAAC;AAEtD,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiB/E,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACnG,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC/E,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,yBAAyB,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACvE,cAAc,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAClG,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACzC;AAED,wBAAgB,OAAO,IAAI,QAAQ,CA6PlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAA8B,MAAM,KAAK,CAAC;AAElF,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiB/E,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACnG,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC/E,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,yBAAyB,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACvE,cAAc,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAClG,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACzC;AAED,wBAAgB,OAAO,IAAI,QAAQ,CAyQlC"}

package/dist/core/directives/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./permissions";
 export * from "./autofocus";
 export * from "./loading";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/directives/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/directives/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/directives/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}

package/dist/core/plugins/index.d.ts

@@ -3,4 +3,5 @@ export * from "./i18n";
 export * from "./validation";
 export * from "./modularity";
 export * from "./signalR";
+export * from "./permissions";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/plugins/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/plugins/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/plugins/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC"}

package/dist/core/plugins/permissions/index.d.ts

@@ -0,0 +1,5 @@
+import { App } from "vue";
+export declare const permissions: {
+    install(app: App): void;
+};
+//# sourceMappingURL=index.d.ts.map

package/dist/core/plugins/permissions/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/plugins/permissions/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,eAAO,MAAM,WAAW;iBACT,GAAG;CAKjB,CAAC"}