Moved rememberMe, usernameUsed fields from AccessCode to UserSessions. Change AccessCode to have a single action instead of a list of required actions, also used action for codes that needs user to grant permissions first. Finally removed expiration time on access code and use timestamp directly

core/src/main/java/org/keycloak/representations/AccessCode.java

@@ -11,15 +11,11 @@ public class AccessCode {
     protected String id;
     protected String clientId;
     protected String userId;
-    protected String usernameUsed;
     protected String state;
     protected String sessionState;
     protected String redirectUri;
-    protected boolean rememberMe;
-    protected String authMethod;
     protected int timestamp;
-    protected int expiration;
-    protected Set<String> requiredActions;
+    protected Action action;
     protected Set<String> requestedRoles;
 
     public String getId() {
@@ -70,30 +66,6 @@ public class AccessCode {
         this.redirectUri = redirectUri;
     }
 
-    public boolean isRememberMe() {
-        return rememberMe;
-    }
-
-    public void setRememberMe(boolean rememberMe) {
-        this.rememberMe = rememberMe;
-    }
-
-    public String getAuthMethod() {
-        return authMethod;
-    }
-
-    public void setAuthMethod(String authMethod) {
-        this.authMethod = authMethod;
-    }
-
-    public int getExpiration() {
-        return expiration;
-    }
-
-    public void setExpiration(int expiration) {
-        this.expiration = expiration;
-    }
-
     public int getTimestamp() {
         return timestamp;
     }
@@ -102,20 +74,12 @@ public class AccessCode {
         this.timestamp = timestamp;
     }
 
-    public Set<String> getRequiredActions() {
-        return requiredActions;
+    public Action getAction() {
+        return action;
     }
 
-    public void setRequiredActions(Set<String> requiredActions) {
-        this.requiredActions = requiredActions;
-    }
-
-    public String getUsernameUsed() {
-        return usernameUsed;
-    }
-
-    public void setUsernameUsed(String usernameUsed) {
-        this.usernameUsed = usernameUsed;
+    public void setAction(Action action) {
+        this.action = action;
     }
 
     public Set<String> getRequestedRoles() {
@@ -125,4 +89,13 @@ public class AccessCode {
     public void setRequestedRoles(Set<String> requestedRoles) {
         this.requestedRoles = requestedRoles;
     }
+
+    public static enum Action {
+        OAUTH_GRANT,
+        VERIFY_EMAIL,
+        UPDATE_PROFILE,
+        CONFIGURE_TOTP,
+        UPDATE_PASSWORD
+    }
+
 }