Ensure newly connected endpoints admin role and scopes get added

cloudfoundry · KlapTrap · Jun 5, 2018 · May 22, 2018 · May 23, 2018 · May 23, 2018
commit 409bcbd81c61d1ed1791cac0cea98a041fa921e7
diff --git a/...ontend/app/store/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts b/...ontend/app/store/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts
@@ -7,38 +7,68 @@ import {
   IStratosRolesState,
   IGlobalRolesState
 } from '../../types/current-user-roles.types';
-import { SessionData, SessionDataEndpoint, SessionEndpoints, SessionUser } from '../../types/auth.types';
+import { SessionData, SessionDataEndpoint, SessionEndpoints, SessionUser, SessionEndpoint } from '../../types/auth.types';
 import { ScopeStrings } from '../../../core/current-user-permissions.config';
+import { EndpointActionComplete } from '../../actions/endpoint.actions';
+import { EndpointModel, INewlyConnectedEndpointInfo, EndpointUser } from '../../types/endpoint.types';
+
+interface PartialEndpoint {
+  user: EndpointUser | SessionUser;
+  guid: string;
+}
 
 export function roleInfoFromSessionReducer(
   state: ICurrentUserRolesState,
-  user: SessionUser,
-  endpoints: SessionEndpoints
+  action: VerifiedSession
+): ICurrentUserRolesState {
+  const { user, endpoints } = action.sessionData;
+  const cfRoles = propagateEndpointsAdminPermissions(state.cf, Object.values(endpoints.cf));
+  return finishCfRoles(state, cfRoles, user);
+}
+
+export function updateNewlyConnectedEndpoint(
+  state: ICurrentUserRolesState,
+  action: EndpointActionComplete
 ): ICurrentUserRolesState {
-  const cfRoles = propagateEndpointsAdminPermissions(state.cf, endpoints);
+  if (action.endpointType !== 'cf') {
+    return state;
+  }
+  const endpoint = action.endpoint as INewlyConnectedEndpointInfo;
+  const cfRoles = propagateEndpointsAdminPermissions(state.cf, [{
+    user: endpoint.user,
+    guid: action.guid
+  }]);
+  return finishCfRoles(state, cfRoles, action.endpoint.user);
+}
+
+function finishCfRoles(state: ICurrentUserRolesState, cfRoles: IAllCfRolesState, user?: SessionUser | EndpointUser) {
   const internalRoles = { ...state.internal };
   if (user) {
     internalRoles.scopes = user.scopes || [];
     const isAdmin = internalRoles.scopes.includes(ScopeStrings.STRATOS_ADMIN);
     internalRoles.isAdmin = isAdmin;
   }
+
   return {
     ...state,
     cf: cfRoles,
     internal: internalRoles
   };
 }
 
-function propagateEndpointsAdminPermissions(cfState: IAllCfRolesState, endpoints: SessionEndpoints): IAllCfRolesState {
-  return Object.values(endpoints.cf).reduce((state, endpoint) => {
+function propagateEndpointsAdminPermissions(
+  cfState: IAllCfRolesState,
+  endpoints: PartialEndpoint[]
+): IAllCfRolesState {
+  return Object.values(endpoints).reduce((state, endpoint) => {
     return {
       ...state,
       [endpoint.guid]: propagateEndpointAdminPermissions(state[endpoint.guid], endpoint)
     };
   }, { ...cfState });
 }
 
-function propagateEndpointAdminPermissions(state: ICfRolesState = getDefaultEndpointRoles(), endpoint: SessionDataEndpoint) {
+function propagateEndpointAdminPermissions(state: ICfRolesState = getDefaultEndpointRoles(), endpoint: PartialEndpoint) {
   const scopes = endpoint.user ? endpoint.user.scopes : [];
   const global = getEndpointRoles(scopes, state.global);
   return {

diff --git a/...ontend/app/store/reducers/current-user-roles-reducer/current-user-roles-clear.reducers.ts b/...ontend/app/store/reducers/current-user-roles-reducer/current-user-roles-clear.reducers.ts
@@ -34,6 +34,8 @@ export function addEndpoint(state: ICurrentUserRolesState, action: EndpointActio
   };
 }
 
+
+
 export function removeSpaceRoles(state: ICurrentUserRolesState, action: APISuccessOrFailedAction) {
   const { endpointGuid, guid } = action.apiAction;
   const removedOrgOrSpaceState = removeOrgOrSpaceRoles(state, endpointGuid, guid, 'spaces');

diff --git a/src/frontend/app/store/reducers/current-user-roles-reducer/current-user-roles.reducer.ts b/src/frontend/app/store/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
@@ -4,14 +4,15 @@ import { GET_CURRENT_USER_RELATION_SUCCESS, GetCurrentUserRelationsComplete } fr
 import { ICurrentUserRolesState } from '../../types/current-user-roles.types';
 import { currentUserBaseCFRolesReducer } from './current-user-base-cf-role.reducer';
 import { VerifiedSession, SESSION_VERIFIED } from '../../actions/auth.actions';
-import { roleInfoFromSessionReducer } from './current-user-role-session.reducer';
+import { roleInfoFromSessionReducer, updateNewlyConnectedEndpoint } from './current-user-role-session.reducer';
 import {
   DISCONNECT_ENDPOINTS_SUCCESS,
   DisconnectEndpoint,
   UNREGISTER_ENDPOINTS_SUCCESS,
   REGISTER_ENDPOINTS_SUCCESS,
   RegisterEndpoint,
-  EndpointActionComplete
+  EndpointActionComplete,
+  CONNECT_ENDPOINTS_SUCCESS
 } from '../../actions/endpoint.actions';
 import { removeEndpointRoles, addEndpoint, removeOrgRoles, removeSpaceRoles } from './current-user-roles-clear.reducers';
 import { DELETE_ORGANIZATION_SUCCESS } from '../../actions/organization.actions';
@@ -34,10 +35,11 @@ export function currentUserRolesReducer(state: ICurrentUserRolesState = defaultS
         cf: currentUserBaseCFRolesReducer(state.cf, action as GetCurrentUserRelationsComplete)
       };
     case SESSION_VERIFIED:
-      const verifiedSession = action as VerifiedSession;
-      return roleInfoFromSessionReducer(state, verifiedSession.sessionData.user, verifiedSession.sessionData.endpoints);
+      return roleInfoFromSessionReducer(state, action as VerifiedSession);
     case REGISTER_ENDPOINTS_SUCCESS:
       return addEndpoint(state, action as EndpointActionComplete);
+    case CONNECT_ENDPOINTS_SUCCESS:
+      return updateNewlyConnectedEndpoint(state, action as EndpointActionComplete);
     case DISCONNECT_ENDPOINTS_SUCCESS:
     case UNREGISTER_ENDPOINTS_SUCCESS:
       return removeEndpointRoles(state, action as EndpointActionComplete);

diff --git a/src/frontend/app/store/types/auth.types.ts b/src/frontend/app/store/types/auth.types.ts
@@ -19,9 +19,10 @@ export interface SessionUser {
   scopes: ScopeStrings[];
 }
 export interface SessionEndpoints {
-  [type: string]: {
-    [guid: string]: SessionDataEndpoint
-  };
+  [type: string]: SessionEndpoint;
+}
+export interface SessionEndpoint {
+  [guid: string]: SessionDataEndpoint;
 }
 export interface SessionData {
   endpoints?: SessionEndpoints;

diff --git a/src/frontend/app/store/types/endpoint.types.ts b/src/frontend/app/store/types/endpoint.types.ts
@@ -1,5 +1,6 @@
 import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
 import { endpointSchemaKey } from '../helpers/entity-factory';
+import { ScopeStrings } from '../../core/current-user-permissions.config';
 
 export interface INewlyConnectedEndpointInfo {
   account: string;
@@ -55,6 +56,7 @@ export interface EndpointUser {
   guid: string;
   name: string;
   admin: boolean;
+  scopes?: ScopeStrings[];
 }
 
 export interface EndpointState {
-Original file line number
+Diff line change
@@ Expand Up @@
       };
     }
     export function removeSpaceRoles(state: ICurrentUserRolesState, action: APISuccessOrFailedAction) {
       const { endpointGuid, guid } = action.apiAction;
       const removedOrgOrSpaceState = removeOrgOrSpaceRoles(state, endpointGuid, guid, 'spaces');
@@ Expand Down @@