npm - login-authorization-v2 - Versions diffs - 2.0.0 → 2.0.2 - Mend

login-authorization-v2 2.0.0 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/README.md CHANGED Viewed

@@ -18,6 +18,7 @@ const { init, logout } = make({
   moduleName: 'Portal', // 当前模块名称
   moduleBaseUrl: 'https://servers-api.gztest.net:8107', // 后端的 module_base 服务地址
   loginPageUrl: 'http://huangcheng.ddmarketinghub.com:8080', // 如果未登录，跳转的登录页地址
+  needMenus: true // 是否需要获取菜单权限数据，默认为 true, 如果能确保就是有权限，可以设置为false，可以少调用一次后端接口
 })
 init({ brand: 1, tenantId: 1 }).then(menus => {

package/dist/index.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ type MakeFnParams = {
     moduleName: ModuleName;
     moduleBaseUrl: string;
     loginPageUrl: string;
+    needMenus?: boolean;
 };
 type InitFnParams = {
     brand?: Brand;

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +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,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;;;;;;;;;~~CAiIvC~~,CAAA"}
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,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,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAKD,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAOD,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;uBAuCb,YAAY;;;;;;;;;CA0GvC,CAAA"}

package/dist/index.esm.js CHANGED Viewed

@@ -302,7 +302,15 @@ const fetchServerListHTTP = () => {
     });
 };
+const defaultMakeFnParams = {
+    needMenus: true
+};
+const whiteList = ['commonLogin', 'App'];
+const isInWhiteList = (moduleName) => {
+    return whiteList.includes(moduleName);
+};
 const make = (config) => {
+    config = Object.assign({}, defaultMakeFnParams, config);
     if (!config.moduleBaseUrl) {
         throw new Error(NO_MODULE_BASE_URL);
     }
@@ -310,6 +318,28 @@ const make = (config) => {
     setModuleBaseUrl(config.moduleBaseUrl);
     setLoginPageUrl(config.loginPageUrl);
     initInstance();
+    const doFetchServerList = () => {
+        return fetchServerListHTTP()
+            .then(resp => {
+            const menus = resp.data.content || [];
+            const group = menus.find(menu => menu.groupName === config.moduleName);
+            if (menus.length <= 0) {
+                openDialog();
+                return Promise.reject();
+            }
+            if (isInWhiteList(config.moduleName)) {
+                setupRefreshTokenTimer();
+                return Promise.resolve(menus);
+            }
+            if (!group) {
+                openDialog();
+                return Promise.reject();
+            }
+            setSystemType(group.staffEndpoint ? SystemType.Staff : SystemType.Client);
+            setupRefreshTokenTimer();
+            return Promise.resolve(menus);
+        });
+    };
     const init = (initConfig) => {
         setTenantId(initConfig.tenantId);
         setBrand(initConfig.brand || Brand.ZERO);
@@ -331,27 +361,10 @@ const make = (config) => {
             if (!valid) {
                 return Promise.reject();
             }
-            return fetchServerListHTTP();
+            return config.needMenus
+                ? doFetchServerList()
+                : Promise.resolve([]);
         }))
-            .then(resp => {
-            const menus = resp.data.content || [];
-            const group = menus.find(menu => menu.groupName === config.moduleName);
-            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((error) => __awaiter(void 0, void 0, void 0, function* () {
             clearRefreshTokenTimer();
             setAccessToken(null);
@@ -361,9 +374,8 @@ const make = (config) => {
     };
     const detectUserInfoGroupAuth = (userInfo) => {
         const groups = userInfo['cognito:groups'] || [];
-        if (!groups.includes(config.moduleName)
-            && config.moduleName !== 'commonLogin'
-            && config.moduleName !== 'App') {
+        if (!groups.includes(config.moduleName) &&
+            !isInWhiteList(config.moduleName)) {
             return false;
         }
         return true;

package/dist/index.umd.js CHANGED Viewed

@@ -304,7 +304,15 @@
         });
     };
+    const defaultMakeFnParams = {
+        needMenus: true
+    };
+    const whiteList = ['commonLogin', 'App'];
+    const isInWhiteList = (moduleName) => {
+        return whiteList.includes(moduleName);
+    };
     const make = (config) => {
+        config = Object.assign({}, defaultMakeFnParams, config);
         if (!config.moduleBaseUrl) {
             throw new Error(NO_MODULE_BASE_URL);
         }
@@ -312,6 +320,28 @@
         setModuleBaseUrl(config.moduleBaseUrl);
         setLoginPageUrl(config.loginPageUrl);
         initInstance();
+        const doFetchServerList = () => {
+            return fetchServerListHTTP()
+                .then(resp => {
+                const menus = resp.data.content || [];
+                const group = menus.find(menu => menu.groupName === config.moduleName);
+                if (menus.length <= 0) {
+                    openDialog();
+                    return Promise.reject();
+                }
+                if (isInWhiteList(config.moduleName)) {
+                    setupRefreshTokenTimer();
+                    return Promise.resolve(menus);
+                }
+                if (!group) {
+                    openDialog();
+                    return Promise.reject();
+                }
+                setSystemType(group.staffEndpoint ? SystemType.Staff : SystemType.Client);
+                setupRefreshTokenTimer();
+                return Promise.resolve(menus);
+            });
+        };
         const init = (initConfig) => {
             setTenantId(initConfig.tenantId);
             setBrand(initConfig.brand || Brand.ZERO);
@@ -333,27 +363,10 @@
                 if (!valid) {
                     return Promise.reject();
                 }
-                return fetchServerListHTTP();
+                return config.needMenus
+                    ? doFetchServerList()
+                    : Promise.resolve([]);
             }))
-                .then(resp => {
-                const menus = resp.data.content || [];
-                const group = menus.find(menu => menu.groupName === config.moduleName);
-                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((error) => __awaiter(void 0, void 0, void 0, function* () {
                 clearRefreshTokenTimer();
                 setAccessToken(null);
@@ -363,9 +376,8 @@
         };
         const detectUserInfoGroupAuth = (userInfo) => {
             const groups = userInfo['cognito:groups'] || [];
-            if (!groups.includes(config.moduleName)
-                && config.moduleName !== 'commonLogin'
-                && config.moduleName !== 'App') {
+            if (!groups.includes(config.moduleName) &&
+                !isInWhiteList(config.moduleName)) {
                 return false;
             }
             return true;

package/package.json CHANGED Viewed

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