mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 17:27:16 +00:00
Fix: Removed legacy create project code
This commit is contained in:
@@ -150,33 +150,6 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
server.route({
|
|
||||||
url: "/",
|
|
||||||
method: "POST",
|
|
||||||
schema: {
|
|
||||||
body: z.object({
|
|
||||||
workspaceName: z.string().trim(),
|
|
||||||
organizationId: z.string().trim()
|
|
||||||
}),
|
|
||||||
response: {
|
|
||||||
200: z.object({
|
|
||||||
workspace: projectWithEnv
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onRequest: verifyAuth([AuthMode.JWT]),
|
|
||||||
handler: async (req) => {
|
|
||||||
const workspace = await server.services.project.createProject({
|
|
||||||
actorId: req.permission.id,
|
|
||||||
actor: req.permission.type,
|
|
||||||
orgId: req.body.organizationId,
|
|
||||||
actorOrgId: req.permission.orgId,
|
|
||||||
workspaceName: req.body.workspaceName
|
|
||||||
});
|
|
||||||
return { workspace };
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
server.route({
|
server.route({
|
||||||
url: "/:workspaceId",
|
url: "/:workspaceId",
|
||||||
method: "DELETE",
|
method: "DELETE",
|
||||||
|
|||||||
@@ -92,27 +92,20 @@ export const projectServiceFactory = ({
|
|||||||
* Create workspace. Make user the admin
|
* Create workspace. Make user the admin
|
||||||
* */
|
* */
|
||||||
const createProject = async ({
|
const createProject = async ({
|
||||||
orgId,
|
|
||||||
orgSlug,
|
orgSlug,
|
||||||
actor,
|
actor,
|
||||||
actorId,
|
actorId,
|
||||||
actorOrgId,
|
actorOrgId,
|
||||||
workspaceName,
|
workspaceName,
|
||||||
slug
|
slug: projectSlug
|
||||||
}: TCreateProjectDTO) => {
|
}: TCreateProjectDTO) => {
|
||||||
if (orgSlug && orgId) {
|
if (!orgSlug) {
|
||||||
throw new BadRequestError({
|
throw new BadRequestError({
|
||||||
message: "Cannot provide both orgId and orgSlug"
|
message: "Must provide organization slug to create project"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!orgSlug && !orgId) {
|
const organization = await orgDAL.findOne({ slug: orgSlug });
|
||||||
throw new BadRequestError({
|
|
||||||
message: "Must provide either orgId or orgSlug"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const organization = orgSlug ? await orgDAL.findOne({ slug: orgSlug }) : await orgDAL.findOne({ id: orgId });
|
|
||||||
|
|
||||||
const { permission, membership: orgMembership } = await permissionService.getOrgPermission(
|
const { permission, membership: orgMembership } = await permissionService.getOrgPermission(
|
||||||
actor,
|
actor,
|
||||||
@@ -141,7 +134,7 @@ export const projectServiceFactory = ({
|
|||||||
{
|
{
|
||||||
name: workspaceName,
|
name: workspaceName,
|
||||||
orgId: organization.id,
|
orgId: organization.id,
|
||||||
slug: slug || slugify(`${workspaceName}-${alphaNumericNanoId(4)}`),
|
slug: projectSlug || slugify(`${workspaceName}-${alphaNumericNanoId(4)}`),
|
||||||
version: ProjectVersion.V2
|
version: ProjectVersion.V2
|
||||||
},
|
},
|
||||||
tx
|
tx
|
||||||
|
|||||||
@@ -23,8 +23,7 @@ export type TCreateProjectDTO = {
|
|||||||
actor: ActorType;
|
actor: ActorType;
|
||||||
actorId: string;
|
actorId: string;
|
||||||
actorOrgId?: string;
|
actorOrgId?: string;
|
||||||
orgId?: string;
|
orgSlug: string;
|
||||||
orgSlug?: string;
|
|
||||||
workspaceName: string;
|
workspaceName: string;
|
||||||
slug?: string;
|
slug?: string;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user