lafAccount add pat & re request when token invalid

docSite/content/docs/workflow/modules/laf.md

@@ -27,8 +27,6 @@ Laf 提供了 PAT(访问凭证) 来实现 Laf 平台外的快捷登录，可以
 
 填入 PAT 验证后，选择需要绑定的应用（应用需要是 Running 状态），即可调用该应用下的云函数。
 
-> 如果需要解绑则取消绑定后，点击“更新”即可
-
 ![](/imgs/laf2.webp)
 
 ## 编写云函数

packages/global/support/user/team/type.d.ts

@@ -81,4 +81,5 @@ export type TeamTagItemType = {
 export type LafAccountType = {
  token: string;
  appid: string;
+ pat: string;
 };

packages/service/support/user/team/teamSchema.ts

@@ -42,6 +42,9 @@ const TeamSchema = new Schema({
  },
  appid: {
  type: String
+ },
+ pat: {
+ type: String
  }
  }
 });

projects/app/src/components/support/laf/LafAccountModal.tsx

@@ -18,7 +18,8 @@ import { getDocPath } from '@/web/common/system/doc';
 const LafAccountModal = ({
  defaultData = {
  token: '',
- appid: ''
+ appid: '',
+ pat: ''
  },
  onClose
 }: {
@@ -140,7 +141,7 @@ const LafAccountModal = ({
  onResetForm();
  putUpdateTeam({
  teamId: userInfo?.team.teamId || '',
- lafAccount: { token: '', appid: '' }
+ lafAccount: { token: '', appid: '', pat: '' }
  });
  }}
  >

projects/app/src/web/common/api/lafRequest.ts

@@ -5,6 +5,8 @@ import axios, {
  AxiosProgressEvent
 } from 'axios';
 import { useUserStore } from '@/web/support/user/useUserStore';
+import { putUpdateTeam } from '@/web/support/user/team/api';
+import { LafAccountType } from '@fastgpt/global/support/user/team/type';
 
 interface ConfigType {
  headers?: { [key: string]: string };
@@ -86,7 +88,7 @@ function checkRes(data: ResponseDataType) {
 /**
  * 响应错误
  */
-function responseError(err: any) {
+function responseError(err: any, requestData?: any) {
  console.log('error->', '请求错误', err);
 
  if (!err) {
@@ -97,6 +99,30 @@ function responseError(err: any) {
  }
 
  if (err?.response?.data) {
+ const code = err?.response?.data?.statusCode;
+ if (code === 401) {
+ return POST<string>(`/v1/auth/pat2token`, {
+ pat: useUserStore.getState().userInfo?.team?.lafAccount?.pat
+ })
+ .then((res) => {
+ putUpdateTeam({
+ teamId: useUserStore.getState().userInfo?.team.teamId || '',
+ lafAccount: {
+ ...useUserStore.getState().userInfo?.team?.lafAccount,
+ token: res
+ } as LafAccountType
+ });
+ return request(
+ requestData.url,
+ requestData.params,
+ { ...requestData.config, headers: { Authorization: `Bearer ${res}` } },
+ requestData.method
+ );
+ })
+ .catch((err) => {
+ return Promise.reject({ message: '登录凭证过期' });
+ });
+ }
  return Promise.reject(err?.response?.data);
  }
  return Promise.reject(err);
@@ -141,7 +167,17 @@ function request(
  ...config // 用户自定义配置，可以覆盖前面的配置
  })
  .then((res) => checkRes(res.data))
- .catch((err) => responseError(err))
+ .catch((err) =>
+ responseError(err, {
+ baseURL: '/api/lafApi',
+ url,
+ method,
+ data: ['POST', 'PUT'].includes(method) ? data : null,
+ params: !['POST', 'PUT'].includes(method) ? data : null,
+ signal: cancelToken?.signal,
+ ...config // 用户自定义配置，可以覆盖前面的配置
+ })
+ )
  .finally(() => requestFinish({ url }));
 }
 

projects/app/src/web/support/laf/api.ts

@@ -1,4 +1,4 @@
-import { GET, POST, PUT } from '@/web/common/api/lafRequest';
+import { GET, POST } from '@/web/common/api/lafRequest';
 
 export const postLafPat2Token = (pat: string) => POST<string>(`/v1/auth/pat2token`, { pat });