Minor UX adjustments to SCIM

backend/src/ee/routes/v1/scim-router.ts

@@ -9,7 +9,7 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
     try {
       const strBody = body instanceof Buffer ? body.toString() : body;
 
-      const json: unknown = JSON.parse(strBody); // TODO: update
+      const json: unknown = JSON.parse(strBody);
       done(null, json);
     } catch (err) {
       const error = err as Error;
@@ -294,13 +294,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
           familyName: z.string().trim(),
           givenName: z.string().trim()
         }),
-        // emails: z.array(
-        //   z.object({
-        //     primary: z.boolean(),
-        //     value: z.string().email(),
-        //     type: z.string().trim()
-        //   })
-        // ),
         displayName: z.string().trim(),
         active: z.boolean()
       }),
@@ -335,20 +328,4 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
       return user;
     }
   });
-
-  // server.route({
-  //   url: "/Users/:userId",
-  //   method: "DELETE",
-  //   schema: {
-  //     body: z.object({}),
-  //     response: {
-  //       200: z.object({})
-  //     }
-  //   },
-  //   onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
-  //   handler: () => {
-  //     // TODO: update a user's profile
-  //     return {};
-  //   }
-  // });
 };

backend/src/ee/services/scim/scim-service.ts

@@ -9,6 +9,8 @@ import { TOrgPermission } from "@app/lib/types";
 import { AuthMethod, AuthTokenType } from "@app/services/auth/auth-type";
 import { TOrgDALFactory } from "@app/services/org/org-dal";
 import { deleteOrgMembership } from "@app/services/org/org-fns";
+import { TProjectDALFactory } from "@app/services/project/project-dal";
+import { TProjectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal";
 import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
 import { TUserDALFactory } from "@app/services/user/user-dal";
 
@@ -29,10 +31,14 @@ import {
 } from "./scim-types";
 
 type TScimServiceFactoryDep = {
-  // TODO: pick types
-  scimDAL: TScimDALFactory; // TODO: pick
-  userDAL: TUserDALFactory; // TODO: pick
-  orgDAL: TOrgDALFactory; // TODO: pick
+  scimDAL: Pick<TScimDALFactory, "create" | "find" | "findById" | "deleteById">;
+  userDAL: Pick<TUserDALFactory, "findOne" | "create" | "transaction">;
+  orgDAL: Pick<
+    TOrgDALFactory,
+    "createMembership" | "findById" | "findMembership" | "deleteMembershipById" | "transaction"
+  >;
+  projectDAL: Pick<TProjectDALFactory, "find">;
+  projectMembershipDAL: Pick<TProjectMembershipDALFactory, "find" | "delete">;
   licenseService: Pick<TLicenseServiceFactory, "getPlan">;
   permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
   smtpService: TSmtpService;
@@ -45,6 +51,8 @@ export const scimServiceFactory = ({
   scimDAL,
   userDAL,
   orgDAL,
+  projectDAL,
+  projectMembershipDAL,
   permissionService,
   smtpService
 }: TScimServiceFactoryDep) => {
@@ -325,7 +333,9 @@ export const scimServiceFactory = ({
       await deleteOrgMembership({
         orgMembershipId: membership.id,
         orgId: membership.orgId,
-        orgDAL
+        orgDAL,
+        projectDAL,
+        projectMembershipDAL
       });
     }
 
@@ -368,7 +378,9 @@ export const scimServiceFactory = ({
       await deleteOrgMembership({
         orgMembershipId: membership.id,
         orgId: membership.orgId,
-        orgDAL
+        orgDAL,
+        projectDAL,
+        projectMembershipDAL
       });
     }
 

backend/src/server/routes/index.ts

@@ -219,6 +219,8 @@ export const registerRoutes = async (
     scimDAL,
     userDAL,
     orgDAL,
+    projectDAL,
+    projectMembershipDAL,
     permissionService,
     smtpService
   });

backend/src/services/org/org-fns.ts

@@ -1,21 +1,41 @@
 import { TOrgDALFactory } from "@app/services/org/org-dal";
+import { TProjectDALFactory } from "@app/services/project/project-dal";
+import { TProjectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal";
 
 type TDeleteOrgMembership = {
   orgMembershipId: string;
   orgId: string;
-  orgDAL: TOrgDALFactory;
+  orgDAL: Pick<TOrgDALFactory, "findMembership" | "deleteMembershipById" | "transaction">;
+  projectDAL: Pick<TProjectDALFactory, "find">;
+  projectMembershipDAL: Pick<TProjectMembershipDALFactory, "find" | "delete">;
 };
 
-export const deleteOrgMembership = async ({ orgMembershipId, orgId, orgDAL }: TDeleteOrgMembership) => {
-  // TODO: improve this implementation
+export const deleteOrgMembership = async ({
+  orgMembershipId,
+  orgId,
+  orgDAL,
+  projectDAL,
+  projectMembershipDAL
+}: TDeleteOrgMembership) => {
+  const membership = await orgDAL.transaction(async (tx) => {
+    // delete org membership
+    const orgMembership = await orgDAL.deleteMembershipById(orgMembershipId, orgId, tx);
 
-  // delete
-  const m2 = await orgDAL.transaction(async (tx) => {
-    const m1 = await orgDAL.deleteMembershipById(orgMembershipId, orgId, tx);
-    // const [deletedMembership] = await projectMembershipDAL.delete({ projectId, id: membershipId }, tx);
-    // delete project memberships
-    return m1;
+    const projects = await projectDAL.find({ orgId }, { tx });
+
+    // delete associated project memberships
+    await projectMembershipDAL.delete(
+      {
+        $in: {
+          projectId: projects.map((project) => project.id)
+        },
+        userId: orgMembership.userId as string
+      },
+      tx
+    );
+
+    return orgMembership;
   });
 
-  return m2;
+  return membership;
 };