Ghost user and migration finished!

backend/src/server/routes/index.ts

@@ -327,7 +327,12 @@ export const registerRoutes = async (
     identityProjectDAL,
     identityOrgMembershipDAL,
     projectBotDAL,
+    secretDAL,
+    orgDAL,
+    secretApprovalRequestDAL,
+    secretApprovalSecretDAL: sarSecretDAL,
     projectKeyDAL,
+    secretVersionDAL,
     userDAL,
     projectEnvDAL,
     orgService,

backend/src/server/routes/v1/bot-router.ts

@@ -33,7 +33,7 @@ export const registerProjectBotRouter = async (server: FastifyZodProvider) => {
         projectId: req.params.projectId
       });
 
-      if (!project.e2ee) {
+      if (project.version === "v2") {
         throw new BadRequestError({ message: "Failed to find bot, project has E2EE disabled" });
       }
 
@@ -79,7 +79,7 @@ export const registerProjectBotRouter = async (server: FastifyZodProvider) => {
     handler: async (req) => {
       const project = await server.services.projectBot.findProjectByBotId(req.params.botId);
 
-      if (project?.e2ee === false) {
+      if (project?.version === "v2") {
         throw new BadRequestError({ message: "Failed to set bot active, project has E2EE disabled" });
       }
 

backend/src/server/routes/v2/project-router.ts

@@ -17,7 +17,7 @@ const projectWithEnv = ProjectsSchema.merge(
 export const registerProjectRouter = async (server: FastifyZodProvider) => {
   /* Get project key */
   server.route({
-    url: "/:workspaceId/encrypted-key",
+    url: "/:projectId/encrypted-key",
     method: "GET",
     schema: {
       description: "Return encrypted project key",
@@ -27,7 +27,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
         }
       ],
       params: z.object({
-        workspaceId: z.string().trim()
+        projectId: z.string().trim()
       }),
       response: {
         200: ProjectKeysSchema.merge(
@@ -50,7 +50,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
 
       await server.services.auditLog.createAuditLog({
         ...req.auditLogInfo,
-        projectId: req.params.workspaceId,
+        projectId: req.params.projectId,
         event: {
           type: EventType.GET_WORKSPACE_KEY,
           metadata: {

backend/src/server/routes/v3/index.ts

@@ -1,5 +1,4 @@
 import { registerLoginRouter } from "./login-router";
-import { registerProjectRouter } from "./project-router";
 import { registerSecretBlindIndexRouter } from "./secret-blind-index-router";
 import { registerSecretRouter } from "./secret-router";
 import { registerSignupRouter } from "./signup-router";
@@ -11,5 +10,4 @@ export const registerV3Routes = async (server: FastifyZodProvider) => {
   await server.register(registerUserRouter, { prefix: "/users" });
   await server.register(registerSecretRouter, { prefix: "/secrets" });
   await server.register(registerSecretBlindIndexRouter, { prefix: "/workspaces" });
-  await server.register(registerProjectRouter, { prefix: "/projects" });
 };

backend/src/server/routes/v3/project-router.ts

@@ -1,88 +0,0 @@
-import { z } from "zod";
-
-import { ProjectMembershipsSchema, ProjectsSchema } from "@app/db/schemas";
-import { EventType } from "@app/ee/services/audit-log/audit-log-types";
-import { authRateLimit } from "@app/server/config/rateLimiter";
-
-const projectWithEnv = ProjectsSchema.merge(
-  z.object({
-    _id: z.string(),
-    environments: z.object({ name: z.string(), slug: z.string(), id: z.string() }).array()
-  })
-);
-
-export const registerProjectRouter = async (server: FastifyZodProvider) => {
-  /* Create new project */
-  server.route({
-    method: "POST",
-    url: "/",
-    config: {
-      rateLimit: authRateLimit
-    },
-    schema: {
-      body: z.object({
-        projectName: z.string().trim(),
-        organizationId: z.string().trim()
-      }),
-      response: {
-        200: z.object({
-          project: projectWithEnv
-        })
-      }
-    },
-    handler: async (req) => {
-      const project = await server.services.project.createProject({
-        actorId: req.permission.id,
-        actor: req.permission.type,
-        orgId: req.body.organizationId,
-        workspaceName: req.body.projectName
-      });
-
-      return { project };
-    }
-  });
-
-  server.route({
-    method: "POST",
-    url: "/:projectId/memberships",
-    config: {
-      rateLimit: authRateLimit
-    },
-    schema: {
-      params: z.object({
-        projectId: z.string()
-      }),
-      body: z.object({
-        emails: z.string().email().array()
-      }),
-      response: {
-        200: z.object({
-          memberships: ProjectMembershipsSchema.array()
-        })
-      }
-    },
-    handler: async (req) => {
-      const memberships = await server.services.projectMembership.addUsersToProjectNonE2EE({
-        projectId: req.params.projectId,
-        actorId: req.permission.id,
-        actor: req.permission.type,
-        emails: req.body.emails
-      });
-
-      await server.services.auditLog.createAuditLog({
-        projectId: req.params.projectId,
-        ...req.auditLogInfo,
-        event: {
-          type: EventType.ADD_BATCH_WORKSPACE_MEMBER,
-          metadata: memberships.map(({ userId, id }) => ({
-            userId: userId || "",
-            membershipId: id,
-            email: ""
-          }))
-        }
-      });
-
-      return { memberships };
-    }
-  });
-};