gant-core 0.1.28 → 0.1.30

package/lib/index.d.ts

@@ -1984,6 +1984,7 @@ interface GlobalOptions {
     base?: string;
     menuData?: ServerMenuData | ((res: UserAggregateInfo) => ServerMenuData);
     loginSuccessCallback?: () => void;
+    ssoCallback?: () => boolean;
 }
 
 declare const MENU_HISTORY_UPDATE = "MENU_HISTORY_UPDATE";
@@ -2065,7 +2066,7 @@ declare class BaseLogin {
 declare class SSOLogin {
     init(ssoConfig?: SSOConfigType): void;
     private ssoConfig;
-    isSso: () => Promise<boolean>;
+    isSso: (ssoCallback?: () => boolean) => Promise<boolean>;
     ssoLogin: () => boolean;
     ssoLoginOut: () => void;
 }
@@ -2080,8 +2081,9 @@ declare class LoginStore extends BaseLogin {
     ssoLogin: SSOLogin;
     validate: ValidateLogin;
     noCheckPermissionsPath?: string[];
+    ssoCallback?: () => boolean;
     constructor();
-    init: (loginConfig?: LOGIN_CONFIG, base?: string) => void;
+    init: (loginConfig?: LOGIN_CONFIG, base?: string, ssoCallback?: () => boolean) => void;
     isNoLoginRequiredPage: () => boolean;
     loginOut: () => Promise<void>;
     loginAuthentication: (params: BeforeLoginCheckCodeParams) => Promise<void>;

package/lib/index.js

@@ -1,6 +1,6 @@
 import axios__default from 'axios';
 export * from 'axios';
-import { forEach, groupBy, reduce, find, pick, get as get$1, uniqueId, omit, isEmpty, findIndex, cloneDeep, mapValues, uniqBy, toLower, isObject, mergeWith, has, join } from 'lodash-es';
+import { forEach, groupBy, reduce, find, pick, get as get$1, uniqueId, omit, isEmpty, findIndex, isPlainObject, cloneDeep, mapValues, uniqBy, toLower, isObject, mergeWith, has, join } from 'lodash-es';
 import mitt from 'mitt';
 
 class InterceptorManager {
@@ -723,7 +723,7 @@ class UserStore {
         const userInfo = userLoginName
             ? await getUserByUserLoginNameApi(userId)
             : await getUserByIdApi(userId);
-        this.users.push(userInfo);
+        isPlainObject(userInfo) && this.users.push(userInfo);
         return userInfo;
     };
 }
@@ -1045,28 +1045,31 @@ class BaseLogin {
 
 const defaultSsoConfig = {
     sso: false,
-    ssoUrlSearchParams: ['ticket'],
-    ssoCheckTokenUrl: '',
-    ssoSuccessUrlkey: 'successUrl',
-    ssoLoginUrl: window.location.origin + '/fwSecurity/ssoAuth/login.api',
-    ssologinOutUrl: window.location.origin + 'fwSecurity/ssoAuth/logout.api',
+    ssoUrlSearchParams: ["ticket"],
+    ssoCheckTokenUrl: "",
+    ssoSuccessUrlkey: "successUrl",
+    ssoLoginUrl: window.location.origin + "/fwSecurity/ssoAuth/login.api",
+    ssologinOutUrl: window.location.origin + "fwSecurity/ssoAuth/logout.api",
 };
 class SSOLogin {
     init(ssoConfig) {
         this.ssoConfig = { ...this.ssoConfig, ...ssoConfig };
     }
     ssoConfig = defaultSsoConfig;
-    isSso = async () => {
+    isSso = async (ssoCallback) => {
         if (!this.ssoConfig.sso)
-            return;
+            return false;
+        let sso = false;
         try {
-            const onlyRedirect = await checkAuthConfigApi();
-            return !!onlyRedirect;
+            sso = await checkAuthConfigApi();
         }
         catch (error) {
-            console.error('sso', error);
+            console.error("sso", error);
         }
-        return false;
+        if (ssoCallback) {
+            sso = await ssoCallback();
+        }
+        return !!sso;
     };
     ssoLogin = () => {
         //在检测cookie中是否包含userIdentity信息
@@ -1105,16 +1108,18 @@ class LoginStore extends BaseLogin {
     ssoLogin;
     validate;
     noCheckPermissionsPath = [];
+    ssoCallback;
     constructor() {
         super();
         this.ssoLogin = new SSOLogin();
         this.validate = new ValidateLogin();
     }
-    init = (loginConfig, base = '/') => {
+    init = (loginConfig, base = "/", ssoCallback) => {
         this.BASE = base;
+        this.ssoCallback = ssoCallback;
         this.noCheckPermissionsPath = loginConfig?.noCheckPermissionsPath;
         this.ssoLogin.init(loginConfig);
-        this.loginPathname = loginConfig?.loginPathname || '/login';
+        this.loginPathname = loginConfig?.loginPathname || "/login";
     };
     isNoLoginRequiredPage = () => {
         const pathname = window.location.pathname;
@@ -1124,7 +1129,7 @@ class LoginStore extends BaseLogin {
         return isNoLogin;
     };
     loginOut = async () => {
-        const isSSO = await this.ssoLogin.isSso();
+        const isSSO = await this.ssoLogin.isSso(this.ssoCallback);
         if (isSSO)
             this.ssoLogin.ssoLoginOut();
         await this.baseLoginOut();
@@ -1137,7 +1142,7 @@ class LoginStore extends BaseLogin {
     redirectLogin = async () => {
         if (this.isNoLoginRequiredPage())
             return true;
-        const isSSO = await this.ssoLogin.isSso();
+        const isSSO = await this.ssoLogin.isSso(this.ssoCallback);
         if (isSSO) {
             this.ssoLogin.ssoLogin();
             return false;
@@ -1188,8 +1193,8 @@ class GlobalStoreClass {
         this.menuStore.init(isEmpty(localeMenus) ? startMenus : localeMenus, currentUser.id);
     };
     init = async (options) => {
-        const { base = "/", menuData, loginSuccessCallback } = options;
-        this.loginStore.init(options?.loginConfig, base);
+        const { base = "/", menuData, loginSuccessCallback, ssoCallback } = options;
+        this.loginStore.init(options?.loginConfig, base, ssoCallback);
         try {
             //检查token
             const res = await this.loginStore.chekToken();