-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor openapikey and outlink apis (#2134)
* refactor: OpenAPIKey refactor * refactor: outlink api refactor fix: list return wrong data * chore: remove deprecated type definition * chore: remove throw Error. instead of Promise.reject * fix: auth openapikey's owner * fix: manager could read all keys
- Loading branch information
Showing
12 changed files
with
299 additions
and
243 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next'; | ||
| import { NextAPI } from '@/service/middleware/entry'; | ||
| import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; | ||
| import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; | ||
| import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; | ||
| import { | ||
| PerResourceTypeEnum, | ||
| WritePermissionVal | ||
| } from '@fastgpt/global/support/permission/constant'; | ||
| import { authDataset } from '@fastgpt/service/support/permission/dataset/auth'; | ||
| import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; | ||
| import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; | ||
| import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants'; | ||
| import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; | ||
| import { DatasetDefaultPermissionVal } from '@fastgpt/global/support/permission/dataset/constant'; | ||
| import { getResourceAllClbs } from '@fastgpt/service/support/permission/controller'; | ||
| import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission'; | ||
| export type DatasetFolderCreateQuery = {}; | ||
| export type DatasetFolderCreateBody = { | ||
| parentId?: string; | ||
| name: string; | ||
| intro: string; | ||
| }; | ||
| export type DatasetFolderCreateResponse = {}; | ||
| async function handler( | ||
| req: ApiRequestProps<DatasetFolderCreateBody, DatasetFolderCreateQuery>, | ||
| _res: ApiResponseType<any> | ||
| ): Promise<DatasetFolderCreateResponse> { | ||
| const { parentId, name, intro } = req.body; | ||
|
|
||
| if (!name) { | ||
| return Promise.reject(CommonErrEnum.missingParams); | ||
| } | ||
|
|
||
| const { tmbId, teamId } = await authUserPer({ | ||
| req, | ||
| per: WritePermissionVal, | ||
| authToken: true | ||
| }); | ||
|
|
||
| const parentFolder = await (async () => { | ||
| if (parentId) { | ||
| return ( | ||
| await authDataset({ | ||
| datasetId: parentId, | ||
| per: WritePermissionVal, | ||
| req, | ||
| authToken: true | ||
| }) | ||
| ).dataset; | ||
| } | ||
| })(); | ||
|
|
||
| await mongoSessionRun(async (session) => { | ||
| const app = await MongoDataset.create({ | ||
| ...parseParentIdInMongo(parentId), | ||
| avatar: FolderImgUrl, | ||
| name, | ||
| intro, | ||
| teamId, | ||
| tmbId, | ||
| type: DatasetTypeEnum.folder, | ||
| defaultPermission: !!parentFolder | ||
| ? parentFolder.defaultPermission | ||
| : DatasetDefaultPermissionVal | ||
| }); | ||
|
|
||
| if (parentId) { | ||
| const parentClbs = await getResourceAllClbs({ | ||
| teamId, | ||
| resourceId: parentId, | ||
| resourceType: PerResourceTypeEnum.dataset, | ||
| session | ||
| }); | ||
|
|
||
| await syncCollaborators({ | ||
| resourceType: PerResourceTypeEnum.dataset, | ||
| teamId, | ||
| resourceId: app._id, | ||
| collaborators: parentClbs, | ||
| session | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| return {}; | ||
| } | ||
| export default NextAPI(handler); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,56 @@ | ||
| import type { NextApiRequest, NextApiResponse } from 'next'; | ||
| import { jsonRes } from '@fastgpt/service/common/response'; | ||
| import { connectToDatabase } from '@/service/mongo'; | ||
| import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema'; | ||
| import { customAlphabet } from 'nanoid'; | ||
| import type { EditApiKeyProps } from '@/global/support/openapi/api'; | ||
| import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; | ||
| import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; | ||
| import { getNanoid } from '@fastgpt/global/common/string/tools'; | ||
| import type { ApiRequestProps } from '@fastgpt/service/type/next'; | ||
| import { NextAPI } from '@/service/middleware/entry'; | ||
| import { | ||
| ManagePermissionVal, | ||
| WritePermissionVal | ||
| } from '@fastgpt/global/support/permission/constant'; | ||
| import { authApp } from '@fastgpt/service/support/permission/app/auth'; | ||
| import { OpenApiErrEnum } from '@fastgpt/global/common/error/code/openapi'; | ||
|
|
||
| export default async function handler(req: NextApiRequest, res: NextApiResponse) { | ||
| try { | ||
| await connectToDatabase(); | ||
| const { appId, name, limit } = req.body as EditApiKeyProps; | ||
| const { teamId, tmbId } = await authUserPer({ req, authToken: true, per: WritePermissionVal }); | ||
|
|
||
| const count = await MongoOpenApi.find({ tmbId, appId }).countDocuments(); | ||
|
|
||
| if (count >= 10) { | ||
| throw new Error('最多 10 组 API 秘钥'); | ||
| async function handler(req: ApiRequestProps<EditApiKeyProps>): Promise<string> { | ||
| const { appId, name, limit } = req.body; | ||
| const { tmbId, teamId } = await (async () => { | ||
| if (!appId) { | ||
| // global apikey is being created, auth the tmb | ||
| const { teamId, tmbId } = await authUserPer({ | ||
| req, | ||
| authToken: true, | ||
| per: WritePermissionVal | ||
| }); | ||
| return { teamId, tmbId }; | ||
| } else { | ||
| const { teamId, tmbId } = await authApp({ | ||
| req, | ||
| per: ManagePermissionVal, | ||
| appId, | ||
| authToken: true | ||
| }); | ||
| return { teamId, tmbId }; | ||
| } | ||
| })(); | ||
|
|
||
| const nanoid = getNanoid(Math.floor(Math.random() * 14) + 52); | ||
| const apiKey = `${global.systemEnv?.openapiPrefix || 'fastgpt'}-${nanoid}`; | ||
|
|
||
| await MongoOpenApi.create({ | ||
| teamId, | ||
| tmbId, | ||
| apiKey, | ||
| appId, | ||
| name, | ||
| limit | ||
| }); | ||
| const count = await MongoOpenApi.find({ tmbId, appId }).countDocuments(); | ||
|
|
||
| jsonRes(res, { | ||
| data: apiKey | ||
| }); | ||
| } catch (err) { | ||
| jsonRes(res, { | ||
| code: 500, | ||
| error: err | ||
| }); | ||
| if (count >= 10) { | ||
| return Promise.reject(OpenApiErrEnum.exceedLimit); | ||
| } | ||
|
|
||
| const nanoid = getNanoid(Math.floor(Math.random() * 14) + 52); | ||
| const apiKey = `${global.systemEnv?.openapiPrefix || 'fastgpt'}-${nanoid}`; | ||
|
|
||
| await MongoOpenApi.create({ | ||
| teamId, | ||
| tmbId, | ||
| apiKey, | ||
| appId, | ||
| name, | ||
| limit | ||
| }); | ||
| return apiKey; | ||
| } | ||
|
|
||
| export default NextAPI(handler); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,42 @@ | ||
| import type { NextApiRequest, NextApiResponse } from 'next'; | ||
| import { jsonRes } from '@fastgpt/service/common/response'; | ||
| import { connectToDatabase } from '@/service/mongo'; | ||
| import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema'; | ||
| import type { GetApiKeyProps } from '@/global/support/openapi/api'; | ||
| import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; | ||
| import { authApp } from '@fastgpt/service/support/permission/app/auth'; | ||
| import { ManagePermissionVal } from '@fastgpt/global/support/permission/constant'; | ||
| import type { ApiRequestProps } from '@fastgpt/service/type/next'; | ||
| import { NextAPI } from '@/service/middleware/entry'; | ||
|
|
||
| export default async function handler(req: NextApiRequest, res: NextApiResponse) { | ||
| try { | ||
| await connectToDatabase(); | ||
| const { appId } = req.query as GetApiKeyProps; | ||
| async function handler(req: ApiRequestProps<any, GetApiKeyProps>) { | ||
| const { appId } = req.query; | ||
|
|
||
| if (appId) { | ||
| await authApp({ | ||
| req, | ||
| authToken: true, | ||
| appId, | ||
| per: ManagePermissionVal | ||
| }); | ||
|
|
||
| const findResponse = await MongoOpenApi.find({ | ||
| appId | ||
| }).sort({ _id: -1 }); | ||
|
|
||
| return jsonRes(res, { | ||
| data: findResponse.map((item) => item.toObject()) | ||
| }); | ||
| } | ||
|
|
||
| const { teamId, tmbId, permission } = await authUserPer({ | ||
| if (appId) { | ||
| // app-level apikey | ||
| await authApp({ | ||
| req, | ||
| authToken: true, | ||
| appId, | ||
| per: ManagePermissionVal | ||
| }); | ||
|
|
||
| const findResponse = await MongoOpenApi.find({ | ||
| appId, | ||
| teamId, | ||
| ...(!permission.isOwner && { tmbId }) | ||
| appId | ||
| }).sort({ _id: -1 }); | ||
|
|
||
| return jsonRes(res, { | ||
| data: findResponse.map((item) => item.toObject()) | ||
| }); | ||
| } catch (err) { | ||
| jsonRes(res, { | ||
| code: 500, | ||
| error: err | ||
| }); | ||
| return findResponse.map((item) => item.toObject()); | ||
| } | ||
| // global apikey | ||
| const { teamId, tmbId, permission } = await authUserPer({ | ||
| req, | ||
| authToken: true | ||
| }); | ||
|
|
||
| const findResponse = await MongoOpenApi.find({ | ||
| appId, | ||
| teamId, | ||
| ...(!permission.hasManagePer && { tmbId }) // if not manager, read own key | ||
| }).sort({ _id: -1 }); | ||
|
|
||
| return findResponse.map((item) => item.toObject()); | ||
| } | ||
|
|
||
| export default NextAPI(handler); |
Oops, something went wrong.