[server] Fix OrganizationService.addOrUpdateMember

Author: geropl

components/server/src/orgs/organization-service.spec.db.ts

@@ -342,8 +342,11 @@ describe("OrganizationService", async () => {
         const myOrg = await os.createOrganization(adminId, "My Org");
         expect((await os.listMembers(adminId, myOrg.id)).length).to.eq(1);
 
-        // add a another member which should become owner
-        await os.addOrUpdateMember(adminId, myOrg.id, owner.id, "member");
+        await withTestCtx(adminId, async () => {
+            // add a another member which should become owner
+            await os.addOrUpdateMember(adminId, myOrg.id, owner.id, "member");
+        });
+
         // admin should have been removed
         const members = await os.listMembers(owner.id, myOrg.id);
         expect(members.length).to.eq(1);

components/server/src/orgs/organization-service.ts

@@ -403,7 +403,14 @@ export class OrganizationService {
                 // we can remove the built-in installation admin if we have added an owner
                 if (!hasOtherRegularOwners && members.some((m) => m.userId === BUILTIN_INSTLLATION_ADMIN_USER_ID)) {
                     try {
-                        await this.removeOrganizationMember(memberId, orgId, BUILTIN_INSTLLATION_ADMIN_USER_ID, txCtx);
+                        await runWithSubjectId(SYSTEM_USER, async () => {
+                            return this.removeOrganizationMember(
+                                SYSTEM_USER_ID,
+                                orgId,
+                                BUILTIN_INSTLLATION_ADMIN_USER_ID,
+                                txCtx,
+                            );
+                        });
                     } catch (error) {
                         log.warn("Failed to remove built-in installation admin from organization.", error);
                     }
@@ -476,7 +483,7 @@ export class OrganizationService {
             event: "team_user_removed",
             properties: {
                 team_id: orgId,
-                removed_user_id: userId,
+                removed_user_id: memberId,
             },
         });
     }