@vc-shell/framework 1.0.126 → 1.0.128

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.0.128](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.127...v1.0.128) (2023-12-14)
+
+
+### Features
+
+* **dynamic:** ability to add custom visibility method to columns schema ([68922fd](https://github.com/VirtoCommerce/vc-shell/commit/68922fda60310f1f85d5c34122248693897354e4))
+
+
+
+## [1.0.127](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.126...v1.0.127) (2023-12-13)
+
+
+### Bug Fixes
+
+* **dynamic:** props pass to created component instance ([29331fb](https://github.com/VirtoCommerce/vc-shell/commit/29331fb60bacf142d48eccc1af117a0b8fc299dd))
+
+
+
 ## [1.0.126](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.125...v1.0.126) (2023-11-28)
 
 

package/core/composables/useUser/index.ts

@@ -14,7 +14,7 @@ import {
   ExternalSignInProviderInfo,
 } from "./../../api/platform";
 import { AuthData, RequestPasswordResult, SignInResults } from "./../../types";
-import { useLocalStorage } from "@vueuse/core";
+import { useLocalStorage, useStorage } from "@vueuse/core";
 //The Platform Manager uses the same key to store authorization data in the
 //local storage, so we can exchange authorization data between the Platform Manager
 //and the user application that is hosted in the same domain as the sub application.
@@ -22,7 +22,6 @@ const VC_AUTH_DATA_KEY = "ls.authenticationData";
 
 const user: Ref<UserDetail | undefined> = ref();
 const loading: Ref<boolean> = ref(false);
-const authData: Ref<AuthData | undefined> = ref();
 const authClient = new ClientOAuth2({
   accessTokenUri: `/connect/token`,
   scopes: ["offline_access"],
@@ -48,7 +47,16 @@ interface IUseUser {
   isAuthenticated: () => Promise<boolean>;
 }
 
+const simulateLogin = async () => {
+  return {
+    accessToken: "testToken",
+    refreshToken: "testTokenRefresh",
+    data: { expires_in: new Date(new Date().setDate(new Date().getDate() + 1)) },
+  };
+};
+
 export function useUser(): IUseUser {
+  const authData: Ref<AuthData | null> = useStorage(VC_AUTH_DATA_KEY, {});
   const base = window.location.origin + "/";
   const externalSecurityClient = new ExternalSignInClient(base);
   const externalSignInStorage = useLocalStorage<{ providerType: string | undefined }>("externalSignIn", {
@@ -90,7 +98,7 @@ export function useUser(): IUseUser {
     let token = undefined;
     try {
       loading.value = true;
-      token = await authClient.owner.getToken(username, password);
+      token = !window.__DEMO_MODE__ ? await authClient.owner.getToken(username, password) : await simulateLogin();
     } catch (e) {
       //TODO: log error
       return { succeeded: false, error: e as string };
@@ -102,13 +110,14 @@ export function useUser(): IUseUser {
       authData.value = {
         accessToken: token.accessToken,
         refreshToken: token.refreshToken,
-        expiresAt: addOffsetToCurrentDate(Number(token.data["expires_in"])),
+        expiresAt: addOffsetToCurrentDate(Number(token.data?.["expires_in"])),
         userName: username,
       };
       console.log("[useUser]: an access token has been obtained successfully", authData.value);
 
       storeAuthData(authData.value);
     }
+
     await loadUser();
     return { succeeded: true };
   }
@@ -120,68 +129,74 @@ export function useUser(): IUseUser {
       externalSignOut(externalSignInStorage.value.providerType);
     } else {
       user.value = undefined;
-      authData.value = undefined;
-      storeAuthData({});
+      authData.value = null;
+      storeAuthData(null);
     }
   }
 
   async function loadUser(): Promise<UserDetail> {
     console.debug(`[@vc-shell/framework#useUser:loadUser] - Entry point`);
-    const token = await getAccessToken();
-    if (token) {
-      securityClient.setAuthToken(token);
 
-      try {
-        loading.value = true;
-        user.value = await securityClient.getCurrentUser();
-        console.log("[useUser]: an user details has been loaded", user.value);
-      } catch (e) {
-        console.dir(e);
-        throw e;
-      } finally {
-        loading.value = false;
+    if (!externalSignInStorage.value?.providerType) {
+      const token = await getAccessToken();
+      if (token) {
+        securityClient.setAuthToken(token);
       }
     }
 
+    try {
+      loading.value = true;
+      user.value = !window.__DEMO_MODE__
+        ? await securityClient.getCurrentUser()
+        : ({
+            id: "testUserId",
+            userName: "testUserName",
+          } as UserDetail);
+
+      console.log("[useUser]: an user details has been loaded", user.value);
+    } catch (e: any) {
+      console.dir(e);
+    } finally {
+      loading.value = false;
+    }
+
     return { ...user.value } as UserDetail;
   }
 
   async function getAccessToken(): Promise<string | undefined> {
     console.debug(`[@vc-shell/framework#useUser:getAccessToken] - Entry point`);
-    if (!authData.value || Object.keys(authData.value).length === 0) {
-      authData.value = await readAuthData();
-    }
-
-    if (authData.value && Date.now() >= (authData.value.expiresAt ?? 0)) {
-      const token = authClient.createToken(
-        authData.value.accessToken ?? authData.value.token ?? "",
-        authData.value.refreshToken ?? "",
-        {}
-      );
-
-      console.log("[useUser]: an access token is expired, using refresh token to receive a new");
-      try {
-        const newToken = await token.refresh();
-        if (newToken) {
-          authData.value = {
-            ...authData.value,
-            accessToken: newToken.accessToken,
-            token: newToken.accessToken,
-            refreshToken: newToken.refreshToken,
-            expiresAt: addOffsetToCurrentDate(Number(newToken.data["expires_in"])),
-          };
-          storeAuthData(authData.value);
+    if (authData.value) {
+      if (Date.now() >= (authData.value.expiresAt ?? 0)) {
+        const token = authClient.createToken(
+          authData.value.accessToken ?? authData.value.token ?? "",
+          authData.value.refreshToken ?? "",
+          {}
+        );
+
+        console.log("[useUser]: an access token is expired, using refresh token to receive a new");
+        try {
+          const newToken = await token.refresh();
+          if (newToken) {
+            authData.value = {
+              ...authData.value,
+              accessToken: newToken.accessToken,
+              token: newToken.accessToken,
+              refreshToken: newToken.refreshToken,
+              expiresAt: addOffsetToCurrentDate(Number(newToken.data["expires_in"])),
+            };
+            storeAuthData(authData.value);
+          }
+        } catch (e: any) {
+          console.log("[useUser]: getAccessToken() returns error", e);
         }
-      } catch (e) {
-        console.log("[useUser]: getAccessToken() returns error", e);
       }
-    }
 
-    return authData.value?.accessToken ?? authData.value?.token;
+      return authData.value?.accessToken ?? authData.value?.token;
+    }
   }
 
-  function storeAuthData(authData: AuthData) {
-    localStorage.setItem(VC_AUTH_DATA_KEY, JSON.stringify({ ...(authData || {}) }));
+  function storeAuthData(data: AuthData | null) {
+    authData.value = data;
   }
 
   async function readAuthData(): Promise<AuthData> {

package/core/plugins/signalR/index.ts

@@ -12,7 +12,7 @@ export const signalR = {
       .configureLogging(LogLevel.Information)
       .build();
 
-    function start() {
+    const start = () => {
       connection
         .start()
         .then(() => {
@@ -22,7 +22,7 @@ export const signalR = {
           console.log("SignalR Connection Error: ", err);
           setTimeout(() => start(), 5000);
         });
-    }
+    };
 
     connection.onclose(() => {
       start();

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":"AACA,OAAO,EAAsB,WAAW,EAAE,MAAM,KAAK,CAAC;AAEtD,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAgB/E,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAC1C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,eAAe,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IAClD,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAClD,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,GAAG,SAAS,CAAC,CAAC;IACtG,yBAAyB,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,GAAG,SAAS,CAAC,CAAC;IACnF,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,CAmQlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,WAAW,EAAE,MAAM,KAAK,CAAC;AAEtD,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAe/E,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAC1C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,eAAe,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IAClD,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAClD,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,GAAG,SAAS,CAAC,CAAC;IACtG,yBAAyB,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,GAAG,SAAS,CAAC,CAAC;IACnF,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;AAUD,wBAAgB,OAAO,IAAI,QAAQ,CA2QlC"}