Remove Cf Role by Username

deploy/tools/init-cf-for-e2e.sh

@@ -157,4 +157,8 @@ fi
 # Enable docker for deploy app from docker test
 cf enable-feature-flag diego_docker
 
+# Enable features for testing add/remove role via username
+cf enable-feature-flag set_roles_by_username
+cf enable-feature-flag unset_roles_by_username
+
 echo "All done"

deploy/tools/populate-cf/create-many-orgs.sh

@@ -24,15 +24,13 @@ while [ $counter -le $COUNT ]
 do
     ORG=$ORG_PREFIX-$counter
     if [ "$DELETE" == "true" ]; then
-      # echo "DELETE $ORG"
-      cf delete-org $ORG
+      cf delete-org $ORG -f
     else
       # echo "CREATE $ORG"
       cf create-org $ORG
     fi
 
     if [ "$SPACE_COUNT" != "" ]; then
-      # echo "$ORG SPACES: $SPACE_COUNT"
       cf target -o $ORG
       ./create-many-spaces.sh -o "$ORG" -s "$ORG-spaces" -c $SPACE_COUNT -a 0 -r 0 -p "false"
     fi

protractor.conf.js

@@ -85,7 +85,8 @@ const manageUsersSuite = globby.sync([
   './src/test-e2e/cloud-foundry/space-level/space-users-removal-e2e.spec.ts',
   './src/test-e2e/cloud-foundry/cf-level/cf-invite-config-e2e.spec.ts',
   './src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts',
-  './src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts'
+  './src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts',
+  './src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts'
 ])
 
 const coreSuite = globby.sync([

src/frontend/packages/cloud-foundry/src/actions/space.actions.ts

@@ -1,8 +1,9 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { IUpdateSpace } from '../../../core/src/core/cf-api.types';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import { CFEntityConfig } from '../cf-types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import {
   applicationEntityType,
@@ -15,6 +16,7 @@ import {
   spaceEntityType,
   spaceWithOrgEntityType,
 } from '../cf-entity-types';
+import { CFEntityConfig } from '../cf-types';
 import {
   createEntityRelationKey,
   EntityInlineChildAction,
@@ -24,7 +26,6 @@ import { CFStartAction } from './cf-action.types';
 import { GetAllOrgUsers } from './organization.actions';
 import { RouteEvents } from './route.actions';
 import { getServiceInstanceRelations } from './service-instances.actions';
-import { HttpRequest, HttpParams } from '@angular/common/http';
 
 export const GET_SPACES = '[Space] Get all';
 export const GET_SPACES_SUCCESS = '[Space] Get all success';
@@ -231,7 +232,6 @@ export class GetAllSpaceUsers extends GetAllOrgUsers {
       'GET',
       `spaces/${guid}/user_roles`
     );
-    this.flattenPaginationMax = 600;
   }
   actions = getActions('Spaces', 'List all user roles');
 }

src/frontend/packages/cloud-foundry/src/actions/users-roles.actions.ts

@@ -10,13 +10,31 @@ export const UsersRolesActions = {
   SetOrg: '[Users Roles] Set org',
   SetOrgRole: '[Users Roles] Set org role',
   SetSpaceRole: '[Users Roles] Set space role',
+  FlipSetRoles: '[Users Roles] Flip Set Roles',
+  SetIsRemove: '[Users Roles] Set Is Remove',
+  SetIsSetByUsername: '[Users Roles] Set Is Set By Username',
   SetChanges: '[Users Roles] Set role changes',
   ExecuteChanges: '[Users Roles] Execute changes',
 };
 
 export class UsersRolesSetUsers implements Action {
   type = UsersRolesActions.SetUsers;
-  constructor(public cfGuid: string, public users: CfUser[]) { }
+  constructor(public cfGuid: string, public users: CfUser[], public origin?: string) { }
+}
+
+export class UsersRolesFlipSetRoles implements Action {
+  type = UsersRolesActions.FlipSetRoles;
+  constructor() { }
+}
+
+export class UsersRolesSetIsRemove implements Action {
+  type = UsersRolesActions.SetIsRemove;
+  constructor(public isRemove: boolean) { }
+}
+
+export class UsersRolesSetIsSetByUsername implements Action {
+  type = UsersRolesActions.SetIsSetByUsername;
+  constructor(public isSetByUsername: boolean) { }
 }
 
 export class UsersRolesSetOrgRole implements Action {
@@ -58,4 +76,5 @@ export class UsersRolesSetChanges implements Action {
 
 export class UsersRolesExecuteChanges implements Action {
   type = UsersRolesActions.ExecuteChanges;
+  constructor(public setByUsername = false, public resetOrgUsers?: string, public resetSpaceUsers?: string) { }
 }

src/frontend/packages/cloud-foundry/src/actions/users.actions.ts

@@ -79,28 +79,47 @@ export class GetAllUsersAsAdmin extends CFStartAction implements PaginatedAction
     return !!action.isGetAllUsersAsAdmin;
   }
 }
+
+interface HttpParamsPayload {
+  [param: string]: string;
+}
+interface ChangeUserRoleByUsernameParams extends HttpParamsPayload {
+  username: string;
+  origin?: string;
+}
+enum ChangeUserRoleType {
+  ADD,
+  REMOVE
+}
+
+
 // FIXME: These actions are user related however return either an org or space entity. These responses can be ignored and not stored, need
 // a flag somewhere to handle that - https://jira.capbristol.com/browse/STRAT-119
+/**
+ *  Add or remove a user's role, either by user guid or name
+ */
 export class ChangeUserRole extends CFStartAction implements EntityRequestAction {
   public endpointType = 'cf';
   constructor(
     public endpointGuid: string,
     public userGuid: string,
-    public method: 'PUT' | 'DELETE',
+    public changeRoleType: ChangeUserRoleType,
     public actions: string[],
     public permissionTypeKey: OrgUserRoleNames | SpaceUserRoleNames,
     public entityGuid: string,
     public isSpace = false,
     public updateConnectedUser = false,
-    public orgGuid?: string
+    public orgGuid?: string,
+    public username = '',
+    public usernameOrigin = '',
   ) {
     super();
     this.guid = entityGuid;
     this.updatingKey = ChangeUserRole.generateUpdatingKey(permissionTypeKey, userGuid);
     this.options = new HttpRequest(
-      method,
-      `${isSpace ? 'spaces' : 'organizations'}/${this.guid}/${this.updatingKey}`,
-      {}
+      this.createMethod(),
+      this.createUrl(),
+      this.createParams()
     );
     this.entityType = isSpace ? spaceEntityType : organizationEntityType;
     this.entity = cfEntityFactory(this.entityType);
@@ -115,6 +134,36 @@ export class ChangeUserRole extends CFStartAction implements EntityRequestAction
   static generateUpdatingKey<T>(permissionType: OrgUserRoleNames | SpaceUserRoleNames, userGuid: string) {
     return `${permissionType}/${userGuid}`;
   }
+
+  createMethod(): string {
+    if (this.changeRoleType === ChangeUserRoleType.ADD) {
+      return 'PUT';
+    }
+    return this.username ? 'POST' : 'DELETE';
+  }
+
+  createUrl(): string {
+    const spaceOrOrg = this.isSpace ? 'spaces' : 'organizations';
+    if (this.username) {
+      // Change role via the username url
+      return `${spaceOrOrg}/${this.guid}/${this.permissionTypeKey}${this.changeRoleType === ChangeUserRoleType.REMOVE ? '/remove' : ''}`;
+    } else {
+      return `${spaceOrOrg}/${this.guid}/${this.updatingKey}`;
+    }
+  }
+
+  createParams(): object {
+    if (this.username) {
+      const payload: ChangeUserRoleByUsernameParams = {
+        username: this.username,
+      };
+      if (this.usernameOrigin) {
+        payload.origin = this.usernameOrigin;
+      }
+      return payload;
+    }
+    return null;
+  }
 }
 
 export class AddUserRole extends ChangeUserRole {
@@ -125,18 +174,22 @@ export class AddUserRole extends ChangeUserRole {
     permissionTypeKey: OrgUserRoleNames | SpaceUserRoleNames,
     isSpace = false,
     updateConnectedUser = false,
-    orgGuid?: string
+    orgGuid?: string,
+    username = '',
+    usernameOrigin = '',
   ) {
     super(
       endpointGuid,
       userGuid,
-      'PUT',
+      ChangeUserRoleType.ADD,
       [ADD_ROLE, ADD_ROLE_SUCCESS, ADD_ROLE_FAILED],
       permissionTypeKey,
       entityGuid,
       isSpace,
       updateConnectedUser,
-      orgGuid
+      orgGuid,
+      username,
+      usernameOrigin
     );
   }
 }
@@ -149,18 +202,22 @@ export class RemoveUserRole extends ChangeUserRole {
     permissionTypeKey: OrgUserRoleNames | SpaceUserRoleNames,
     isSpace = false,
     updateConnectedUser = false,
-    orgGuid?: string
+    orgGuid?: string,
+    username = '',
+    usernameOrigin = '',
   ) {
     super(
       endpointGuid,
       userGuid,
-      'DELETE',
+      ChangeUserRoleType.REMOVE,
       [REMOVE_ROLE, REMOVE_ROLE_SUCCESS, REMOVE_ROLE_FAILED],
       permissionTypeKey,
       entityGuid,
       isSpace,
       updateConnectedUser,
-      orgGuid
+      orgGuid,
+      username,
+      usernameOrigin
     );
   }
 }

src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts

@@ -188,16 +188,45 @@ const ApplicationWithoutSpaceEntitySchema = new CFApplicationEntitySchema(
   }
 );
 
+const CFUserSchema = new CFUserEntitySchema({
+  entity: {
+    organizations: [createUserOrgSpaceSchema(organizationEntityType, {}, CfUserRoleParams.ORGANIZATIONS)],
+    audited_organizations: [createUserOrgSpaceSchema(organizationEntityType, {}, CfUserRoleParams.AUDITED_ORGS)],
+    managed_organizations: [createUserOrgSpaceSchema(organizationEntityType, {}, CfUserRoleParams.MANAGED_ORGS)],
+    billing_managed_organizations: [createUserOrgSpaceSchema(organizationEntityType, {}, CfUserRoleParams.BILLING_MANAGER_ORGS)],
+    spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.SPACES)],
+    managed_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.MANAGED_SPACES)],
+    audited_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.AUDITED_SPACES)],
+  }
+}, {
+    idAttribute: getAPIResourceGuid,
+    processStrategy: (user: APIResource<CfUser>) => {
+      if (user.entity.username) {
+        return user;
+      }
+      const entity = {
+        ...user.entity,
+        username: user.metadata.guid
+      };
+
+      return user.metadata ? {
+        entity,
+        metadata: user.metadata
+      } : {
+          entity
+        };
+    }
+  });
+entityCache[cfUserEntityType] = CFUserSchema;
+
 const coreSpaceSchemaParams = {
   routes: [RouteSchema],
   domains: [DomainSchema],
   space_quota_definition: SpaceQuotaSchema,
   service_instances: [ServiceInstancesSchema],
-  [SpaceUserRoleNames.DEVELOPER]: [
-    new CFEntitySchema(cfUserEntityType, {}, { idAttribute: getAPIResourceGuid }, SpaceUserRoleNames.DEVELOPER)
-  ],
-  [SpaceUserRoleNames.MANAGER]: [new CFUserEntitySchema(undefined, undefined, SpaceUserRoleNames.MANAGER)],
-  [SpaceUserRoleNames.AUDITOR]: [new CFUserEntitySchema(undefined, undefined, SpaceUserRoleNames.AUDITOR)]
+  [SpaceUserRoleNames.DEVELOPER]: [CFUserSchema],
+  [SpaceUserRoleNames.MANAGER]: [CFUserSchema],
+  [SpaceUserRoleNames.AUDITOR]: [CFUserSchema]
 };
 const SpaceSchema = new CFSpaceEntitySchema({
   entity: {
@@ -226,12 +255,10 @@ const OrganizationSchema = new CFOrgEntitySchema({
   entity: {
     ...coreOrgSchemaParams,
     spaces: [SpaceSchema],
-    [OrgUserRoleNames.USER]: [new CFUserEntitySchema(undefined, undefined, OrgUserRoleNames.USER)],
-    [OrgUserRoleNames.MANAGER]: [new CFUserEntitySchema(undefined, undefined, OrgUserRoleNames.MANAGER)],
-    [OrgUserRoleNames.BILLING_MANAGERS]: [
-      new CFUserEntitySchema(undefined, undefined, OrgUserRoleNames.BILLING_MANAGERS)
-    ],
-    [OrgUserRoleNames.AUDITOR]: [new CFUserEntitySchema(undefined, undefined, OrgUserRoleNames.AUDITOR)]
+    [OrgUserRoleNames.USER]: [CFUserSchema],
+    [OrgUserRoleNames.MANAGER]: [CFUserSchema],
+    [OrgUserRoleNames.BILLING_MANAGERS]: [CFUserSchema],
+    [OrgUserRoleNames.AUDITOR]: [CFUserSchema]
   }
 });
 entityCache[organizationEntityType] = OrganizationSchema;
@@ -300,51 +327,13 @@ entityCache[securityGroupEntityType] = SecurityGroupSchema;
 const FeatureFlagSchema = new CFEntitySchema(featureFlagEntityType, {}, { idAttribute: 'name' });
 entityCache[featureFlagEntityType] = FeatureFlagSchema;
 
-const SpaceEmptySchema = SpaceSchema.withEmptyDefinition();
-const orgUserEntity = {
-  entity: {
-    spaces: [SpaceEmptySchema]
-  }
-};
-
 const ServiceBrokerSchema = new CFEntitySchema(serviceBrokerEntityType, {}, { idAttribute: getAPIResourceGuid });
 entityCache[serviceBrokerEntityType] = ServiceBrokerSchema;
 
 function createUserOrgSpaceSchema(schemaKey, entity, relationKey): EntitySchema {
   return new CFEntitySchema(schemaKey, entity, { idAttribute: getAPIResourceGuid }, relationKey);
 }
 
-const CFUserSchema = new CFUserEntitySchema({
-  entity: {
-    organizations: [createUserOrgSpaceSchema(organizationEntityType, orgUserEntity, CfUserRoleParams.ORGANIZATIONS)],
-    audited_organizations: [createUserOrgSpaceSchema(organizationEntityType, orgUserEntity, CfUserRoleParams.AUDITED_ORGS)],
-    managed_organizations: [createUserOrgSpaceSchema(organizationEntityType, orgUserEntity, CfUserRoleParams.MANAGED_ORGS)],
-    billing_managed_organizations: [createUserOrgSpaceSchema(organizationEntityType, orgUserEntity, CfUserRoleParams.BILLING_MANAGER_ORGS)],
-    spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.SPACES)],
-    managed_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.MANAGED_SPACES)],
-    audited_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.AUDITED_SPACES)],
-  }
-}, {
-    idAttribute: getAPIResourceGuid,
-    processStrategy: (user: APIResource<CfUser>) => {
-      if (user.entity.username) {
-        return user;
-      }
-      const entity = {
-        ...user.entity,
-        username: user.metadata.guid
-      };
-
-      return user.metadata ? {
-        entity,
-        metadata: user.metadata
-      } : {
-          entity
-        };
-    }
-  });
-entityCache[cfUserEntityType] = CFUserSchema;
-
 
 const UserProvidedServiceInstanceSchema = new CFEntitySchema(userProvidedServiceInstanceEntityType, {
   entity: {

src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts

@@ -514,7 +514,7 @@ function generateCFServiceBindingEntity(endpointDefinition: StratosEndpointExten
       actionBuilders: serviceBindingActionBuilders,
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.guid
+          name: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }
@@ -617,7 +617,7 @@ function generateCFUserEntity(endpointDefinition: StratosEndpointExtensionDefini
       dataReducers: [userReducer, endpointDisconnectUserReducer],
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.username || ent.entity.guid
+          name: ent.entity.username || ent.entity.guid || ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }