@clownlee/cores 1.0.18 → 1.0.20

package/dist/apis/auth.d.ts

@@ -1,55 +1,11 @@
 import { RequestInitConfig, HttpInstance } from '@clownlee/http';
 
-export default class Apis {
+/**
+ * 子应用授权相关 API（登录/注册等已提取至 main-app views/auth）
+ */
+export default class SubAppAuthApis {
     protected http: HttpInstance;
     constructor(config: RequestInitConfig | HttpInstance);
-    /**
-     * 用户登录 API
-     * @param data 登录表单数据
-     * @returns 用户信息和Token
-     */
-    login(data: any): Promise<any>;
-    /**
-     * 用户登出 API
-     * @param data 登出数据，包含 userId、password、tenantId
-     * @returns 登出结果
-     */
-    logout(data?: {
-        userId?: string;
-        password?: string;
-        tenantId?: string;
-    }): Promise<any>;
-    /**
-     * 用户注册 API
-     * @param data 注册表单数据
-     * @returns 用户信息和Token
-     */
-    register(data: any): Promise<any>;
-    /**
-     * 获取租户列表 API
-     * @param type 租户类型：LOGIN（登录）或 REGISTER（注册）
-     * @returns 租户列表
-     */
-    getTenants(type?: 'LOGIN' | 'REGISTER'): Promise<any>;
-    /**
-     * 获取授权码 API
-     * @param token 一次性Token（JWT）
-     * @returns 授权码
-     */
-    getAuthorizationCode(token: string): Promise<any>;
-    /**
-     * 获取AccessToken和RefreshToken API
-     * @param code 授权码
-     * @param token 一次性Token（JWT）
-     * @returns AccessToken和RefreshToken
-     */
-    getAccessToken(code: string, token: string): Promise<any>;
-    /**
-     * Token 刷新 API
-     * @param refreshToken RefreshToken
-     * @returns 新的AccessToken
-     */
-    refreshToken(refreshToken: string): Promise<any>;
     /**
      * 获取子应用授权码 API
      * @param clientId 客户端ID

package/dist/apis/index.d.ts

@@ -1,9 +1,9 @@
 import { default as MenuApis } from './menu';
-import { default as AuthApis } from './auth';
+import { default as SubAppAuthApis } from './auth';
 import { default as AppUserApis } from './app-user';
 import { default as ClientApis } from './client';
 import { default as RoleApis } from './role';
 import { default as RolePermissionApis } from './role-permission';
 import { default as UserCenterApis } from './user-center';
 
-export { MenuApis, AuthApis, AppUserApis, ClientApis, RoleApis, RolePermissionApis, UserCenterApis, };
+export { MenuApis, SubAppAuthApis, AppUserApis, ClientApis, RoleApis, RolePermissionApis, UserCenterApis, };

package/dist/index.js

@@ -2651,11 +2651,14 @@ async function handleTokenRefresh(refreshConfig, store, refreshTokenFromResponse
     throw refreshError;
   }
 }
+const REDIRECT_TO_LOGIN_CODES = [2006, 2007, 2003, 2004, 2e3];
+const TOKEN_REFRESH_CODE = 2001;
+const TENANT_SUPER_ADMIN_FIRST_LOGIN_CODE = 2008;
 async function handleResponseInterceptor(response, store, refreshConfig) {
   var _a, _b;
   const responseData = response == null ? void 0 : response.data;
   const code = responseData == null ? void 0 : responseData.code;
-  if ([2006, 2007, 2003, 2004, 2e3].includes(code)) {
+  if (REDIRECT_TO_LOGIN_CODES.includes(code)) {
     if (!response.request.responseURL.endsWith("login") && !response.request.responseURL.endsWith("register") && !response.request.responseURL.endsWith("register/tenants")) {
       window.parent.postMessage({
         type: "error",
@@ -2667,8 +2670,19 @@ async function handleResponseInterceptor(response, store, refreshConfig) {
       }, "*");
     }
     throw new Error(responseData == null ? void 0 : responseData.message);
-  } else if (code === 2001) {
+  } else if (code === TOKEN_REFRESH_CODE) {
     const config = response.config;
+    if (config._retry) {
+      window.parent.postMessage({
+        type: "error",
+        data: JSON.stringify({
+          code: responseData == null ? void 0 : responseData.code,
+          message: responseData == null ? void 0 : responseData.message,
+          action: "toLogin"
+        })
+      }, "*");
+      throw new Error(responseData == null ? void 0 : responseData.message);
+    }
     if (!refreshConfig || !store) {
       return response;
     }
@@ -2693,8 +2707,8 @@ async function handleResponseInterceptor(response, store, refreshConfig) {
     } catch (refreshError) {
       throw refreshError;
     }
-  } else if (code > 0) {
-    throw new Error(responseData == null ? void 0 : responseData.message);
+  } else if (code > 0 && code !== TENANT_SUPER_ADMIN_FIRST_LOGIN_CODE) {
+    throw new Error((responseData == null ? void 0 : responseData.message + 222) ?? "请求失败");
   }
   return response;
 }
@@ -2779,6 +2793,7 @@ class RequestServiceClass {
    * 通用请求方法
    */
   async request(config) {
+    var _a;
     const instance = this.getInstance();
     const axiosConfig = {
       ...config,
@@ -2786,6 +2801,9 @@ class RequestServiceClass {
       cancelToken: config.cancelToken && "token" in config.cancelToken ? config.cancelToken.token : config.cancelToken
     };
     const response = await instance.request(axiosConfig);
+    if ((_a = response.headers["content-type"]) == null ? void 0 : _a.includes("application/octet-stream")) {
+      return response;
+    }
     return response.data;
   }
   /**
@@ -2860,7 +2878,7 @@ function init(config) {
   service.init(config);
   return service;
 }
-let Apis$6 = class Apis {
+let Apis$5 = class Apis {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
@@ -2942,85 +2960,11 @@ let Apis$6 = class Apis {
     return await this.http.post("/api/v1/app/menu/update", data);
   }
 };
-let Apis$5 = class Apis2 {
+class SubAppAuthApis {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
   }
-  /**
-   * 用户登录 API
-   * @param data 登录表单数据
-   * @returns 用户信息和Token
-   */
-  async login(data) {
-    return await this.http.post("/api/v1/iam/auth/login", data);
-  }
-  /**
-   * 用户登出 API
-   * @param data 登出数据，包含 userId、password、tenantId
-   * @returns 登出结果
-   */
-  async logout(data) {
-    return await this.http.post("/api/v1/iam/auth/logout", data || {});
-  }
-  /**
-   * 用户注册 API
-   * @param data 注册表单数据
-   * @returns 用户信息和Token
-   */
-  async register(data) {
-    return await this.http.post("/api/v1/iam/auth/register", data);
-  }
-  /**
-   * 获取租户列表 API
-   * @param type 租户类型：LOGIN（登录）或 REGISTER（注册）
-   * @returns 租户列表
-   */
-  async getTenants(type = "LOGIN") {
-    return await this.http.post("/api/v1/iam/auth/register/tenants", {
-      type
-    });
-  }
-  /**
-   * 获取授权码 API
-   * @param token 一次性Token（JWT）
-   * @returns 授权码
-   */
-  async getAuthorizationCode(token) {
-    return await this.http.get("/api/v1/iam/oauth2/authorize", null, {
-      headers: {
-        Authorization: `Bearer ${token}`
-      }
-    });
-  }
-  /**
-   * 获取AccessToken和RefreshToken API
-   * @param code 授权码
-   * @param token 一次性Token（JWT）
-   * @returns AccessToken和RefreshToken
-   */
-  async getAccessToken(code, token) {
-    return await this.http.post("/api/v1/iam/oauth2/token", {
-      grantType: "login_code",
-      code
-    }, {
-      headers: {
-        Authorization: `Bearer ${token}`
-      }
-    });
-  }
-  /**
-   * Token 刷新 API
-   * @param refreshToken RefreshToken
-   * @returns 新的AccessToken
-   */
-  async refreshToken(refreshToken) {
-    return await this.http.post("/api/v1/iam/auth/refresh-token", null, {
-      headers: {
-        Authorization: `Bearer ${refreshToken}`
-      }
-    });
-  }
   /**
    * 获取子应用授权码 API
    * @param clientId 客户端ID
@@ -3048,8 +2992,8 @@ let Apis$5 = class Apis2 {
       redirectUri
     });
   }
-};
-let Apis$4 = class Apis3 {
+}
+let Apis$4 = class Apis2 {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
@@ -3119,7 +3063,7 @@ let Apis$4 = class Apis3 {
     return await this.http.post("/api/v1/app/user/assignRoles", data);
   }
 };
-let Apis$3 = class Apis4 {
+let Apis$3 = class Apis3 {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
@@ -3205,7 +3149,7 @@ let Apis$3 = class Apis4 {
     });
   }
 };
-let Apis$2 = class Apis5 {
+let Apis$2 = class Apis4 {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
@@ -3275,7 +3219,7 @@ let Apis$2 = class Apis5 {
     });
   }
 };
-let Apis$1 = class Apis6 {
+let Apis$1 = class Apis5 {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
@@ -3306,7 +3250,7 @@ let Apis$1 = class Apis6 {
     return await this.http.post("/api/v1/app/permission/getPermission");
   }
 };
-class Apis7 {
+class Apis6 {
   constructor(config) {
     __publicField(this, "http");
     this.http = config || init(config);
@@ -22064,12 +22008,11 @@ function formatDateTime(dateTime) {
 const initHttp = init;
 export {
   Apis$4 as AppUserApis,
-  Apis$5 as AuthApis,
   _sfc_main$5 as Breadcrumb,
   Apis$3 as ClientApis,
   index as CropImage,
   iconsSelect as IconsSelect,
-  Apis$6 as MenuApis,
+  Apis$5 as MenuApis,
   PERMISSION_CHECKER_KEY,
   PERMISSION_STORE_KEY,
   _sfc_main$1 as PageContainer,
@@ -22080,7 +22023,8 @@ export {
   Apis$2 as RoleApis,
   Apis$1 as RolePermissionApis,
   selectLoadMore as SelectLoadMore,
-  Apis7 as UserCenterApis,
+  SubAppAuthApis,
+  Apis6 as UserCenterApis,
   checkMultiplePermissionsAND,
   checkMultiplePermissionsOR,
   checkPermission,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clownlee/cores",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "公共核心库，提供统一的 HTTP 请求能力和自动 token 刷新功能",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@clownlee/http": "^1.0.3",
+    "@clownlee/http": "^1.0.5",
     "pinia": "^2.1.7",
     "vue": "^3.5.25",
     "cropper": "^4.1.0",