Merge pull request #18258 from vespa-engine/add_user_info

Additional fields to User - verified and lastLogin

1 files changed, 29 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java
index dcce25bda95..d3ed804e546 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/User.java
@@ -1,6 +1,7 @@
 // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.user;
 
+import java.time.LocalDate;
 import java.util.Objects;
 
 /**
@@ -9,17 +10,34 @@ import java.util.Objects;
 public class User {
 
     public static final String ATTRIBUTE_NAME = "vespa.user.attributes";
+    public static final LocalDate NO_DATE = LocalDate.EPOCH;
 
     private final String email;
     private final String name;
     private final String nickname;
     private final String picture;
+    private final boolean isVerified;
+    private final int loginCount;
+    private final LocalDate lastLogin;
 
     public User(String email, String name, String nickname, String picture) {
         this.email = Objects.requireNonNull(email);
         this.name = name;
         this.nickname = nickname;
         this.picture = picture;
+        this.isVerified = false;
+        this.loginCount = -1;
+        this.lastLogin = NO_DATE;
+    }
+
+    public User(String email, String name, String nickname, String picture, boolean isVerified, int loginCount, LocalDate lastLogin) {
+        this.email = Objects.requireNonNull(email);
+        this.name = name;
+        this.nickname = nickname;
+        this.picture = picture;
+        this.isVerified = isVerified;
+        this.loginCount = loginCount;
+        this.lastLogin = Objects.requireNonNull(lastLogin);
     }
 
     public String name() {
@@ -38,6 +56,12 @@ public class User {
         return picture;
     }
 
+    public LocalDate lastLogin() { return lastLogin; }
+
+    public boolean isVerified() { return isVerified; }
+
+    public int loginCount() { return loginCount; }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -46,11 +70,14 @@ public class User {
         return Objects.equals(name, user.name) &&
                 Objects.equals(email, user.email) &&
                 Objects.equals(nickname, user.nickname) &&
-                Objects.equals(picture, user.picture);
+                Objects.equals(picture, user.picture) &&
+                Objects.equals(lastLogin, user.lastLogin) &&
+                loginCount == user.loginCount &&
+                isVerified == user.isVerified;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, email, nickname, picture);
+        return Objects.hash(name, email, nickname, picture, lastLogin, loginCount, isVerified);
     }
 }