Added few fields in RefreshToken and Session and modified minor changes

Author: tanya732

src/main/java/com/auth0/client/mgmt/UsersEntity.java

@@ -798,8 +798,8 @@ public Request<AuthenticationMethod> updateAuthenticationMethodById(String userI
      * @param filter an optional pagination filter
      * @return a Request to execute
      */
-    public Request<RefreshTokensPage> listRefreshTokens(String userId, CheckpointPaginationFilter filter) {
-        Asserts.assertNotNull(userId, "user id");
+    public Request<RefreshTokensPage> listRefreshTokens(String userId, PageFilter filter) {
+        Asserts.assertNotNull(userId, "user ID");
         HttpUrl.Builder builder = baseUrl
             .newBuilder()
             .addPathSegments("api/v2/users")
@@ -847,8 +847,8 @@ public Request<Void> deleteRefreshTokens(String userId) {
      * @param filter an optional pagination filter
      * @return a Request to execute
      */
-    public Request<SessionsPage> listSessions(String userId, CheckpointPaginationFilter filter) {
-        Asserts.assertNotNull(userId, "user id");
+    public Request<SessionsPage> listSessions(String userId, PageFilter filter) {
+        Asserts.assertNotNull(userId, "user ID");
         HttpUrl.Builder builder = baseUrl
             .newBuilder()
             .addPathSegments("api/v2/users")

src/main/java/com/auth0/json/mgmt/users/refreshtokens/Device.java

@@ -0,0 +1,64 @@
+package com.auth0.json.mgmt.users.refreshtokens;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Device {
+    @JsonProperty("initial_ip")
+    private String initialIp;
+    @JsonProperty("initial_asn")
+    private String initialAsn;
+    @JsonProperty("initial_user_agent")
+    private String initialUserAgent;
+    @JsonProperty("last_ip")
+    private String lastIp;
+    @JsonProperty("last_asn")
+    private String lastAsn;
+    @JsonProperty("last_user_agent")
+    private String lastUserAgent;
+
+    /**
+     * @return First IP address associated with this session
+     */
+    public String getInitialIp() {
+        return initialIp;
+    }
+
+    /**
+     * @return First autonomous system number associated with this session
+     */
+    public String getInitialAsn() {
+        return initialAsn;
+    }
+
+    /**
+     * @return First user agent associated with this session
+     */
+    public String getInitialUserAgent() {
+        return initialUserAgent;
+    }
+
+    /**
+     * @return Last IP address from which this user logged in
+     */
+    public String getLastIp() {
+        return lastIp;
+    }
+
+    /**
+     * @return Last autonomous system number from which this user logged in
+     */
+    public String getLastAsn() {
+        return lastAsn;
+    }
+
+    /**
+     * @return Last user agent of the device from which this user logged in
+     */
+    public String getLastUserAgent() {
+        return lastUserAgent;
+    }
+}

src/main/java/com/auth0/json/mgmt/users/refreshtokens/RefreshToken.java

@@ -20,6 +20,8 @@ public class RefreshToken {
     private Date idleExpiresAt;
     @JsonProperty("expires_at")
     private Date expiresAt;
+    @JsonProperty("device")
+    private Device device;
     @JsonProperty("client_id")
     private String clientId;
     @JsonProperty("session_id")
@@ -28,6 +30,8 @@ public class RefreshToken {
     private Boolean rotating;
     @JsonProperty("resource_servers")
     private List<ResourceServer> resourceServers;
+    @JsonProperty("last_exchanged_at")
+    private Date lastExchangedAt;
 
     /**
      * @return The ID of the refresh token
@@ -66,6 +70,13 @@ public Date getExpiresAt() {
         return expiresAt;
     }
 
+    /**
+     * @return Device information
+     */
+    public Device getDevice() {
+        return device;
+    }
+
     /**
      * @return ID of the client application granted with this refresh token
      */
@@ -94,4 +105,11 @@ public Boolean isRotating() {
     public List<ResourceServer> getResourceServers() {
         return resourceServers;
     }
+
+    /**
+     * @return The date and time when the refresh token was last exchanged
+     */
+    public Date getLastExchangedAt() {
+        return lastExchangedAt;
+    }
 }

src/main/java/com/auth0/json/mgmt/users/refreshtokens/RefreshTokensPage.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 /**
- * This does not extend com.auth0.json.mgmt.Page<RefreshToken> because the URL only supports "next" and "take" pagination.
+ * Class that represents a page of Refresh Tokens.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/com/auth0/json/mgmt/users/sessions/Device.java

@@ -7,6 +7,8 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Device {
+    @JsonProperty("initial_user_agent")
+    private String initialUserAgent;
     @JsonProperty("initial_ip")
     private String initialIP;
     @JsonProperty("initial_asn")
@@ -18,6 +20,13 @@ public class Device {
     @JsonProperty("last_asn")
     private String lastASN;
 
+    /**
+     * @return First user agent associated with this session
+     */
+    public String getInitialUserAgent() {
+        return initialUserAgent;
+    }
+
     /**
      * @return First IP address associated with this session
      */

src/main/java/com/auth0/json/mgmt/users/sessions/Session.java

@@ -24,6 +24,8 @@ public class Session {
     private Date idleExpiresAt;
     @JsonProperty("expires_at")
     private Date expiresAt;
+    @JsonProperty("last_interacted_at")
+    private Date lastInteractedAt;
     @JsonProperty("device")
     private Device device;
     @JsonProperty("clients")

src/main/java/com/auth0/json/mgmt/users/sessions/SessionsPage.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 /**
- * This does not extend com.auth0.json.mgmt.Page<RefreshToken> because the URL only supports "next" and "take" pagination.
+ * Class that represents a given Page of Sessions. Related to the {@link com.auth0.client.mgmt.UsersEntity} entity.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)

src/test/java/com/auth0/client/mgmt/UsersEntityTest.java

@@ -5,6 +5,7 @@
 import com.auth0.client.mgmt.filter.PageFilter;
 import com.auth0.client.mgmt.filter.UserFilter;
 import com.auth0.client.mgmt.filter.CheckpointPaginationFilter;
+import com.auth0.json.mgmt.Page;
 import com.auth0.json.mgmt.guardian.Enrollment;
 import com.auth0.json.mgmt.logevents.LogEvent;
 import com.auth0.json.mgmt.logevents.LogEventsPage;
@@ -1371,7 +1372,7 @@ public void shouldListRefreshTokensWithoutFilter() throws Exception {
 
     @Test
     public void shouldListRefreshTokensWithPage() throws Exception {
-        CheckpointPaginationFilter filter = new CheckpointPaginationFilter().withFrom("tokenId2").withTake(5);
+        PageFilter filter = new PageFilter().withFrom("tokenId2").withTake(5);
         Request<RefreshTokensPage> request = api.users().listRefreshTokens("1", filter);
         assertThat(request, is(notNullValue()));
 
@@ -1391,7 +1392,7 @@ public void shouldListRefreshTokensWithPage() throws Exception {
 
     @Test
     public void shouldListRefreshTokensWithTotal() throws Exception {
-        CheckpointPaginationFilter filter = new CheckpointPaginationFilter().withTotals(true);
+        PageFilter filter = new PageFilter().withTotals(true);
         Request<RefreshTokensPage> request = api.users().listRefreshTokens("1", filter);
         assertThat(request, is(notNullValue()));
 
@@ -1448,7 +1449,7 @@ public void shouldListSessionsWithoutFilter() throws Exception {
 
     @Test
     public void shouldListSessionsWithPage() throws Exception {
-        CheckpointPaginationFilter filter = new CheckpointPaginationFilter().withFrom("sessionId3").withTake(9);
+        PageFilter filter = new PageFilter().withFrom("sessionId3").withTake(9);
         Request<SessionsPage> request = api.users().listSessions("1", filter);
         assertThat(request, is(notNullValue()));
 
@@ -1468,7 +1469,7 @@ public void shouldListSessionsWithPage() throws Exception {
 
     @Test
     public void shouldListSessionsWithTotal() throws Exception {
-        CheckpointPaginationFilter filter = new CheckpointPaginationFilter().withTotals(true);
+        PageFilter filter = new PageFilter().withTotals(true);
         Request<SessionsPage> request = api.users().listSessions("1", filter);
         assertThat(request, is(notNullValue()));