4.8.5 test fix (#1835)

* faq

* perf: navbar name and fix dataset selector

* feat: app tag

* perf: icon

* fix: update workflow bug

* perf: dataset ui

* perf: menu

* fix: ts

* fix: auth file and app list ui

* app list

* app list

* perf: init api

* update per

* log level

packages/service/common/middle/entry.ts

@@ -13,7 +13,7 @@ export const NextEntry = ({ beforeCallback = [] }: { beforeCallback?: Promise<an
   return (...args: NextApiHandler[]): NextApiHandler => {
     return async function api(req: ApiRequestProps, res: NextApiResponse) {
       const start = Date.now();
-      addLog.info(`Request start ${req.url}`);
+      addLog.debug(`Request start ${req.url}`);
       try {
         await Promise.all([withNextCors(req, res), ...beforeCallback]);
 
@@ -24,7 +24,7 @@ export const NextEntry = ({ beforeCallback = [] }: { beforeCallback?: Promise<an
 
         const contentType = res.getHeader('Content-Type');
 
-        addLog.info(`Request finish ${req.url}, time: ${Date.now() - start}ms`);
+        addLog.debug(`Request finish ${req.url}, time: ${Date.now() - start}ms`);
 
         if ((!contentType || contentType === 'application/json') && !res.writableFinished) {
           return jsonRes(res, {

packages/service/core/dataset/schema.ts

@@ -12,7 +12,7 @@ import {
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
 import { PermissionTypeEnum, PermissionTypeMap } from '@fastgpt/global/support/permission/constant';
-import { DatasetDefaultPermission } from '@fastgpt/global/support/permission/dataset/constant';
+import { DatasetDefaultPermissionVal } from '@fastgpt/global/support/permission/dataset/constant';
 
 export const DatasetCollectionName = 'datasets';
 
@@ -94,7 +94,7 @@ const DatasetSchema = new Schema({
   externalReadUrl: String,
   defaultPermission: {
     type: Number,
-    default: DatasetDefaultPermission
+    default: DatasetDefaultPermissionVal
   }
 });
 

packages/service/support/permission/app/auth.ts

@@ -38,7 +38,7 @@ export const authAppByTmbId = async ({
       return Promise.reject(AppErrEnum.unExist);
     }
 
-    const isOwner = tmbPer.isOwner || String(app.tmbId) === tmbId;
+    const isOwner = tmbPer.isOwner || String(app.tmbId) === String(tmbId);
     const Per = new AppPermission({ per: rp?.permission ?? app.defaultPermission, isOwner });
 
     if (!Per.checkPer(per)) {

packages/service/support/permission/auth/file.ts

@@ -1,16 +1,18 @@
-import { AuthResponseType } from '@fastgpt/global/support/permission/type';
 import { AuthModeType } from '../type';
 import { DatasetFileSchema } from '@fastgpt/global/core/dataset/type';
 import { parseHeaderCert } from '../controller';
 import { getFileById } from '../../../common/file/gridfs/controller';
 import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
 import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
+import { OwnerPermissionVal, ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
+import { AuthPropsType, AuthResponseType } from '../type/auth';
+import { Permission } from '@fastgpt/global/support/permission/controller';
 
 export async function authFile({
   fileId,
-  per = 'owner',
+  per = OwnerPermissionVal,
   ...props
-}: AuthModeType & {
+}: AuthPropsType & {
   fileId: string;
 }): Promise<
   AuthResponseType & {
@@ -29,14 +31,19 @@ export async function authFile({
   if (file.metadata?.teamId !== teamId) {
     return Promise.reject(CommonErrEnum.unAuthFile);
   }
-  if (per === 'owner' && file.metadata?.tmbId !== tmbId) {
+
+  const permission = new Permission({
+    per: ReadPermissionVal,
+    isOwner: file.metadata?.tmbId === tmbId
+  });
+
+  if (!permission.checkPer(per)) {
     return Promise.reject(CommonErrEnum.unAuthFile);
   }
 
   return {
     ...authRes,
-    isOwner: per === 'owner',
-    canWrite: per === 'owner',
+    permission,
     file
   };
 }

packages/service/support/permission/dataset/auth.ts

@@ -18,6 +18,7 @@ import { getFileById } from '../../../common/file/gridfs/controller';
 import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
 import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
 import { MongoDatasetData } from '../../../core/dataset/data/schema';
+import { DatasetDefaultPermissionVal } from '@fastgpt/global/support/permission/dataset/constant';
 
 export async function authDatasetByTmbId({
   tmbId,
@@ -46,7 +47,7 @@ export async function authDatasetByTmbId({
       return Promise.reject(DatasetErrEnum.unExist);
     }
 
-    const isOwner = tmbPer.isOwner || String(dataset.tmbId) === tmbId;
+    const isOwner = tmbPer.isOwner || String(dataset.tmbId) === String(tmbId);
     const Per = new DatasetPermission({
       per: rp?.permission ?? dataset.defaultPermission,
       isOwner
@@ -58,11 +59,12 @@ export async function authDatasetByTmbId({
 
     return {
       ...dataset,
+      defaultPermission: dataset.defaultPermission ?? DatasetDefaultPermissionVal,
       permission: Per
     };
   })();
 
-  return { dataset: dataset };
+  return { dataset };
 }
 
 // Auth Dataset
@@ -202,7 +204,7 @@ export async function authDatasetData({
     collectionId: String(datasetData.collectionId),
     sourceName: result.collection.name || '',
     sourceId: result.collection?.fileId || result.collection?.rawLink,
-    isOwner: String(datasetData.tmbId) === result.tmbId,
+    isOwner: String(datasetData.tmbId) === String(result.tmbId),
     canWrite: result.permission.hasWritePer
   };