Added owner of token for super user view

Author: oharsta

client/src/locale/en.js

@@ -402,7 +402,8 @@
         createFlash: "API token has been created",
         submit: "Submit",
         required: "The description is required for an API token",
-        userTokens: "Your personal API tokens"
+        userTokens: "Your personal API tokens",
+        owner: "Owner"
     },
     tooltips: {
         userIcon: "User {{name}} provisioned at {{createdAt}} with last activity on {{lastActivity}}",

client/src/locale/nl.js

@@ -402,7 +402,8 @@ const nl = {
         createFlash: "API-token is aangemaakt",
         submit: "Opslaan",
         required: "Een omschrijving is verplicht voor een API-token",
-        userTokens: "Je persoonlijke API-tokens"
+        userTokens: "Je persoonlijke API-tokens",
+        owner: "User"
     },
     tooltips: {
         userIcon: "Gebruiker {{name}} geprovisiond op {{createdAt}}, laatst actief op {{lastActivity}}",

client/src/tabs/Tokens.js

@@ -149,6 +149,12 @@ export const Tokens = () => {
             header: I18n.t("tokens.description"),
             mapper: token => <span className={"cut-of-lines"}>{token.description}</span>
         },
+        user.superUser ? {
+            key: "owner",
+            class: "owner",
+            header: I18n.t("tokens.owner"),
+            mapper: token => token.owner || "-"
+        } : null,
         user.superUser ?
             {
                 key: "superUserToken",

client/src/tabs/Tokens.scss

@@ -7,17 +7,22 @@ div.mod-tokens {
         thead {
             th {
                 &.secret, &.hashed_token {
-                    width: 20%;
+                    width: 15%;
                 }
 
                 &.description {
-                    width: 35%;
+                    width: 25%;
 
                     &.small {
-                        width: 25%;
+                        width: 20%;
                     }
                 }
 
+                &.owner {
+                    width: 12%;
+
+                }
+
                 &.superUserToken {
                     width: 15%;
                     text-align: center;

server/src/main/java/invite/model/APIToken.java

@@ -40,6 +40,7 @@ public class APIToken implements Serializable {
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "owner_id")
+    @JsonIgnore
     private User owner;
 
 
@@ -57,4 +58,9 @@ public APIToken(String hashedValue, String description, User owner) {
         this.owner = owner;
         this.createdAt = Instant.now();
     }
+
+    @JsonProperty
+    public String owner() {
+        return owner != null ? owner.getName() : null;
+    }
 }

server/src/main/java/invite/repository/APITokenRepository.java

@@ -2,6 +2,7 @@
 
 import invite.model.APIToken;
 import invite.model.User;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -15,5 +16,10 @@ public interface APITokenRepository extends JpaRepository<APIToken, Long> {
 
     List<APIToken> findByOwner(User user);
 
+    @EntityGraph(value = "findAll", type = EntityGraph.EntityGraphType.LOAD,
+            attributePaths = {"owner"})
+    @Override
+    List<APIToken> findAll();
+
     Optional<APIToken> findByHashedValue(String hashedValue);
 }