feat: added saml parsing attributes and injecting to metadata of a user in org scoped

backend/src/services/identity/identity-org-dal.ts

@@ -56,11 +56,11 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           queryBuilder.on(`${TableName.IdentityOrgMembership}.identityId`, `${TableName.Identity}.id`);
         })
         .leftJoin(TableName.OrgRoles, `${TableName.IdentityOrgMembership}.roleId`, `${TableName.OrgRoles}.id`)
-        .leftJoin(
-          TableName.IdentityMetadata,
-          `${TableName.IdentityMetadata}.identityOrgMembershipId`,
-          `${TableName.IdentityOrgMembership}.id`
-        )
+        .leftJoin(TableName.IdentityMetadata, (queryBuilder) => {
+          void queryBuilder
+            .on(`${TableName.IdentityOrgMembership}.identityId`, `${TableName.IdentityMetadata}.identityId`)
+            .andOn(`${TableName.IdentityOrgMembership}.orgId`, `${TableName.IdentityMetadata}.orgId`);
+        })
         .select(selectAllTableCols(TableName.IdentityOrgMembership))
         // cr stands for custom role
         .select(db.ref("id").as("crId").withSchema(TableName.OrgRoles))

backend/src/services/identity/identity-service.ts

@@ -73,7 +73,7 @@ export const identityServiceFactory = ({
 
     const identity = await identityDAL.transaction(async (tx) => {
       const newIdentity = await identityDAL.create({ name }, tx);
-      const identityOrgMembership = await identityOrgMembershipDAL.create(
+      await identityOrgMembershipDAL.create(
         {
           identityId: newIdentity.id,
           orgId,
@@ -85,7 +85,8 @@ export const identityServiceFactory = ({
       if (metadata && metadata.length) {
         await identityMetadataDAL.insertMany(
           metadata.map(({ key, value }) => ({
-            identityOrgMembershipId: identityOrgMembership.id,
+            identityId: newIdentity.id,
+            orgId,
             key,
             value
           })),
@@ -159,11 +160,12 @@ export const identityServiceFactory = ({
         );
       }
       if (metadata) {
-        await identityMetadataDAL.delete({ identityOrgMembershipId: identityOrgMembership.id }, tx);
+        await identityMetadataDAL.delete({ orgId: identityOrgMembership.orgId, identityId: id }, tx);
         if (metadata.length) {
           await identityMetadataDAL.insertMany(
             metadata.map(({ key, value }) => ({
-              identityOrgMembershipId: identityOrgMembership.id,
+              identityId: newIdentity.id,
+              orgId: identityOrgMembership.orgId,
               key,
               value
             })),

backend/src/services/org-membership/org-membership-dal.ts

@@ -19,11 +19,11 @@ export const orgMembershipDALFactory = (db: TDbClient) => {
           `${TableName.UserEncryptionKey}.userId`,
           `${TableName.Users}.id`
         )
-        .leftJoin(
-          TableName.IdentityMetadata,
-          `${TableName.IdentityMetadata}.userOrgMembershipId`,
-          `${TableName.OrgMembership}.id`
-        )
+        .leftJoin(TableName.IdentityMetadata, (queryBuilder) => {
+          void queryBuilder
+            .on(`${TableName.OrgMembership}.userId`, `${TableName.IdentityMetadata}.userId`)
+            .andOn(`${TableName.OrgMembership}.orgId`, `${TableName.IdentityMetadata}.orgId`);
+        })
         .select(
           db.ref("id").withSchema(TableName.OrgMembership),
           db.ref("inviteEmail").withSchema(TableName.OrgMembership),

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

@@ -79,7 +79,7 @@ type TOrgServiceFactoryDep = {
     "findProjectMembershipsByUserId" | "delete" | "create" | "find" | "insertMany" | "transaction"
   >;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "delete" | "insertMany" | "findLatestProjectKey">;
-  orgMembershipDAL: Pick<TOrgMembershipDALFactory, "findOrgMembershipById" | "findOne">;
+  orgMembershipDAL: Pick<TOrgMembershipDALFactory, "findOrgMembershipById" | "findOne" | "findById">;
   incidentContactDAL: TIncidentContactsDALFactory;
   samlConfigDAL: Pick<TSamlConfigDALFactory, "findOne" | "findEnforceableSamlCfg">;
   smtpService: TSmtpService;
@@ -413,11 +413,10 @@ export const orgServiceFactory = ({
     const { permission } = await permissionService.getUserOrgPermission(userId, orgId, actorAuthMethod, actorOrgId);
     ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Edit, OrgPermissionSubjects.Member);
 
-    const foundMembership = await orgMembershipDAL.findOne({
-      id: membershipId,
-      orgId
-    });
+    const foundMembership = await orgMembershipDAL.findById(membershipId);
     if (!foundMembership) throw new NotFoundError({ message: "Failed to find organization membership" });
+    if (foundMembership.orgId !== orgId)
+      throw new UnauthorizedError({ message: "Updated org member doesn't belong to the organization" });
     if (foundMembership.userId === userId)
       throw new UnauthorizedError({ message: "Cannot update own organization membership" });
 
@@ -444,11 +443,12 @@ export const orgServiceFactory = ({
       );
 
       if (metadata) {
-        await identityMetadataDAL.delete({ userOrgMembershipId: updatedOrgMembership.id }, tx);
+        await identityMetadataDAL.delete({ userId: updatedOrgMembership.userId, orgId }, tx);
         if (metadata.length) {
           await identityMetadataDAL.insertMany(
             metadata.map(({ key, value }) => ({
-              userOrgMembershipId: updatedOrgMembership.id,
+              userId: updatedOrgMembership.userId,
+              orgId,
               key,
               value
             })),