Merge pull request #3399 from cloudfoundry-incubator/fix-visible-spac…

…e-roles Fix issue where org level user lists shows space roles from other orgs
cloudfoundry · Feb 19, 2019 · 6345314 · 6345314
2 parents 7eabb7d + bf11dc4
commit 6345314
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...s/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts b/...s/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
@@ -46,7 +46,7 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
       isOrgLevel$
     ).pipe(
       switchMap(([user, org, spaces, isOrgLevel]: [APIResource<CfUser>, APIResource<IOrganization>, APIResource<ISpace>[], boolean]) => {
-        const permissionList = this.createPermissions(user, isOrgLevel, spaces && spaces.length ? spaces : null);
+        const permissionList = this.createPermissions(user, isOrgLevel, spaces);
         // If we're showing spaces from multiple orgs prefix the org name to the space name
         return org ? observableOf(this.getChipConfig(permissionList)) : this.prefixOrgName(permissionList);
       })
@@ -99,8 +99,8 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
     );
   }
 
-  private createPermissions(row: APIResource<CfUser>, isOrgLevel = true, spaces?:
-    APIResource<ISpace>[]): ICellPermissionList<SpaceUserRoleNames>[] {
+  private createPermissions(row: APIResource<CfUser>, isOrgLevel = true, spaces?: APIResource<ISpace>[])
+    : ICellPermissionList<SpaceUserRoleNames>[] {
     const userRoles = this.cfUserService.getSpaceRolesFromUser(row.entity, spaces);
     return arrayHelper.flatten<ICellPermissionList<SpaceUserRoleNames>>(
       userRoles.map(spacePerms => this.getSpacePermissions(spacePerms, row, isOrgLevel))

diff --git a/src/frontend/app/shared/data-services/cf-user.service.ts b/src/frontend/app/shared/data-services/cf-user.service.ts
@@ -161,6 +161,11 @@ export class CfUserService {
     });
   }
 
+  /**
+   * Get the space roles for a user
+   * @param user
+   * @param spaces Only fetch roles for these specific spaces. If missing fetch roles for all spaces
+   */
   getSpaceRolesFromUser(user: CfUser, spaces?: APIResource<ISpace>[]): IUserPermissionInSpace[] {
     const res: IUserPermissionInSpace[] = [];
     const spaceGuids = new Set<string>();