Change creator visibility and fix permission bug (#4876)

Signed-off-by: Thomas Quandt <[email protected]>

Author: thquad

src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts

@@ -140,9 +140,10 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
       this.sessionService.userEndpointsEnabled(),
       this.sessionService.userEndpointsNotDisabled(),
       this.currentUserPermissionsService.can(StratosCurrentUserPermissions.EDIT_ADMIN_ENDPOINT),
+      this.currentUserPermissionsService.can(StratosCurrentUserPermissions.EDIT_ENDPOINT)
     ]).pipe(
-      map(([userEndpointsEnabled, userEndpointsNotDisabled, isAdmin]) => {
-        return userEndpointsEnabled || (userEndpointsNotDisabled && isAdmin);
+      map(([userEndpointsEnabled, userEndpointsNotDisabled, isAdmin, isEndpointAdmin]) => {
+        return (userEndpointsEnabled && (isAdmin || isEndpointAdmin)) || (userEndpointsNotDisabled && isAdmin);
       })
     );
   }

src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts

@@ -183,7 +183,7 @@ export class EndpointListHelper {
             row$
           ]).pipe(
             map(([userEndpointsEnabled, isAdmin, isEndpointAdmin, row]) => {
-              if (!userEndpointsEnabled || row.creator.admin) {
+              if (!userEndpointsEnabled || row.creator.system) {
                 return isAdmin;
               } else {
                 return isEndpointAdmin || isAdmin;
@@ -207,7 +207,7 @@ export class EndpointListHelper {
             row$
           ]).pipe(
             map(([userEndpointsEnabled, isAdmin, isEndpointAdmin, row]) => {
-              if (!userEndpointsEnabled || row.creator.admin) {
+              if (!userEndpointsEnabled || row.creator.system) {
                 return isAdmin;
               } else {
                 return isEndpointAdmin || isAdmin;

src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts

@@ -130,9 +130,11 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
       sessionService.userEndpointsEnabled(),
       sessionService.userEndpointsNotDisabled(),
       currentUserPermissionsService.can(StratosCurrentUserPermissions.EDIT_ADMIN_ENDPOINT),
+      currentUserPermissionsService.can(StratosCurrentUserPermissions.EDIT_ENDPOINT)
     ]).pipe(
-      map(([userEndpointsEnabled, userEndpointsNotDisabled, isAdmin]) => {
-        return userEndpointsEnabled || (userEndpointsNotDisabled && isAdmin);
+      first(),
+      map(([userEndpointsEnabled, userEndpointsNotDisabled, isAdmin, isEndpointAdmin]) => {
+        return (userEndpointsEnabled && (isAdmin || isEndpointAdmin)) || (userEndpointsNotDisabled && isAdmin);
       })
     ).subscribe(enabled => {
       if (enabled) {

src/jetstream/cnsi.go

@@ -203,7 +203,6 @@ func (p *portalProxy) DoRegisterEndpoint(cnsiName string, apiEndpoint string, sk
 	newCNSI.SSOAllowed = ssoAllowed
 	newCNSI.SubType = subType
 
-	// admins currently can't create user endpoints
 	if p.GetConfig().UserEndpointsEnabled != config.UserEndpointsConfigEnum.Disabled && (!isAdmin || !createSystemEndpoint) {
 		newCNSI.Creator = userId
 	}

src/jetstream/info.go

@@ -102,7 +102,7 @@ func (p *portalProxy) getInfo(c echo.Context) (*interfaces.Info, error) {
 
 		// set the creator preemptively as admin, if no id is found
 		endpoint.Creator = &interfaces.CreatorInfo{
-			Name:   "system",
+			Name:   "Global Endpoint",
 			Admin:  false,
 			System: true,
 		}