@lark-apaas/client-toolkit 1.2.28-alpha.60 → 1.2.28-alpha.62

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,2 +1 @@
-export { AuthProvider, useAuth, Can, CanRole, useCan, AbilityContext, useUserPermissions, PermissionClient, ROLE_SUBJECT, } from '@lark-apaas/auth-sdk';
-export type { AuthProviderProps, PermissionApiResponse, PermissionApiConfig, PermissionPointData, AuthSdkConfig, } 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, AuthProvider, Can, CanRole, PermissionClient, ROLE_SUBJECT, useAuth, useCan, useUserPermissions } from "@lark-apaas/auth-sdk";
-export { AbilityContext, AuthProvider, Can, CanRole, PermissionClient, ROLE_SUBJECT, useAuth, useCan, useUserPermissions };
+import { AbilityContext, CanRole, ROLE_SUBJECT, useAuth } from "@lark-apaas/auth-sdk";
+export { AbilityContext, CanRole, ROLE_SUBJECT, useAuth };

package/lib/hooks/useCurrentUserProfile.js

@@ -3,11 +3,25 @@ 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 { getAxiosForBackend } from "../utils/getAxiosForBackend.js";
 function getNameFromArray(nameArray) {
     if (!nameArray || 0 === nameArray.length) return;
     const chineseName = nameArray.find((item)=>2052 === item.language_code);
     return chineseName?.text ?? nameArray[0]?.text;
 }
+let _larkUserIdCache = null;
+let _larkUserIdPromise = null;
+function fetchLarkUserId() {
+    if (null !== _larkUserIdCache) return Promise.resolve(_larkUserIdCache);
+    if (_larkUserIdPromise) return _larkUserIdPromise;
+    _larkUserIdPromise = getAxiosForBackend().get('/api/authnpaas/lark-user-id').then(({ data })=>{
+        _larkUserIdCache = data?.lark_user_id || null;
+        return _larkUserIdCache;
+    }).catch(()=>null).finally(()=>{
+        _larkUserIdPromise = null;
+    });
+    return _larkUserIdPromise;
+}
 function getCompatibilityUserProfile() {
     const userInfo = getCurrentUserProfile();
     return {
@@ -34,6 +48,8 @@ const useCurrentUserProfile = ()=>{
                 userName: userName,
                 userAvatar: info?.avatar?.image?.large
             };
+            const larkUserId = await fetchLarkUserId();
+            if (larkUserId) newUserInfo.lark_user_id = larkUserId;
             if ('development' === process.env.NODE_ENV) logger.info('MiaoDaMetaInfoChanged', newUserInfo);
             setUserInfo(newUserInfo);
         };

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.28-alpha.60",
+  "version": "1.2.28-alpha.62",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -100,7 +100,7 @@
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "0.4.13",
     "@lark-apaas/aily-web-sdk": "^0.0.7",
-    "@lark-apaas/auth-sdk": "0.1.0-alpha.83",
+    "@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.22",