add feishu oauth for feishudataset

Author: dreamer6680

packages/global/core/dataset/apiDataset.d.ts

@@ -18,13 +18,15 @@ export type APIFileServer = {
   basePath?: string;
 };
 export type FeishuShareServer = {
-  appId: string;
-  appSecret?: string;
+  user_access_token: string;
+  refresh_token: string;
+  outdate_time: number;
   folderToken: string;
 };
 export type FeishuKnowledgeServer = {
-  appId: string;
-  appSecret: string;
+  user_access_token: string;
+  refresh_token: string;
+  outdate_time: number;
   basePath?: string;
 };
 

packages/service/core/dataset/feishuKnowledgeDataset/api.ts

@@ -121,15 +121,7 @@ export const useFeishuKnowledgeDatasetRequest = ({
   // 添加请求拦截器
   instance.interceptors.request.use(async (config) => {
     if (!config.headers.Authorization) {
-      const { data } = await axios.post<{ tenant_access_token: string }>(
-        `${feishuBaseUrl}/open-apis/auth/v3/tenant_access_token/internal`,
-        {
-          app_id: feishuKnowledgeServer.appId,
-          app_secret: feishuKnowledgeServer.appSecret
-        }
-      );
-
-      config.headers['Authorization'] = `Bearer ${data.tenant_access_token}`;
+      config.headers['Authorization'] = `Bearer ${feishuKnowledgeServer.user_access_token}`;
       config.headers['Content-Type'] = 'application/json; charset=utf-8';
     }
     return config;

packages/service/core/dataset/feishuPrivateDataset/api.ts

@@ -130,7 +130,10 @@ export const useFeishuPrivateDatasetRequest = ({
 
       return data.files;
     };
-    const parent = parentId?.split('-')[1];
+    if (!parentId) {
+      parentId = feishuPrivateServer.basePath?.split('-').slice(-1)[0];
+    }
+    const parent = parentId ? parentId.split('-').slice(-1)[0] : undefined;
 
     const allFiles = await fetchFiles(undefined, parent);
 
@@ -147,8 +150,8 @@ export const useFeishuPrivateDatasetRequest = ({
       .map((file) => ({
         id:
           file.type === 'shortcut'
-            ? file.parent_token + '-' + file.shortcut_info!.target_token
-            : file.parent_token + '-' + file.token,
+            ? parentId + '-' + file.shortcut_info!.target_token
+            : parentId + '-' + file.token,
         parentId: parentId,
         name: file.name,
         type: file.type === 'folder' ? ('folder' as const) : ('file' as const),
@@ -199,15 +202,15 @@ export const useFeishuPrivateDatasetRequest = ({
   }: {
     apiFileId: string;
   }): Promise<ApiDatasetDetailResponse> => {
-    const parentId = apiFileId.split('-')[0];
-    const fileId = apiFileId.split('-')[1];
+    const parentId = apiFileId.split('-').slice(0, -1).join('-');
+    const fileId = apiFileId.split('-').slice(-1)[0];
 
     const fileDetail = await request<FeishuFileDetailResponse['data']>(
       `/open-apis/drive/explorer/v2/folder/${fileId}/meta`,
       {},
       'GET'
     );
-    console.log('fileDetail', fileDetail);
+
     if (!fileDetail) {
       return {
         name: '',
@@ -218,7 +221,7 @@ export const useFeishuPrivateDatasetRequest = ({
 
     return {
       name: fileDetail?.name,
-      parentId: null,
+      parentId: parentId !== 'null' ? parentId : null,
       id: apiFileId
     };
   };

packages/service/core/dataset/feishuPrivateDataset/refreshToken.ts

@@ -2,23 +2,29 @@ import axios from 'axios';
 import { MongoDataset } from '../schema';
 import { addLog } from '../../../common/system/log';
 
-const appId = global.feConfigs.feishu_auth_robot_client_id;
-const appSecret = global.feConfigs.feishu_auth_robot_client_secret;
-
 /**
  * refresh feishu token
  * refresh token before 10 minutes
  */
 export async function refreshFeishuToken() {
   try {
     const datasets = await MongoDataset.find({
-      type: { $in: ['feishuPrivate'] }
+      type: { $in: ['feishuPrivate', 'feishuShare', 'feishuKnowledge'] }
     });
 
+    const appId = global.feConfigs?.feishu_auth_robot_client_id;
+    const appSecret = global.feConfigs?.feishu_auth_robot_client_secret;
+
     const refreshPromises = datasets
-      .filter((dataset) => dataset.feishuPrivateServer)
+      .filter(
+        (dataset) =>
+          (dataset.type === 'feishuPrivate' && dataset.feishuPrivateServer) ||
+          (dataset.type === 'feishuShare' && dataset.feishuShareServer) ||
+          (dataset.type === 'feishuKnowledge' && dataset.feishuKnowledgeServer)
+      )
       .map(async (dataset) => {
         try {
+          const serverKey = `${dataset.type}Server` as keyof typeof dataset;
           const response = await axios.post<{
             access_token: string;
             refresh_token: string;
@@ -29,11 +35,11 @@ export async function refreshFeishuToken() {
               client_id: appId,
               client_secret: appSecret,
               grant_type: 'refresh_token',
-              refresh_token: dataset.feishuPrivateServer?.refresh_token
+              refresh_token: dataset[serverKey]?.refresh_token
             },
             {
               headers: {
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json; charset=utf-8'
               }
             }
           );
@@ -48,7 +54,7 @@ export async function refreshFeishuToken() {
           // update dataset
           await MongoDataset.findByIdAndUpdate(dataset._id, {
             $set: {
-              feishuPrivateServer: {
+              [serverKey]: {
                 user_access_token: response.data.access_token,
                 refresh_token: response.data.refresh_token,
                 outdate_time: Date.now() + response.data.expires_in * 1000
@@ -61,8 +67,8 @@ export async function refreshFeishuToken() {
           });
         } catch (error) {
           addLog.error('Refresh Feishu token error', {
-            error,
-            datasetId: dataset._id
+            datasetId: dataset._id,
+            error: JSON.stringify(error)
           });
         }
       });

packages/service/core/dataset/feishuShareDataset/api.ts

@@ -24,6 +24,10 @@ type FeishuFileListResponse = {
     created_time: number;
     url: string;
     owner_id: string;
+    shortcut_info?: {
+      target_token: string;
+      target_type: string;
+    };
   }[];
   has_more: boolean;
   next_page_token: string;
@@ -44,15 +48,7 @@ export const useFeishuShareDatasetRequest = ({
   // 添加请求拦截器
   instance.interceptors.request.use(async (config) => {
     if (!config.headers.Authorization) {
-      const { data } = await axios.post<{ tenant_access_token: string }>(
-        `${feishuBaseUrl}/open-apis/auth/v3/tenant_access_token/internal`,
-        {
-          app_id: feishuShareServer.appId,
-          app_secret: feishuShareServer.appSecret
-        }
-      );
-
-      config.headers['Authorization'] = `Bearer ${data.tenant_access_token}`;
+      config.headers['Authorization'] = `Bearer ${feishuShareServer.user_access_token}`;
       config.headers['Content-Type'] = 'application/json; charset=utf-8';
     }
     return config;
@@ -131,10 +127,18 @@ export const useFeishuShareDatasetRequest = ({
     const allFiles = await fetchFiles();
 
     return allFiles
-      .filter((file) => ['folder', 'docx'].includes(file.type))
+      .filter((file) => {
+        if (file.type === 'shortcut') {
+          return (
+            file.shortcut_info?.target_type === 'docx' ||
+            file.shortcut_info?.target_type === 'folder'
+          );
+        }
+        return file.type === 'folder' || file.type === 'docx';
+      })
       .map((file) => ({
-        id: file.token,
-        parentId: file.parent_token,
+        id: file.type === 'shortcut' ? file.shortcut_info!.target_token : file.token,
+        parentId: parentId,
         name: file.name,
         type: file.type === 'folder' ? ('folder' as const) : ('file' as const),
         hasChild: file.type === 'folder',
@@ -148,17 +152,10 @@ export const useFeishuShareDatasetRequest = ({
   }: {
     apiFileId: string;
   }): Promise<ApiFileReadContentResponse> => {
+    const fileId = apiFileId.split('-')[1];
     const [{ content }, { document }] = await Promise.all([
-      request<{ content: string }>(
-        `/open-apis/docx/v1/documents/${apiFileId}/raw_content`,
-        {},
-        'GET'
-      ),
-      request<{ document: { title: string } }>(
-        `/open-apis/docx/v1/documents/${apiFileId}`,
-        {},
-        'GET'
-      )
+      request<{ content: string }>(`/open-apis/docx/v1/documents/${fileId}/raw_content`, {}, 'GET'),
+      request<{ document: { title: string } }>(`/open-apis/docx/v1/documents/${fileId}`, {}, 'GET')
     ]);
 
     return {
@@ -168,12 +165,13 @@ export const useFeishuShareDatasetRequest = ({
   };
 
   const getFilePreviewUrl = async ({ apiFileId }: { apiFileId: string }): Promise<string> => {
+    const fileId = apiFileId.split('-')[1];
     const { metas } = await request<{ metas: { url: string }[] }>(
       `/open-apis/drive/v1/metas/batch_query`,
       {
         request_docs: [
           {
-            doc_token: apiFileId,
+            doc_token: fileId,
             doc_type: 'docx'
           }
         ],

packages/web/components/common/Icon/icons/core/dataset/feishuKnowledgeDatasetColor.svg

@@ -79,9 +79,10 @@
   "external_url": "File Access URL",
   "failedToLoadRootDirectories": "Failed to load root directories",
   "failedToLoadSubDirectories": "Failed to load subdirectories",
-  "feishu_auth_button": "Click Authorization",
+  "feishu_auth_button": "Authorization",
   "feishu_auth_description": "Please complete Feishu authorization first to use personal knowledge base functions",
   "feishu_auth_title": "Need to authorize Feishu",
+  "feishu_change_auth_button": "replace",
   "feishu_knowledge_dataset": "Feishu Knowledge Base",
   "feishu_knowledge_dataset_config": "Configure Feishu Knowledge Base",
   "feishu_knowledge_dataset_desc": "You can use Feishu Knowledge Base to build a knowledge base by configuring Feishu Knowledge Base. The knowledge base documents will not be stored secondaryly.",
@@ -96,6 +97,8 @@
   "filename": "Filename",
   "folder_dataset": "Folder",
   "getDirectoryFailed": "Get directory failed",
+  "have_auth": "Authorized",
+  "have_not_auth": "Unauthorized",
   "image_auto_parse": "Automatic image indexing",
   "image_auto_parse_tips": "Call VLM to automatically label the pictures in the document and generate additional search indexes",
   "image_training_queue": "Queue of image processing",
@@ -122,6 +125,7 @@
   "noSelectedFolder": "No selected folder",
   "noSelectedId": "No selected ID",
   "noValidId": "No valid ID",
+  "not_set": "Not configured",
   "open_auto_sync": "After scheduled synchronization is turned on, the system will try to synchronize the collection from time to time every day. During the collection synchronization period, the collection data will not be searched.",
   "other_dataset": "Third-party knowledge base",
   "paragraph_max_deep": "Maximum paragraph depth",