Only fixed user attribute retrieval

keycloak · Jun 23, 2022 · d1fcbc0 · d1fcbc0
1 parent 3d2c3fb
commit d1fcbc0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java
@@ -204,7 +204,7 @@ public void removeAttribute(String name) {
     @Override
     public String getFirstAttribute(String name) {
         if (updated != null) return updated.getFirstAttribute(name);
-        return cached.getAttributes(modelSupplier).getFirst(name);
+        return cached.getFirstAttribute(name, modelSupplier);
     }
 
     @Override

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java
@@ -42,6 +42,8 @@ public class CachedUser extends AbstractExtendableRevisioned implements InRealm
 
     private final String realm;
     private final String username;
+    private final String firstName;
+    private final String lastName;
     private final Long createdTimestamp;
     private final String email;
     private final boolean emailVerified;
@@ -59,6 +61,8 @@ public CachedUser(Long revision, RealmModel realm, UserModel user, int notBefore
         super(revision, user.getId());
         this.realm = realm.getId();
         this.username = user.getUsername();
+        this.firstName = user.getFirstName();
+        this.lastName = user.getLastName();
         this.createdTimestamp = user.getCreatedTimestamp();
         this.email = user.getEmail();
         this.emailVerified = user.isEmailVerified();
@@ -81,6 +85,25 @@ public String getUsername() {
         return username;
     }
 
+    public String getFirstName() { return firstName; }
+
+    public String getLastName() { return lastName; }
+
+    public String getFirstAttribute(String name, Supplier<UserModel> userModel) {
+        switch(name) {
+            case UserModel.FIRST_NAME:
+                return this.getFirstName();
+            case UserModel.LAST_NAME:
+                return this.getLastName();
+            case UserModel.USERNAME:
+                return this.getUsername();
+            case UserModel.EMAIL:
+                return this.getEmail();
+            default:
+                return this.attributes.get(userModel).getFirst(name);
+        }
+    }
+
     public Long getCreatedTimestamp() {
         return createdTimestamp;
     }