login-authorization-v2 2.0.0-beta.7 → 2.0.0-beta.9

package/dist/index.d.ts

@@ -1,16 +1,18 @@
 export * from './src/cookie';
 export * from './src/compatible';
 export * from './src/utils';
-import { type ModuleName, type Tenant, type Brand } from './src/types';
+import { Brand, type ModuleName, Tenant } from './src/types';
 type MakeFnParams = {
-    brand: Brand;
-    tenantId: Tenant;
     moduleName: ModuleName;
     moduleBaseUrl: string;
     loginPageUrl: string;
 };
+type InitFnParams = {
+    brand?: Brand;
+    tenantId: Tenant;
+};
 export declare const make: (config: MakeFnParams) => {
-    init: () => Promise<{
+    init: (initConfig: InitFnParams) => Promise<{
         groupName: ModuleName;
         icon: string;
         id: number;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAO3B,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAiB,MAAM,aAAa,CAAA;AAIrF,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,KAAK,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;;;;;;;;;;CAqIxC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,KAAK,UAAU,EAAc,MAAM,EAAiB,MAAM,aAAa,CAAA;AAGvF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;uBAUb,YAAY;;;;;;;;;CAmIvC,CAAA"}

package/dist/index.esm.js

@@ -295,10 +295,10 @@ const make = (config) => {
     let timer = undefined;
     setModuleBaseUrl(config.moduleBaseUrl);
     setLoginPageUrl(config.loginPageUrl);
-    setTenantId(config.tenantId);
-    setBrand(config.brand);
     initInstance();
-    const init = () => {
+    const init = (initConfig) => {
+        setTenantId(initConfig.tenantId);
+        setBrand(initConfig.brand || Brand.ZERO);
         const token = getAccessToken();
         const refreshToken = getRefreshToken();
         if (!token) {
@@ -319,18 +319,22 @@ const make = (config) => {
             }
             return fetchServerListHTTP();
         }))
-            .catch(error => {
-            openDialog();
-            throw error;
-        })
             .then(resp => {
             const menus = resp.data.content || [];
-            if (menus.length <= 0)
-                return Promise.reject();
             const group = menus.find(menu => menu.groupName === config.moduleName);
-            if (group) {
-                setSystemType(group.staffEndpoint ? SystemType.Staff : SystemType.Client);
+            if (menus.length <= 0) {
+                openDialog();
+                return Promise.reject();
+            }
+            if (config.moduleName === 'commonLogin') {
+                setupRefreshTokenTimer();
+                return Promise.resolve(menus);
+            }
+            if (!group) {
+                openDialog();
+                return Promise.reject();
             }
+            setSystemType(group.staffEndpoint ? SystemType.Staff : SystemType.Client);
             setupRefreshTokenTimer();
             return Promise.resolve(menus);
         })

package/dist/index.umd.js

@@ -297,10 +297,10 @@
         let timer = undefined;
         setModuleBaseUrl(config.moduleBaseUrl);
         setLoginPageUrl(config.loginPageUrl);
-        setTenantId(config.tenantId);
-        setBrand(config.brand);
         initInstance();
-        const init = () => {
+        const init = (initConfig) => {
+            setTenantId(initConfig.tenantId);
+            setBrand(initConfig.brand || Brand.ZERO);
             const token = getAccessToken();
             const refreshToken = getRefreshToken();
             if (!token) {
@@ -321,18 +321,22 @@
                 }
                 return fetchServerListHTTP();
             }))
-                .catch(error => {
-                openDialog();
-                throw error;
-            })
                 .then(resp => {
                 const menus = resp.data.content || [];
-                if (menus.length <= 0)
-                    return Promise.reject();
                 const group = menus.find(menu => menu.groupName === config.moduleName);
-                if (group) {
-                    setSystemType(group.staffEndpoint ? SystemType.Staff : SystemType.Client);
+                if (menus.length <= 0) {
+                    openDialog();
+                    return Promise.reject();
+                }
+                if (config.moduleName === 'commonLogin') {
+                    setupRefreshTokenTimer();
+                    return Promise.resolve(menus);
+                }
+                if (!group) {
+                    openDialog();
+                    return Promise.reject();
                 }
+                setSystemType(group.staffEndpoint ? SystemType.Staff : SystemType.Client);
                 setupRefreshTokenTimer();
                 return Promise.resolve(menus);
             })

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "login-authorization-v2",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.9",
   "engines": {
     "node": "^20"
   },