Added client name in /iam/api/access-tokens

indigo-iam · Feb 2, 2022 · bfc3bfc · bfc3bfc
1 parent 3a7d27a
commit bfc3bfc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/tokens/converter/TokensConverter.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/tokens/converter/TokensConverter.java
@@ -89,6 +89,7 @@ private ClientRef buildClientRef(String clientId) {
     return ClientRef.builder()
         .id(cd.getId())
         .clientId(cd.getClientId())
+        .clientName(cd.getClientName())
         .contacts(cd.getContacts())
         .ref(cd.getClientUri())
         .build();

diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/tokens/model/ClientRef.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/tokens/model/ClientRef.java
@@ -26,15 +26,17 @@ public class ClientRef {
 
   private Long id;
   private String clientId;
+  private String clientName;
   private Set<String> contacts;
   private String ref = null;
 
   @JsonCreator
-  public ClientRef(@JsonProperty("id") Long id, @JsonProperty("clientId") String clientId,
+  public ClientRef(@JsonProperty("id") Long id, @JsonProperty("clientId") String clientId, @JsonProperty("clientName") String clientName,
       @JsonProperty("contacts") Set<String> contacts, @JsonProperty("$ref") String ref) {
 
     this.id = id;
     this.clientId = clientId;
+    this.clientName = clientName;
     this.contacts = contacts;
     this.ref = ref;
   }
@@ -43,6 +45,7 @@ public ClientRef(Builder builder) {
 
     this.id = builder.id;
     this.clientId = builder.clientId;
+    this.clientName = builder.clientName;
     this.contacts = builder.contacts;
     this.ref = builder.ref;
   }
@@ -58,6 +61,12 @@ public String getClientId() {
 
     return clientId;
   }
+
+  @JsonProperty("clientName")
+  public String getClientName() {
+
+    return clientName;
+  }
 
   @JsonProperty("contacts")
   public Set<String> getContacts() {
@@ -74,7 +83,7 @@ public String getRef() {
   @Override
   public String toString() {
 
-    return "Client [id=" + id + ", clientId=" + clientId + ", contacts=" + contacts
+    return "Client [id=" + id + ", clientId=" + clientId + ", clientName=" + clientName + ", contacts=" + contacts
         + ", ref=" + ref + "]";
   }
 
@@ -87,6 +96,7 @@ public static class Builder {
 
     private Long id;
     private String clientId;
+    private String clientName;
     private Set<String> contacts;
     private String ref;
 
@@ -99,6 +109,11 @@ public Builder clientId(String clientId) {
       this.clientId = clientId;
       return this;
     }
+
+    public Builder clientName(String clientName) {
+      this.clientName = clientName;
+      return this;
+    }
 
     public Builder contacts(Set<String> contacts) {
       this.contacts = contacts;

diff --git a/...rces/iam/apps/dashboard-app/components/tokens/accesslist/tokens.accesslist.component.html b/...rces/iam/apps/dashboard-app/components/tokens/accesslist/tokens.accesslist.component.html
@@ -80,7 +80,9 @@
                             <h5>{{$index + $ctrl.currentOffset}}</h5>
                         </td>
                         <td class="align-middle">
-                            <h5><a ui-sref="client({id: token.client.clientId})">{{token.client.clientId}}</a></h5>
+                            <a ui-sref="client({id: token.client.clientId})">{{token.client.clientName}}</a>
+                            <br/>
+                            <small>{{token.client.clientId}}</small>
                         </td>
                         <td class="align-middle" ng-if="token.user != null">
                             <a ui-sref="user({id: token.user.id})">{{token.user.userName}}</a>