From f20c94e0184de4f05e5ae2ef7562a99b377fb005 Mon Sep 17 00:00:00 2001
From: Thomas Quandt <thquad@gmail.com>
Date: Mon, 1 Feb 2021 13:27:25 +0100
Subject: [PATCH] Add username to the creator in the front-end (#4753)

Signed-off-by: Thomas Quandt <thquad@gmail.com>
---
 .../list/list-types/endpoint/base-endpoints-data-source.ts   | 5 ++++-
 .../endpoint/endpoint-card/endpoint-card.component.html      | 2 +-
 src/frontend/packages/store/src/types/endpoint.types.ts      | 1 +
 src/jetstream/info.go                                        | 4 ++++
 src/jetstream/repository/interfaces/structs.go               | 3 ++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
index 0dbfe05076..7ed25eead8 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
@@ -123,7 +123,10 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
         system_shared_token: false,
         metricsAvailable: false,
         sso_allowed: false,
-        creator: {admin:false}
+        creator: {
+          name:'',
+          admin:false
+        }
       }),
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
index a432179f91..9497b4da2a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
@@ -47,7 +47,7 @@
   <app-meta-card-item *ngIf="enableUserEndpoints$ | async">
     <app-meta-card-key>Created by</app-meta-card-key>
     <app-meta-card-value>
-      <div>{{ row.creator.admin ? "Admin" : "User" }}</div>
+      <div>{{ row.creator.name }}</div>
     </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item [hidden]="!hasDetails">
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index 9e09cc9a78..68a77ed2a3 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -66,6 +66,7 @@ export interface EndpointUser {
 
 // Metadata for the user who created an endpoint
 export interface CreatorInfo {
+  name: string;
   admin: boolean;
 }
 
diff --git a/src/jetstream/info.go b/src/jetstream/info.go
index b3bac96749..f29380bd61 100644
--- a/src/jetstream/info.go
+++ b/src/jetstream/info.go
@@ -102,6 +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:  "admin",
 			Admin: true,
 		}
 
@@ -110,6 +111,9 @@ func (p *portalProxy) getInfo(c echo.Context) (*interfaces.Info, error) {
 			u, err := p.StratosAuthService.GetUser(cnsi.Creator)
 			if err == nil {
 				endpoint.Creator.Admin = u.Admin
+				if u.Admin == false {
+					endpoint.Creator.Name = u.Name
+				}
 			}
 		}
 
diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index 252d6db68f..982617dc71 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -195,7 +195,8 @@ type ConnectedUser struct {
 
 // CreatorInfo - additional information about the user who created an endpoint
 type CreatorInfo struct {
-	Admin bool `json:"admin"`
+	Name  string `json:"name"`
+	Admin bool   `json:"admin"`
 }
 
 type JWTUserTokenInfo struct {