Skip to content

Commit 47f6746

Browse files
FinleyGeFinleyGe
authored
fix: app/dataset create (#4554)
1 parent 0c9e56c commit 47f6746

File tree

4 files changed

+51
-49
lines changed

4 files changed

+51
-49
lines changed

‎projects/app/src/pages/api/core/app/create.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
import { AppFolderTypeList, AppTypeEnum } from '@fastgpt/global/core/app/constants';
2-
import { MongoApp } from '@fastgpt/service/core/app/schema';
3-
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
4-
import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit';
5-
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
6-
import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema';
71
import { NextAPI } from '@/service/middleware/entry';
8-
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
9-
import type { AppSchema } from '@fastgpt/global/core/app/type';
10-
import { ApiRequestProps } from '@fastgpt/service/type/next';
2+
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
113
import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
124
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
5+
import { AppFolderTypeList, AppTypeEnum } from '@fastgpt/global/core/app/constants';
6+
import type { AppSchema } from '@fastgpt/global/core/app/type';
137
import { defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
8+
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
9+
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
10+
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
11+
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
1412
import { ClientSession } from '@fastgpt/service/common/mongo';
13+
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
14+
import { MongoApp } from '@fastgpt/service/core/app/schema';
15+
import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema';
1516
import { authApp } from '@fastgpt/service/support/permission/app/auth';
16-
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
17+
import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit';
18+
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
1719
import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
18-
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
19-
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
20-
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
20+
import { ApiRequestProps } from '@fastgpt/service/type/next';
2121

2222
export type CreateAppBody = {
2323
parentId?: ParentIdType;
@@ -38,7 +38,7 @@ async function handler(req: ApiRequestProps<CreateAppBody>) {
3838

3939
// 凭证校验
4040
const { teamId, tmbId, userId } = parentId
41-
? await authApp({ req, appId: parentId, per: TeamAppCreatePermissionVal, authToken: true })
41+
? await authApp({ req, appId: parentId, per: WritePermissionVal, authToken: true })
4242
: await authUserPer({ req, authToken: true, per: TeamAppCreatePermissionVal });
4343

4444
// 上限校验

‎projects/app/src/pages/api/core/app/folder/create.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1+
import { NextAPI } from '@/service/middleware/entry';
2+
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
3+
import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants';
4+
import { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
5+
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
16
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
2-
import { MongoApp } from '@fastgpt/service/core/app/schema';
3-
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
47
import {
58
OwnerPermissionVal,
69
PerResourceTypeEnum,
710
WritePermissionVal
811
} from '@fastgpt/global/support/permission/constant';
9-
import { ApiRequestProps } from '@fastgpt/service/type/next';
10-
import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants';
11-
import { NextAPI } from '@/service/middleware/entry';
12-
import { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
13-
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
14-
import { authApp } from '@fastgpt/service/support/permission/app/auth';
12+
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
1513
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
16-
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
17-
import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission';
14+
import { MongoApp } from '@fastgpt/service/core/app/schema';
15+
import { authApp } from '@fastgpt/service/support/permission/app/auth';
1816
import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller';
19-
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
17+
import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission';
2018
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
19+
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
20+
import { ApiRequestProps } from '@fastgpt/service/type/next';
2121

2222
export type CreateAppFolderBody = {
2323
parentId?: ParentIdType;
@@ -34,7 +34,7 @@ async function handler(req: ApiRequestProps<CreateAppFolderBody>) {
3434

3535
// 凭证校验
3636
const { teamId, tmbId } = parentId
37-
? await authApp({ req, appId: parentId, per: TeamAppCreatePermissionVal, authToken: true })
37+
? await authApp({ req, appId: parentId, per: WritePermissionVal, authToken: true })
3838
: await authUserPer({ req, authToken: true, per: TeamAppCreatePermissionVal });
3939

4040
// Create app

‎projects/app/src/pages/api/core/dataset/create.ts‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
21
import type { CreateDatasetParams } from '@/global/core/dataset/api.d';
3-
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
2+
import { NextAPI } from '@/service/middleware/entry';
3+
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
44
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
5+
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
6+
import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
7+
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
8+
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
9+
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
510
import {
6-
getLLMModel,
7-
getEmbeddingModel,
811
getDatasetModel,
9-
getDefaultEmbeddingModel
12+
getDefaultEmbeddingModel,
13+
getEmbeddingModel,
14+
getLLMModel
1015
} from '@fastgpt/service/core/ai/model';
16+
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
17+
import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
1118
import { checkTeamDatasetLimit } from '@fastgpt/service/support/permission/teamLimit';
12-
import { NextAPI } from '@/service/middleware/entry';
19+
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
1320
import type { ApiRequestProps } from '@fastgpt/service/type/next';
14-
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
15-
import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
16-
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
17-
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
18-
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
19-
import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
2021

2122
export type DatasetCreateQuery = {};
2223
export type DatasetCreateBody = CreateDatasetParams;
@@ -46,7 +47,7 @@ async function handler(
4647
datasetId: parentId,
4748
authToken: true,
4849
authApiKey: true,
49-
per: TeamDatasetCreatePermissionVal
50+
per: WritePermissionVal
5051
})
5152
: await authUserPer({
5253
req,

‎projects/app/src/pages/api/core/dataset/folder/create.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
21
import { NextAPI } from '@/service/middleware/entry';
3-
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
42
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
5-
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
3+
import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants';
4+
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
5+
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
66
import {
77
OwnerPermissionVal,
8-
PerResourceTypeEnum
8+
PerResourceTypeEnum,
9+
WritePermissionVal
910
} from '@fastgpt/global/support/permission/constant';
10-
import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
11+
import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
1112
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
12-
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
13-
import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants';
14-
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
13+
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
1514
import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller';
15+
import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
1616
import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission';
1717
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
18-
import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
18+
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
19+
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
1920
export type DatasetFolderCreateQuery = {};
2021
export type DatasetFolderCreateBody = {
2122
parentId?: string;
@@ -39,7 +40,7 @@ async function handler(
3940
datasetId: parentId,
4041
authToken: true,
4142
authApiKey: true,
42-
per: TeamDatasetCreatePermissionVal
43+
per: WritePermissionVal
4344
})
4445
: await authUserPer({
4546
req,

0 commit comments

Comments
 (0)