login-authorization-v2 2.0.0-beta.6 → 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

@@ -2,6 +2,38 @@ import Cookie from 'js-cookie';
 import { Base64 } from 'js-base64';
 import axios from 'axios';
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 const NO_ACCESS_TOKEN = 'Access token not found';
 const INVALID_ACCESS_TOKEN = 'Invalid access token';
 const INVALID_REFRESH_TOKEN = 'Invalid refresh token';
@@ -17,13 +49,9 @@ const makeSetCookieFn = (key, options) => {
         : window.location.hostname.slice(index);
     return (value) => {
         if (value === null) {
-            return Cookie.remove(key, { domain, ...options });
+            return Cookie.remove(key, Object.assign({ domain }, options));
         }
-        Cookie.set(key, value, {
-            domain,
-            expires: 30,
-            ...options
-        });
+        Cookie.set(key, value, Object.assign({ domain, expires: 30 }, options));
     };
 };
 const setIdTokenFront = makeSetCookieFn('idTokenFront');
@@ -202,8 +230,8 @@ const openDialog = () => {
         : container.innerHTML = createPcDialog();
     const confirmButton = container.querySelector('#confirm');
     const cancelButton = container.querySelector('#cancel');
-    confirmButton?.addEventListener('click', onConfirmHandler);
-    cancelButton?.addEventListener('click', onCancelHandler);
+    confirmButton === null || confirmButton === void 0 ? void 0 : confirmButton.addEventListener('click', onConfirmHandler);
+    cancelButton === null || cancelButton === void 0 ? void 0 : cancelButton.addEventListener('click', onCancelHandler);
     document.body.appendChild(container);
 };
 
@@ -211,10 +239,10 @@ let instance;
 /**
  *  没找到更好的方式，只能这样做了
  */
-const initInstance = async () => {
+const initInstance = () => __awaiter(void 0, void 0, void 0, function* () {
     let userInfo = null;
     try {
-        userInfo = await getUserInfo();
+        userInfo = yield getUserInfo();
     }
     catch (error) {
         console.warn('initInstance getUserInfo error:', error);
@@ -222,13 +250,9 @@ const initInstance = async () => {
     instance = axios.create({
         baseURL: moduleBaseUrl,
         timeout: 1.5e4,
-        headers: {
-            'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(),
-            'X-brand': brand.toString(),
-            'Authorization': `Bearer ${getAccessToken()}`,
-        }
     });
     instance.interceptors.request.use((config) => {
+        config.headers = Object.assign(Object.assign({}, config.headers), { 'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(), 'X-brand': brand.toString(), 'Authorization': `Bearer ${getAccessToken()}` });
         return config;
     }, (error) => {
         return Promise.reject(error);
@@ -241,7 +265,7 @@ const initInstance = async () => {
     }, (error) => {
         return Promise.reject(error);
     });
-};
+});
 const fetchRefreshTokenHTTP = (refreshToken) => {
     return instance({
         method: 'post',
@@ -271,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) {
@@ -288,35 +312,39 @@ const make = (config) => {
             return Promise.reject(new Error(NO_REFRESH_TOKEN));
         }
         return getUserInfo()
-            .then(async (userInfo) => {
+            .then((userInfo) => __awaiter(void 0, void 0, void 0, function* () {
             const valid = detectUserInfoGroupAuth(userInfo);
             if (!valid) {
                 return Promise.reject();
             }
             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);
         })
-            .catch(async (error) => {
+            .catch((error) => __awaiter(void 0, void 0, void 0, function* () {
             clearRefreshTokenTimer();
             setAccessToken(null);
             setRefreshToken(null);
-            await logout();
+            yield logout();
             throw error;
-        });
+        }));
     };
     const detectUserInfoGroupAuth = (userInfo) => {
         const groups = userInfo['cognito:groups'] || [];

package/dist/index.umd.js

@@ -4,6 +4,38 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.LoginAuthorizationV2 = {}, global.Cookies, global.Base64, global.axios));
 })(this, (function (exports, Cookie, jsBase64, axios) { 'use strict';
 
+    /******************************************************************************
+    Copyright (c) Microsoft Corporation.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose with or without fee is hereby granted.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+    ***************************************************************************** */
+    /* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+    function __awaiter(thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+
+    typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+
     const NO_ACCESS_TOKEN = 'Access token not found';
     const INVALID_ACCESS_TOKEN = 'Invalid access token';
     const INVALID_REFRESH_TOKEN = 'Invalid refresh token';
@@ -19,13 +51,9 @@
             : window.location.hostname.slice(index);
         return (value) => {
             if (value === null) {
-                return Cookie.remove(key, { domain, ...options });
+                return Cookie.remove(key, Object.assign({ domain }, options));
             }
-            Cookie.set(key, value, {
-                domain,
-                expires: 30,
-                ...options
-            });
+            Cookie.set(key, value, Object.assign({ domain, expires: 30 }, options));
         };
     };
     const setIdTokenFront = makeSetCookieFn('idTokenFront');
@@ -204,8 +232,8 @@
             : container.innerHTML = createPcDialog();
         const confirmButton = container.querySelector('#confirm');
         const cancelButton = container.querySelector('#cancel');
-        confirmButton?.addEventListener('click', onConfirmHandler);
-        cancelButton?.addEventListener('click', onCancelHandler);
+        confirmButton === null || confirmButton === void 0 ? void 0 : confirmButton.addEventListener('click', onConfirmHandler);
+        cancelButton === null || cancelButton === void 0 ? void 0 : cancelButton.addEventListener('click', onCancelHandler);
         document.body.appendChild(container);
     };
 
@@ -213,10 +241,10 @@
     /**
      *  没找到更好的方式，只能这样做了
      */
-    const initInstance = async () => {
+    const initInstance = () => __awaiter(void 0, void 0, void 0, function* () {
         let userInfo = null;
         try {
-            userInfo = await getUserInfo();
+            userInfo = yield getUserInfo();
         }
         catch (error) {
             console.warn('initInstance getUserInfo error:', error);
@@ -224,13 +252,9 @@
         instance = axios.create({
             baseURL: moduleBaseUrl,
             timeout: 1.5e4,
-            headers: {
-                'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(),
-                'X-brand': brand.toString(),
-                'Authorization': `Bearer ${getAccessToken()}`,
-            }
         });
         instance.interceptors.request.use((config) => {
+            config.headers = Object.assign(Object.assign({}, config.headers), { 'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(), 'X-brand': brand.toString(), 'Authorization': `Bearer ${getAccessToken()}` });
             return config;
         }, (error) => {
             return Promise.reject(error);
@@ -243,7 +267,7 @@
         }, (error) => {
             return Promise.reject(error);
         });
-    };
+    });
     const fetchRefreshTokenHTTP = (refreshToken) => {
         return instance({
             method: 'post',
@@ -273,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) {
@@ -290,35 +314,39 @@
                 return Promise.reject(new Error(NO_REFRESH_TOKEN));
             }
             return getUserInfo()
-                .then(async (userInfo) => {
+                .then((userInfo) => __awaiter(void 0, void 0, void 0, function* () {
                 const valid = detectUserInfoGroupAuth(userInfo);
                 if (!valid) {
                     return Promise.reject();
                 }
                 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);
             })
-                .catch(async (error) => {
+                .catch((error) => __awaiter(void 0, void 0, void 0, function* () {
                 clearRefreshTokenTimer();
                 setAccessToken(null);
                 setRefreshToken(null);
-                await logout();
+                yield logout();
                 throw error;
-            });
+            }));
         };
         const detectUserInfoGroupAuth = (userInfo) => {
             const groups = userInfo['cognito:groups'] || [];

package/dist/src/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAY,MAAM,SAAS,CAAA;AAEnD,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAA;AAKxD;;GAEG;AACH,eAAO,MAAM,YAAY,qBAqCxB,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAA;QACnB,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB,EAAE,IAAI,CAAA;QACvB,YAAY,EAAE,MAAM,CAAA;QACpB,SAAS,EAAE,QAAQ,CAAA;KACpB,CAAA;CACF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,cAAc,MAAM,KAOlD,YAAY,CAAC,oBAAoB,CACxC,CAAA;AAED,eAAO,MAAM,eAAe,yBAK3B,CAAA;AAED,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,UAAU,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AACD,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AACD,eAAO,MAAM,mBAAmB,QAIxB,YAAY,CAAC,kBAAkB,CACtC,CAAA"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAY,MAAM,SAAS,CAAA;AAEnD,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAA;AAKxD;;GAEG;AACH,eAAO,MAAM,YAAY,qBAuCxB,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAA;QACnB,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB,EAAE,IAAI,CAAA;QACvB,YAAY,EAAE,MAAM,CAAA;QACpB,SAAS,EAAE,QAAQ,CAAA;KACpB,CAAA;CACF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,cAAc,MAAM,KAOlD,YAAY,CAAC,oBAAoB,CACxC,CAAA;AAED,eAAO,MAAM,eAAe,yBAK3B,CAAA;AAED,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,UAAU,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AACD,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AACD,eAAO,MAAM,mBAAmB,QAIxB,YAAY,CAAC,kBAAkB,CACtC,CAAA"}

package/package.json

@@ -1,19 +1,19 @@
 {
   "type": "module",
   "name": "login-authorization-v2",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.9",
   "engines": {
     "node": "^20"
   },
   "description": "login authorization",
-  "main": "./dist-cjs/index.js",
-  "module": "./dist-esm/index.js",
-  "types": "./dist-cjs/index.d.ts",
+  "main": "./dist/index.esm.js",
+  "module": "./dist/index.esm.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist-esm/index.js",
-      "require": "./dist-cjs/index.js",
-      "types": "./dist-cjs/index.d.ts"
+      "module": "./dist/index.esm.js",
+      "require": "./dist/index.umd.js",
+      "types": "./dist/index.d.ts"
     },
     "./package.json": "./package.json"
   },
@@ -44,6 +44,7 @@
     "@jest/globals": "^30.2.0",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/axios": "^0.14.4",
     "@types/jest": "^30.0.0",