Fixed: ParseUser.getCurrentUser() returns a non authenticated user when

local datastore is used

Author: Lukas Koebis

Parse/src/main/java/com/parse/ParseUser.java

@@ -501,12 +501,15 @@ public Task<Void> then(Task<Void> task) throws Exception {
   }
 
   @Override
-  void setState(ParseObject.State newState) {
-    // Avoid overwriting auth info
-    State.Builder builder = new State.Builder(getState());
-    builder.apply(newState);
-
-    super.setState(builder.build());
+  /* package */ void setState(ParseObject.State newState) {
+    // Avoid clearing sessionToken when updating the current user's State via ParseQuery result
+    if (isCurrentUser() && getSessionToken() != null
+            && newState.get("sessionToken") == null) {
+      super.setState(newState.newBuilder().put("sessionToken", getSessionToken()).build());
+    }
+    else {
+      super.setState(newState);
+    }
   }
 
   @Override

Parse/src/test/java/com/parse/ParseUserTest.java

@@ -1059,6 +1059,25 @@ public void testUpgradeToRevocableSessionAsync() throws Exception {
     verify(currentUserController, times(1)).setAsync(user);
   }
 
+  @Test
+  public void testDontOverwriteSessionTokenForCurrentUser() throws Exception {
+    ParseUser.State sessionTokenState = new ParseUser.State.Builder()
+            .sessionToken("sessionToken")
+            .build();
+    ParseUser.State emptyState = new ParseUser.State.Builder().build();
+
+    ParseUser user = ParseObject.from(sessionTokenState);
+    user.setIsCurrentUser(true);
+    assertEquals(user.getSessionToken(), "sessionToken");
+
+    user.setState(emptyState);
+    assertEquals(user.getSessionToken(), "sessionToken");
+
+    user.setIsCurrentUser(false);
+    user.setState(emptyState);
+    assertNull(user.getSessionToken());
+  }
+
   //endregion
 
   //region testUnlinkFromAsync