Allow invites with user-endpoints (#4876)

Signed-off-by: Thomas Quandt <thquad@gmail.com>
cloudfoundry · Apr 16, 2021 · f3d0e39 · f3d0e39
1 parent 59a1daa
commit f3d0e39
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 29 deletions.
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/user-invite.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/user-invite.service.ts
@@ -150,8 +150,7 @@ export class UserInviteService {
     ]).pipe(
       map(([cf, auth, endpoint]) =>
         cf.global.isAdmin &&
-        auth.sessionData['plugin-config'] && auth.sessionData['plugin-config'].userInvitationsEnabled === 'true' &&
-        endpoint.entity.creator.admin)
+        auth.sessionData['plugin-config'] && auth.sessionData['plugin-config'].userInvitationsEnabled === 'true')
     );
   }
 

diff --git a/src/jetstream/plugins/userinvite/admin.go b/src/jetstream/plugins/userinvite/admin.go
@@ -79,11 +79,6 @@ func (invite *UserInvite) configure(c echo.Context) error {
 		)
 	}
 
-	_, err := invite.checkEndpointCreator(cfGUID, c)
-	if err != nil {
-		return err
-	}
-
 	uaaRecord, _, err := invite.RefreshToken(cfGUID, clientID, clientSecret)
 	if err != nil {
 		return err

diff --git a/src/jetstream/plugins/userinvite/auth.go b/src/jetstream/plugins/userinvite/auth.go
@@ -119,28 +119,6 @@ func (invite *UserInvite) refreshToken(clientID, clientSecret string, endpoint i
 	return &uaaResponse, tokenRecord, nil
 }
 
-// Check that there is an endpoint with the specified ID and if the creator is an admin
-func (invite *UserInvite) checkEndpointCreator(cfGUID string, c echo.Context) (interfaces.CNSIRecord, error) {
-	endpoint, err := invite.portalProxy.GetCNSIRecord(cfGUID)
-	if err != nil {
-		return interfaces.CNSIRecord{}, interfaces.NewHTTPShadowError(
-			http.StatusBadRequest,
-			"Can not find enpoint",
-			"Can not find enpoint: %s", cfGUID,
-		)
-	}
-
-	if len(endpoint.Creator) != 0 {
-		return interfaces.CNSIRecord{}, interfaces.NewHTTPShadowError(
-			http.StatusBadRequest,
-			"Not an admin endpoint",
-			"Not an admin endpoint: %s", cfGUID,
-		)
-	}
-
-	return endpoint, nil
-}
-
 func (invite *UserInvite) checkEndpoint(cfGUID string) (interfaces.CNSIRecord, error) {
 	// Check that there is an endpoint with the specified ID and that it is a Cloud Foundry endpoint
 	endpoint, err := invite.portalProxy.GetCNSIRecord(cfGUID)