feat: battle of ts - unlimited edition

backend/src/ee/routes/v1/identity-project-additional-privilege-router.ts

@@ -1,6 +1,7 @@
 import slugify from "@sindresorhus/slugify";
 import { z } from "zod";
 
+import { AccessScope, TemporaryPermissionMode } from "@app/db/schemas";
 import { backfillPermissionV1SchemaToV2Schema } from "@app/ee/services/permission/project-permission";
 import { ApiDocsTags, IDENTITY_ADDITIONAL_PRIVILEGE } from "@app/lib/api-docs";
 import { UnauthorizedError } from "@app/lib/errors";
@@ -14,8 +15,7 @@ import {
   ProjectSpecificPrivilegePermissionSchema,
   SanitizedIdentityPrivilegeSchema
 } from "@app/server/routes/sanitizedSchemas";
-import { AuthMode } from "@app/services/auth/auth-type";
-import { AccessScope, MembershipActors, TemporaryPermissionMode } from "@app/db/schemas";
+import { ActorType, AuthMode } from "@app/services/auth/auth-type";
 
 export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: FastifyZodProvider) => {
   server.route({
@@ -78,7 +78,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         data: {
           actorId: req.body.identityId,
-          actorType: MembershipActors.Identity,
+          actorType: ActorType.IDENTITY,
           ...req.body,
           isTemporary: false,
           name: req.body.slug || slugify(alphaNumericNanoId(8)),
@@ -92,7 +92,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.body.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }
@@ -172,7 +172,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         data: {
           actorId: req.body.identityId,
-          actorType: MembershipActors.Identity,
+          actorType: ActorType.IDENTITY,
           ...req.body,
           isTemporary: true,
           name: req.body.slug || slugify(alphaNumericNanoId(8)),
@@ -186,7 +186,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.body.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }
@@ -262,15 +262,9 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         slug: req.body.projectSlug
       });
 
-      const { membershipId } = await server.services.convertor.identityIdToMembershipId(
-        req.body.identityId,
-        AccessScope.Project,
-        projectId
-      );
-
-      const { privilegeId } = await server.services.convertor.additionalPrivilegeNameToId(
+      const { privilege: privilegeDoc } = await server.services.convertor.additionalPrivilegeNameToDoc(
         req.body.privilegeSlug,
-        membershipId
+        projectId
       );
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.updateAdditionalPrivilege({
@@ -282,8 +276,8 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         selector: {
           actorId: req.body.identityId,
-          actorType: MembershipActors.Identity,
-          id: privilegeId
+          actorType: ActorType.IDENTITY,
+          id: privilegeDoc.id
         },
         data: {
           ...req.body,
@@ -305,7 +299,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.body.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }
@@ -346,15 +340,9 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         slug: req.body.projectSlug
       });
 
-      const { membershipId } = await server.services.convertor.identityIdToMembershipId(
-        req.body.identityId,
-        AccessScope.Project,
-        projectId
-      );
-
-      const { privilegeId } = await server.services.convertor.additionalPrivilegeNameToId(
+      const { privilegeId } = await server.services.convertor.additionalPrivilegeNameToDoc(
         req.body.privilegeSlug,
-        membershipId
+        projectId
       );
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.deleteAdditionalPrivilege({
@@ -366,7 +354,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         selector: {
           actorId: req.body.identityId,
-          actorType: MembershipActors.Identity,
+          actorType: ActorType.IDENTITY,
           id: privilegeId
         }
       });
@@ -375,7 +363,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.body.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }
@@ -418,15 +406,9 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         slug: req.query.projectSlug
       });
 
-      const { membershipId } = await server.services.convertor.identityIdToMembershipId(
-        req.query.identityId,
-        AccessScope.Project,
-        projectId
-      );
-
-      const { privilegeId } = await server.services.convertor.additionalPrivilegeNameToId(
+      const { privilegeId } = await server.services.convertor.additionalPrivilegeNameToDoc(
         req.params.privilegeSlug,
-        membershipId
+        projectId
       );
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.getAdditionalPrivilegeById({
@@ -438,7 +420,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         selector: {
           actorId: req.query.identityId,
-          actorType: MembershipActors.Identity,
+          actorType: ActorType.IDENTITY,
           id: privilegeId
         }
       });
@@ -447,7 +429,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.query.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }
@@ -496,7 +478,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         selector: {
           actorId: req.query.identityId,
-          actorType: MembershipActors.Identity
+          actorType: ActorType.IDENTITY
         }
       });
 
@@ -504,7 +486,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privileges: privileges.map((privilege) => ({
           ...privilege,
           identityId: req.query.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }))

backend/src/ee/routes/v1/user-additional-privilege-router.ts

@@ -1,17 +1,18 @@
 import slugify from "@sindresorhus/slugify";
 import { z } from "zod";
 
-import { AccessScope, MembershipActors, TemporaryPermissionMode } from "@app/db/schemas";
+import { AccessScope, TemporaryPermissionMode } from "@app/db/schemas";
 import { checkForInvalidPermissionCombination } from "@app/ee/services/permission/permission-fns";
 import { ProjectPermissionV2Schema } from "@app/ee/services/permission/project-permission";
 import { PROJECT_USER_ADDITIONAL_PRIVILEGE } from "@app/lib/api-docs";
+import { NotFoundError } from "@app/lib/errors";
 import { ms } from "@app/lib/ms";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
 import { slugSchema } from "@app/server/lib/schemas";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
 import { SanitizedUserProjectAdditionalPrivilegeSchema } from "@app/server/routes/sanitizedSchema/user-additional-privilege";
-import { AuthMode } from "@app/services/auth/auth-type";
+import { ActorType, AuthMode } from "@app/services/auth/auth-type";
 
 export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodProvider) => {
   server.route({
@@ -70,7 +71,7 @@ export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodPr
         },
         data: {
           actorId: userId,
-          actorType: MembershipActors.User,
+          actorType: ActorType.USER,
           ...req.body.type,
           name: req.body.slug || slugify(alphaNumericNanoId(8)),
           permissions: req.body.permissions
@@ -127,17 +128,15 @@ export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodPr
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
-      const { membership } = await server.services.convertor.additionalPrivilegeIdToMembershipId(
-        req.params.privilegeId,
-        AccessScope.Project,
-        req.permission.orgId
-      );
+      const data = await server.services.convertor.additionalPrivilegeIdToDoc(req.params.privilegeId);
+      if (!data.privilege.actorUserId)
+        throw new NotFoundError({ message: `Privilege with id ${req.params.privilegeId} not found` });
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.updateAdditionalPrivilege({
         permission: req.permission,
         scopeData: {
           scope: AccessScope.Project,
-          projectId: membership.scopeProjectId as string,
+          projectId: data.privilege.projectId as string,
           orgId: req.permission.orgId
         },
         data: {
@@ -151,16 +150,16 @@ export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodPr
         },
         selector: {
           id: req.params.privilegeId,
-          actorId: membership.actorUserId as string,
-          actorType: MembershipActors.User
+          actorId: data.privilege.actorUserId,
+          actorType: ActorType.USER
         }
       });
 
       return {
         privilege: {
           ...privilege,
-          userId: membership.actorUserId as string,
-          projectId: membership.scopeProjectId as string,
+          userId: data.privilege.actorUserId,
+          projectId: data.privilege.projectId as string,
           slug: privilege.name
         }
       };
@@ -185,31 +184,29 @@ export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodPr
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
-      const { membership } = await server.services.convertor.additionalPrivilegeIdToMembershipId(
-        req.params.privilegeId,
-        AccessScope.Project,
-        req.permission.orgId
-      );
+      const data = await server.services.convertor.additionalPrivilegeIdToDoc(req.params.privilegeId);
+      if (!data.privilege.actorUserId)
+        throw new NotFoundError({ message: `Privilege with id ${req.params.privilegeId} not found` });
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.deleteAdditionalPrivilege({
         permission: req.permission,
         scopeData: {
           scope: AccessScope.Project,
-          projectId: membership.scopeProjectId as string,
+          projectId: data.privilege.projectId as string,
           orgId: req.permission.orgId
         },
         selector: {
           id: req.params.privilegeId,
-          actorId: membership.actorUserId as string,
-          actorType: MembershipActors.User
+          actorId: data.privilege.actorUserId,
+          actorType: ActorType.USER
         }
       });
 
       return {
         privilege: {
           ...privilege,
-          userId: membership.actorUserId as string,
-          projectId: membership.scopeProjectId as string,
+          userId: data.privilege.actorUserId,
+          projectId: data.privilege.projectId as string,
           slug: privilege.name
         }
       };
@@ -249,7 +246,7 @@ export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodPr
         },
         selector: {
           actorId: userId,
-          actorType: MembershipActors.User
+          actorType: ActorType.USER
         }
       });
 
@@ -282,31 +279,29 @@ export const registerUserAdditionalPrivilegeRouter = async (server: FastifyZodPr
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
-      const { membership } = await server.services.convertor.additionalPrivilegeIdToMembershipId(
-        req.params.privilegeId,
-        AccessScope.Project,
-        req.permission.orgId
-      );
+      const data = await server.services.convertor.additionalPrivilegeIdToDoc(req.params.privilegeId);
+      if (!data.privilege.actorUserId)
+        throw new NotFoundError({ message: `Privilege with id ${req.params.privilegeId} not found` });
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.getAdditionalPrivilegeById({
         permission: req.permission,
         scopeData: {
           scope: AccessScope.Project,
-          projectId: membership.scopeProjectId as string,
+          projectId: data.privilege.projectId as string,
           orgId: req.permission.orgId
         },
         selector: {
           id: req.params.privilegeId,
-          actorId: membership.actorUserId as string,
-          actorType: MembershipActors.User
+          actorId: data.privilege.actorUserId,
+          actorType: ActorType.USER
         }
       });
 
       return {
         privilege: {
           ...privilege,
-          userId: membership.actorUserId as string,
-          projectId: membership.scopeProjectId as string,
+          userId: data.privilege.actorUserId,
+          projectId: data.privilege.projectId as string,
           slug: privilege.name
         }
       };

backend/src/ee/routes/v2/identity-project-additional-privilege-router.ts

@@ -1,7 +1,7 @@
 import slugify from "@sindresorhus/slugify";
 import { z } from "zod";
 
-import { AccessScope, MembershipActors, TemporaryPermissionMode } from "@app/db/schemas";
+import { AccessScope, TemporaryPermissionMode } from "@app/db/schemas";
 import { checkForInvalidPermissionCombination } from "@app/ee/services/permission/permission-fns";
 import { ProjectPermissionV2Schema } from "@app/ee/services/permission/project-permission";
 import { ApiDocsTags, IDENTITY_ADDITIONAL_PRIVILEGE_V2 } from "@app/lib/api-docs";
@@ -11,7 +11,7 @@ import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
 import { slugSchema } from "@app/server/lib/schemas";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
 import { SanitizedIdentityPrivilegeSchema } from "@app/server/routes/sanitizedSchema/identitiy-additional-privilege";
-import { AuthMode } from "@app/services/auth/auth-type";
+import { ActorType, AuthMode } from "@app/services/auth/auth-type";
 
 export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: FastifyZodProvider) => {
   server.route({
@@ -73,7 +73,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         data: {
           actorId: req.body.identityId,
-          actorType: MembershipActors.Identity,
+          actorType: ActorType.IDENTITY,
           ...req.body.type,
           name: req.body.slug || slugify(alphaNumericNanoId(8)),
           permissions: req.body.permissions
@@ -84,7 +84,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.body.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId: req.body.projectId,
           slug: privilege.name
         }
@@ -142,23 +142,19 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
     },
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
-      const { membership } = await server.services.convertor.additionalPrivilegeIdToMembershipId(
-        req.params.id,
-        AccessScope.Project,
-        req.permission.orgId
-      );
+      const { privilege: privilegeDoc } = await server.services.convertor.additionalPrivilegeIdToDoc(req.params.id);
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.updateAdditionalPrivilege({
         permission: req.permission,
         scopeData: {
           scope: AccessScope.Project,
-          projectId: membership.scopeProjectId as string,
+          projectId: privilegeDoc.projectId as string,
           orgId: req.permission.orgId
         },
         selector: {
           id: req.params.id,
-          actorId: membership.actorIdentityId as string,
-          actorType: MembershipActors.Identity
+          actorId: privilegeDoc.actorIdentityId as string,
+          actorType: ActorType.IDENTITY
         },
         data: {
           ...req.body,
@@ -170,9 +166,9 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
       return {
         privilege: {
           ...privilege,
-          identityId: membership.actorIdentityId as string,
-          projectMembershipId: privilege.membershipId,
-          projectId: membership.scopeProjectId as string,
+          identityId: privilegeDoc.actorIdentityId as string,
+          projectMembershipId: "",
+          projectId: privilegeDoc.projectId as string,
           slug: privilege.name
         }
       };
@@ -205,32 +201,28 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
     },
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
-      const { membership } = await server.services.convertor.additionalPrivilegeIdToMembershipId(
-        req.params.id,
-        AccessScope.Project,
-        req.permission.orgId
-      );
+      const { privilege: privilegeDoc } = await server.services.convertor.additionalPrivilegeIdToDoc(req.params.id);
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.deleteAdditionalPrivilege({
         permission: req.permission,
         scopeData: {
           scope: AccessScope.Project,
-          projectId: membership.scopeProjectId as string,
+          projectId: privilegeDoc.projectId as string,
           orgId: req.permission.orgId
         },
         selector: {
           id: req.params.id,
-          actorId: membership.actorIdentityId as string,
-          actorType: MembershipActors.Identity
+          actorId: privilegeDoc.actorIdentityId as string,
+          actorType: ActorType.IDENTITY
         }
       });
 
       return {
         privilege: {
           ...privilege,
-          identityId: membership.actorIdentityId as string,
-          projectMembershipId: privilege.membershipId,
-          projectId: membership.scopeProjectId as string,
+          identityId: privilegeDoc.actorIdentityId as string,
+          projectMembershipId: "",
+          projectId: privilegeDoc.projectId as string,
           slug: privilege.name
         }
       };
@@ -263,32 +255,28 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
     },
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
-      const { membership } = await server.services.convertor.additionalPrivilegeIdToMembershipId(
-        req.params.id,
-        AccessScope.Project,
-        req.permission.orgId
-      );
+      const { privilege: privilegeDoc } = await server.services.convertor.additionalPrivilegeIdToDoc(req.params.id);
 
       const { additionalPrivilege: privilege } = await server.services.additionalPrivilege.getAdditionalPrivilegeById({
         permission: req.permission,
         scopeData: {
           scope: AccessScope.Project,
-          projectId: membership.scopeProjectId as string,
+          projectId: privilegeDoc.projectId as string,
           orgId: req.permission.orgId
         },
         selector: {
           id: req.params.id,
-          actorId: membership.actorIdentityId as string,
-          actorType: MembershipActors.Identity
+          actorId: privilegeDoc.actorIdentityId as string,
+          actorType: ActorType.IDENTITY
         }
       });
 
       return {
         privilege: {
           ...privilege,
-          identityId: membership.actorIdentityId as string,
-          projectMembershipId: privilege.membershipId,
-          projectId: membership.scopeProjectId as string,
+          identityId: privilegeDoc.actorIdentityId as string,
+          projectMembershipId: "",
+          projectId: privilegeDoc.projectId as string,
           slug: privilege.name
         }
       };
@@ -341,7 +329,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
           selector: {
             name: req.params.privilegeSlug,
             actorId: req.query.identityId,
-            actorType: MembershipActors.Identity
+            actorType: ActorType.IDENTITY
           }
         }
       );
@@ -350,7 +338,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privilege: {
           ...privilege,
           identityId: req.query.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId,
           slug: privilege.name
         }
@@ -394,7 +382,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         },
         selector: {
           actorId: req.query.identityId,
-          actorType: MembershipActors.Identity
+          actorType: ActorType.IDENTITY
         }
       });
 
@@ -402,7 +390,7 @@ export const registerIdentityProjectAdditionalPrivilegeRouter = async (server: F
         privileges: privileges.map((privilege) => ({
           ...privilege,
           identityId: req.query.identityId,
-          projectMembershipId: privilege.membershipId,
+          projectMembershipId: "",
           projectId: req.query.projectId,
           slug: privilege.name
         }))