fix org service test expecting member list to include admin

Tool: gitpod/catfood.gitpod.cloud
gitpod-io · Feb 7, 2025 · 004e07a · 004e07a
1 parent ac0e2c5
commit 004e07a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/components/server/src/api/organization-service-api.ts b/components/server/src/api/organization-service-api.ts
@@ -188,7 +188,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "organizationId is required");
         }
 
-        const members = await this.orgService.listMembers(ctxUserId(), req.organizationId);
+        const members = await this.orgService.listMembers(ctxUserId(), req.organizationId, true);
         //TODO pagination
         const response = new ListOrganizationMembersResponse();
         response.members = members.map((member) => this.apiConverter.toOrganizationMember(member));
@@ -218,7 +218,7 @@ export class OrganizationServiceAPI implements ServiceImpl<typeof OrganizationSe
             this.apiConverter.fromOrgMemberRole(req.role),
         );
         const member = await this.orgService
-            .listMembers(ctxUserId(), req.organizationId)
+            .listMembers(ctxUserId(), req.organizationId, true)
             .then((members) => members.find((member) => member.userId === req.userId));
         return new UpdateOrganizationMemberResponse({
             member: member && this.apiConverter.toOrganizationMember(member),

diff --git a/components/server/src/orgs/organization-service.ts b/components/server/src/orgs/organization-service.ts
@@ -263,9 +263,13 @@ export class OrganizationService {
     }
 
     /**
-     * List members of an organization, excluding the built-in installation admin user and all deleted users.
+     * List members of an organization, excluding all deleted users and optionally the built-in installation admin user.
      */
-    public async listMembers(userId: string, orgId: string): Promise<OrgMemberInfo[]> {
+    public async listMembers(
+        userId: string,
+        orgId: string,
+        excludeInstallationAdmin?: boolean,
+    ): Promise<OrgMemberInfo[]> {
         await this.auth.checkPermissionOnOrganization(userId, "read_members", orgId);
         const members = await this.teamDB.findMembersByTeam(orgId);
 
@@ -278,7 +282,7 @@ export class OrganizationService {
                     if (user.markedDeleted) {
                         return null;
                     }
-                    if (user.id === BUILTIN_INSTLLATION_ADMIN_USER_ID) {
+                    if (excludeInstallationAdmin && user.id === BUILTIN_INSTLLATION_ADMIN_USER_ID) {
                         return null;
                     }