@lark-apaas/client-toolkit 1.2.28-alpha.6 → 1.2.28-alpha.61

package/lib/apis/udt-types.d.ts

@@ -9,6 +9,10 @@ export type IUserProfile = {
      * inactive 2
      */
     status?: number;
+    /**
+     * 飞书 user_id
+     */
+    lark_user_id?: string;
 };
 export type IFileAttachment = {
     bucket_id: string;

package/lib/auth.d.ts

@@ -1 +1 @@
-export { CanRole, AbilityContext, ROLE_SUBJECT } from '@lark-apaas/auth-sdk';
+export { CanRole, AbilityContext, ROLE_SUBJECT, useAuth, } from '@lark-apaas/auth-sdk';

package/lib/auth.js

@@ -1,2 +1,2 @@
-import { AbilityContext, CanRole, ROLE_SUBJECT } from "@lark-apaas/auth-sdk";
-export { AbilityContext, CanRole, ROLE_SUBJECT };
+import { AbilityContext, CanRole, ROLE_SUBJECT, useAuth } from "@lark-apaas/auth-sdk";
+export { AbilityContext, CanRole, ROLE_SUBJECT, useAuth };

package/lib/hooks/useCurrentUserProfile.d.ts

@@ -1,5 +1,11 @@
 import { IUserProfile } from '../apis/udt-types';
-export interface ICompatibilityUserProfile extends IUserProfile {
+/**
+ * useCurrentUserProfile 的返回类型。
+ * 初始状态为空对象 `{}`（所有字段均为 undefined），异步获取用户信息后字段才会被填充。
+ * 使用时必须通过可选链或空值合并进行安全访问，如 `userInfo?.user_id`。
+ * 判断是否已加载完成应使用 `if (!userInfo?.user_id)` 而非 `if (!userInfo)`（因为空对象是 truthy）。
+ */
+export type ICompatibilityUserProfile = Partial<IUserProfile & {
     /**
      * @deprecated please use `name`
      */
@@ -8,5 +14,14 @@ export interface ICompatibilityUserProfile extends IUserProfile {
      * @deprecated please use `avatar`
      */
     userAvatar: string;
-}
-export declare const useCurrentUserProfile: () => ICompatibilityUserProfile;
+}>;
+export declare const useCurrentUserProfile: () => Partial<IUserProfile & {
+    /**
+     * @deprecated please use `name`
+     */
+    userName: string;
+    /**
+     * @deprecated please use `avatar`
+     */
+    userAvatar: string;
+}>;

package/lib/hooks/useCurrentUserProfile.js

@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
 import { logger } from "../logger/index.js";
 import { getCurrentUserProfile } from "../integrations/getCurrentUserProfile.js";
 import { getDataloom } from "../integrations/dataloom.js";
-import { isSparkRuntime } from "../utils/utils.js";
+import { isSparkRuntime, normalizeBasePath } from "../utils/utils.js";
 function getNameFromArray(nameArray) {
     if (!nameArray || 0 === nameArray.length) return;
     const chineseName = nameArray.find((item)=>2052 === item.language_code);
@@ -34,6 +34,20 @@ const useCurrentUserProfile = ()=>{
                 userName: userName,
                 userAvatar: info?.avatar?.image?.large
             };
+            try {
+                const csrfToken = document.cookie.match(/suda-csrf-token=([^;]+)/)?.[1] || '';
+                const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);
+                const resp = await fetch(`${basePath}/api/authnpaas/lark-user-id`, {
+                    credentials: 'include',
+                    headers: {
+                        'x-suda-csrf-token': csrfToken
+                    }
+                });
+                if (resp.ok) {
+                    const data = await resp.json();
+                    if (data?.lark_user_id) newUserInfo.lark_user_id = data.lark_user_id;
+                }
+            } catch  {}
             if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', newUserInfo);
             setUserInfo(newUserInfo);
         };

package/lib/integrations/getCurrentUserProfile.d.ts

@@ -1,5 +1,11 @@
 import { IUserProfile } from '../apis/udt-types';
-export declare function getCurrentUserProfile(): IUserProfile;
+/**
+ * 获取当前用户信息。
+ * 返回 Partial<IUserProfile>，因为初始值来自 window._userInfo，
+ * 该值在运行时始终为空对象 {}，所有字段均为 undefined。
+ * 异步获取用户信息后才会被填充为完整的 IUserProfile。
+ */
+export declare function getCurrentUserProfile(): Partial<IUserProfile>;
 /**
  * @deprecated 请使用 getCurrentUserProfile 代替
  */

package/lib/integrations/services/UserService.d.ts

@@ -1,12 +1,14 @@
-import type { BatchGetUsersResponse, SearchUsersParams, SearchUsersResponse } from './types';
+import type { BatchGetUsersResponse, ConvertExternalContactResponse, SearchUsersParams, SearchUsersResponse } from './types';
 export type UserServiceConfig = {
     getAppId?: () => string | null | undefined;
     searchUserUrl?: (appId: string) => string;
     listUsersUrl?: (appId: string) => string;
+    convertExternalContactUrl?: (appId: string) => string;
 };
 export declare class UserService {
     private config;
     constructor(config?: UserServiceConfig);
     searchUsers(params: SearchUsersParams): Promise<SearchUsersResponse>;
     listUsersByIds(userIds: string[]): Promise<BatchGetUsersResponse>;
+    convertExternalContact(larkUserID: string): Promise<ConvertExternalContactResponse>;
 }

package/lib/integrations/services/UserService.js

@@ -3,7 +3,8 @@ import { isNewPathEnabled } from "../../utils/apiPath.js";
 const DEFAULT_CONFIG = {
     getAppId: ()=>getAppId(),
     searchUserUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/search_user` : `/af/app/${appId}/runtime/api/v1/account/search_user`,
-    listUsersUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/list_users` : `/af/app/${appId}/runtime/api/v1/account/list_users`
+    listUsersUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/list_users` : `/af/app/${appId}/runtime/api/v1/account/list_users`,
+    convertExternalContactUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/convert_lark_user` : `/af/app/${appId}/runtime/api/v1/account/convert_lark_user`
 };
 class UserService {
     config;
@@ -43,5 +44,23 @@ class UserService {
         if (!response.ok) throw new Error('Failed to fetch users by ids');
         return response.json();
     }
+    async convertExternalContact(larkUserID) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.convertExternalContactUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                larkUserID
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to convert external contact');
+        const data = await response.json();
+        if (!data?.data?.userInfo?.userID) throw new Error('Invalid response from convert external contact');
+        return data;
+    }
 }
 export { UserService };

package/lib/integrations/services/types.d.ts

@@ -15,6 +15,7 @@ export type UserInfo = {
     userType: '_employee' | '_externalUser' | '_anonymousUser';
     department: DepartmentBasic;
     email?: string;
+    tenantName?: string;
 };
 export type DepartmentInfo = {
     departmentID: string;
@@ -33,6 +34,7 @@ export type SearchUsersParams = {
     query?: string;
     offset?: number;
     pageSize?: number;
+    searchExternalContact?: boolean;
 };
 export type SearchUsersResponse = {
     data: {
@@ -41,6 +43,14 @@ export type SearchUsersResponse = {
     };
     status_code: string;
 };
+export type ConvertExternalContactResponse = {
+    data: {
+        userInfo: {
+            tenantID: number;
+            userID: number;
+        };
+    };
+};
 export type BatchGetUsersResponse = {
     data: {
         userInfoMap: Record<string, UserInfo & SearchAvatar>;

package/lib/utils/axiosConfig.js

@@ -372,7 +372,18 @@ function initAxiosConfig(axiosInstance) {
                     name: 'toolkit_axios_403_downgrade',
                     categories: {
                         url: String(error.config?.url || ''),
-                        method: String(error.config?.method || '')
+                        method: String(error.config?.method || ''),
+                        ...'production' !== process.env.NODE_ENV && {
+                            responseData: (()=>{
+                                try {
+                                    const data = error.response?.data;
+                                    if (!data) return '';
+                                    return 'string' == typeof data ? data.slice(0, 512) : JSON.stringify(data).slice(0, 512);
+                                } catch  {
+                                    return '';
+                                }
+                            })()
+                        }
                     }
                 });
                 return error.response;
@@ -383,7 +394,19 @@ function initAxiosConfig(axiosInstance) {
             categories: {
                 url: String(error.config?.url || ''),
                 method: String(error.config?.method || ''),
-                status: String(error.response?.status || '')
+                status: String(error.response?.status || ''),
+                ...'production' !== process.env.NODE_ENV && {
+                    errorMessage: String(error.message || ''),
+                    responseData: (()=>{
+                        try {
+                            const data = error.response?.data;
+                            if (!data) return '';
+                            return 'string' == typeof data ? data.slice(0, 512) : JSON.stringify(data).slice(0, 512);
+                        } catch  {
+                            return '';
+                        }
+                    })()
+                }
             }
         });
         return Promise.reject(error);

package/lib/utils/hmr-api.d.ts

@@ -9,6 +9,12 @@
  * @see docs/RFC_HMR_API.md
  */
 export interface HmrApi {
+    /**
+     * 注册 HMR 更新前回调（模块替换之前触发）
+     * @param callback 回调函数
+     * @returns cleanup 函数，用于取消注册
+     */
+    onBeforeApply?(callback: () => void): () => void;
     /**
      * 注册 HMR 成功回调
      * @param callback 成功回调函数
@@ -24,7 +30,7 @@ export interface HmrApi {
 }
 declare global {
     interface Window {
-        __VITE_HMR__?: HmrApi;
+        __VITE_HMR__?: Required<HmrApi>;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.28-alpha.6",
+  "version": "1.2.28-alpha.61",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,12 +98,12 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "0.4.11",
+    "@data-loom/js": "0.4.13",
     "@lark-apaas/aily-web-sdk": "^0.0.7",
-    "@lark-apaas/auth-sdk": "^0.1.2",
+    "@lark-apaas/auth-sdk": "^0.1.3",
     "@lark-apaas/client-capability": "^0.1.6",
     "@lark-apaas/internal-slardar": "^0.0.3",
-    "@lark-apaas/miaoda-inspector": "^1.0.20",
+    "@lark-apaas/miaoda-inspector": "^1.0.22",
     "@lark-apaas/observable-web": "^1.0.5",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",