add lastRefreshTimestamp

Author: rsgowman

src/main/java/com/google/firebase/auth/UserMetadata.java

@@ -23,14 +23,16 @@ public class UserMetadata {
 
   private final long creationTimestamp;
   private final long lastSignInTimestamp;
+  private final long lastRefreshTimestamp;
 
   public UserMetadata(long creationTimestamp) {
-    this(creationTimestamp, 0L);
+    this(creationTimestamp, 0L, 0L);
   }
 
-  public UserMetadata(long creationTimestamp, long lastSignInTimestamp) {
+  public UserMetadata(long creationTimestamp, long lastSignInTimestamp, long lastRefreshTimestamp) {
     this.creationTimestamp = creationTimestamp;
     this.lastSignInTimestamp = lastSignInTimestamp;
+    this.lastRefreshTimestamp = lastRefreshTimestamp;
   }
 
   /**
@@ -50,4 +52,13 @@ public long getCreationTimestamp() {
   public long getLastSignInTimestamp() {
     return lastSignInTimestamp;
   }
+
+  /**
+   * Returns the time at which the user was last active (ID token refreshed).
+   * 
+   * @return Milliseconds since epoch timestamp, or 0 if the user was never active.
+   */
+  public long getLastRefreshTimestamp() {
+    return lastRefreshTimestamp;
+  }
 }

src/main/java/com/google/firebase/auth/UserRecord.java

@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.json.JsonFactory;
+import com.google.api.client.util.DateTime;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -80,7 +81,15 @@ public class UserRecord implements UserInfo {
       }
     }
     this.tokensValidAfterTimestamp = response.getValidSince() * 1000;
-    this.userMetadata = new UserMetadata(response.getCreatedAt(), response.getLastLoginAt());
+
+    String lastRefreshAtRfc3339 = response.getLastRefreshAt();
+    long lastRefreshAtMillis = 0;
+    if (lastRefreshAtRfc3339 != null && !lastRefreshAtRfc3339.isEmpty()) {
+      lastRefreshAtMillis = DateTime.parseRfc3339(lastRefreshAtRfc3339).getValue();
+    }
+
+    this.userMetadata = new UserMetadata(
+        response.getCreatedAt(), response.getLastLoginAt(), lastRefreshAtMillis);
     this.customClaims = parseCustomClaims(response.getCustomClaims(), jsonFactory);
   }
 

src/main/java/com/google/firebase/auth/internal/GetAccountInfoResponse.java

@@ -73,6 +73,9 @@ public static class User {
     @Key("lastLoginAt")
     private long lastLoginAt;
 
+    @Key("lastRefreshAt")
+    private String lastRefreshAt;
+
     @Key("validSince")
     private long validSince;
 
@@ -119,6 +122,10 @@ public long getLastLoginAt() {
       return lastLoginAt;
     }
 
+    public String getLastRefreshAt() {
+      return lastRefreshAt;
+    }
+
     public long getValidSince() {
       return validSince;
     }

src/test/java/com/google/firebase/auth/FirebaseAuthIT.java

@@ -248,6 +248,35 @@ public void testUserLifecycle() throws Exception {
     }
   }
 
+  @Test
+  public void testLastRefreshTime() throws Exception {
+    RandomUser user = RandomUser.create();
+    UserRecord newUserRecord = auth.createUser(new CreateRequest()
+        .setUid(user.uid)
+        .setEmail(user.email)
+        .setEmailVerified(false)
+        .setPassword("password"));
+
+    try {
+      // New users should not have a lastRefreshTimestamp set.
+      assertEquals(0, newUserRecord.getUserMetadata().getLastRefreshTimestamp());
+
+      // Login to cause the lastRefreshTimestamp to be set.
+      signInWithPassword(newUserRecord.getEmail(), "password");
+
+      UserRecord userRecord = auth.getUser(newUserRecord.getUid());
+
+      // Ensure the lastRefreshTimestamp is approximately "now" (with a tollerance of 30 minutes).
+      long now = System.currentTimeMillis();
+      long tollerance = TimeUnit.MINUTES.toMillis(30);
+      long lastRefreshTimestamp = userRecord.getUserMetadata().getLastRefreshTimestamp();
+      assertTrue(now - tollerance <= lastRefreshTimestamp);
+      assertTrue(lastRefreshTimestamp <= now + tollerance);
+    } finally {
+      auth.deleteUser(newUserRecord.getUid());
+    }
+  }
+
   @Test
   public void testListUsers() throws Exception {
     final List<String> uids = new ArrayList<>();
@@ -637,7 +666,7 @@ private String signInWithPassword(String email, String password) throws IOExcept
     GenericUrl url = new GenericUrl(VERIFY_PASSWORD_URL + "?key="
         + IntegrationTestUtils.getApiKey());
     Map<String, Object> content = ImmutableMap.<String, Object>of(
-        "email", email, "password", password);
+        "email", email, "password", password, "returnSecureToken", true);
     HttpRequest request = transport.createRequestFactory().buildPostRequest(url,
         new JsonHttpContent(jsonFactory, content));
     request.setParser(new JsonObjectParser(jsonFactory));

src/test/java/com/google/firebase/auth/ImportUserRecordTest.java

@@ -62,7 +62,7 @@ public void testAllProperties() throws IOException {
         .setDisplayName("Test User")
         .setPhotoUrl("https://test.com/user.png")
         .setPhoneNumber("+1234567890")
-        .setUserMetadata(new UserMetadata(date.getTime(), date.getTime()))
+        .setUserMetadata(new UserMetadata(date.getTime(), date.getTime(), date.getTime()))
         .setDisabled(false)
         .setEmailVerified(true)
         .setPasswordHash("password".getBytes())