Fix signUp and linkWith with an anonymous user

Fixes integration test failures caused by #52

We strip anonymity in `signUp` and `linkWith` before calling into
`saveAsync` where there's a fork in logic for `isLazy()`. Since we
now determine `isLazy()` based off `objectId != null && ParseAnonymousUtils.isLinked(this)`,
`isLazy()` returns the incorrect value for these logic paths.

The solution is to get the value of `isLazy()` before stripping
anonymity and passing it through to `saveAsync()`.

Author: grantland

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

@@ -475,26 +475,28 @@ private void restoreAnonymity(Map<String, String> anonymousData) {
 
   @Override
   /* package */ Task<Void> saveAsync(String sessionToken, Task<Void> toAwait) {
-    synchronized (mutex) {
-      Task<Void> task;
-      if (isLazy()) {
-        task = resolveLazinessAsync(toAwait);
-      } else {
-        task = super.saveAsync(sessionToken, toAwait);
-      }
+    return saveAsync(sessionToken, isLazy(), toAwait);
+  }
 
-      return task.onSuccessTask(new Continuation<Void, Task<Void>>() {
-        @Override
-        public Task<Void> then(Task<Void> task) throws Exception {
-          // If the user is the currently logged in user, we persist all data to disk
-          if (isCurrentUser()) {
-            cleanUpAuthData();
-            return saveCurrentUserAsync(ParseUser.this);
-          }
-          return Task.forResult(null);
-        }
-      });
+  /* package for tests */ Task<Void> saveAsync(String sessionToken, boolean isLazy, Task<Void> toAwait) {
+    Task<Void> task;
+    if (isLazy) {
+      task = resolveLazinessAsync(toAwait);
+    } else {
+      task = super.saveAsync(sessionToken, toAwait);
     }
+
+    return task.onSuccessTask(new Continuation<Void, Task<Void>>() {
+      @Override
+      public Task<Void> then(Task<Void> task) throws Exception {
+        // If the user is the currently logged in user, we persist all data to disk
+        if (isCurrentUser()) {
+          cleanUpAuthData();
+          return saveCurrentUserAsync(ParseUser.this);
+        }
+        return Task.forResult(null);
+      }
+    });
   }
 
   @Override
@@ -622,6 +624,7 @@ public Task<Void> then(Task<Void> task) throws Exception {
         checkForChangesToMutableContainers();
         user.checkForChangesToMutableContainers();
 
+        boolean isLazy = user.isLazy();
         final String oldUsername = user.getUsername();
         final String oldPassword = user.getPassword();
         final Map<String, String> anonymousData = user.getAuthData(ParseAnonymousUtils.AUTH_TYPE);
@@ -631,7 +634,7 @@ public Task<Void> then(Task<Void> task) throws Exception {
         user.setPassword(getPassword());
         revert();
 
-        return user.saveAsync(sessionToken, toAwait).continueWithTask(new Continuation<Void, Task<Void>>() {
+        return user.saveAsync(sessionToken, isLazy, toAwait).continueWithTask(new Continuation<Void, Task<Void>>() {
           @Override
           public Task<Void> then(Task<Void> task) throws Exception {
             if (task.isCancelled() || task.isFaulted()) { // Error
@@ -1229,20 +1232,14 @@ private Task<Void> linkWithAsync(
       final Map<String, String> authData,
       final Task<Void> toAwait,
       final String sessionToken) {
-    final Map<String, String> oldAnonymousData = getAuthData(ParseAnonymousUtils.AUTH_TYPE);
     synchronized (mutex) {
+      final boolean isLazy = isLazy();
+      final Map<String, String> oldAnonymousData = getAuthData(ParseAnonymousUtils.AUTH_TYPE);
+
       stripAnonymity();
       putAuthData(authType, authData);
 
-      // TODO(grantland): Should we really be getting the current user's sessionToken?
-      // What if we're not the current user?
-      // TODO(mengyan): Delete getCurrentSessionTokenAsync or delete the inject sessionToken
-      return ParseUser.getCurrentSessionTokenAsync().onSuccessTask(new Continuation<String, Task<Void>>() {
-        @Override
-        public Task<Void> then(Task<String> task) throws Exception {
-          return saveAsync(sessionToken, toAwait);
-        }
-      }).continueWithTask(new Continuation<Void, Task<Void>>() {
+      return saveAsync(sessionToken, isLazy, toAwait).continueWithTask(new Continuation<Void, Task<Void>>() {
         @Override
         public Task<Void> then(Task<Void> task) throws Exception {
           synchronized (mutex) {
@@ -1292,9 +1289,6 @@ private void logOutWith(String authType) {
    */
   /* package for tests */ Task<Void> resolveLazinessAsync(Task<Void> toAwait) {
     synchronized (mutex) {
-      if (!isLazy()) {
-        return Task.forResult(null);
-      }
       if (getAuthData().size() == 0) { // TODO(grantland): Could we just check isDirty(KEY_AUTH_DATA)?
         // If there are no linked services, treat this as a SignUp.
         return signUpAsync(toAwait);

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

@@ -221,7 +221,7 @@ public void testSignUpAsyncWithMergeInDiskAnonymousUser() throws Exception {
     when(currentUser.isLinked(ParseAnonymousUtils.AUTH_TYPE)).thenReturn(true);
     when(currentUser.getSessionToken()).thenReturn("oldSessionToken");
     when(currentUser.getAuthData()).thenReturn(new HashMap<String, Map<String, String>>());
-    when(currentUser.saveAsync(anyString(), Matchers.<Task<Void>>any()))
+    when(currentUser.saveAsync(anyString(), eq(false), Matchers.<Task<Void>>any()))
         .thenReturn(Task.<Void>forResult(null));
     ParseUser.State state = new ParseUser.State.Builder()
         .put("oldKey", "oldValue")
@@ -249,7 +249,8 @@ public void testSignUpAsyncWithMergeInDiskAnonymousUser() throws Exception {
     verify(currentUser, times(1)).setUsername("userName");
     verify(currentUser, times(1)).setPassword("password");
     // Make sure we save currentUser
-    verify(currentUser, times(1)).saveAsync(eq("oldSessionToken"), Matchers.<Task<Void>>any());
+    verify(currentUser, times(1))
+        .saveAsync(eq("oldSessionToken"), eq(false), Matchers.<Task<Void>>any());
     // Make sure we merge currentUser with user after save
     assertEquals("oldValue", user.get("oldKey"));
     // Make sure set currentUser
@@ -264,13 +265,14 @@ public void testSignUpAsyncWithMergeInDiskAnonymousUserSaveFailure() throws Exce
     oldAnonymousAuthData.put("oldKey", "oldToken");
     currentUser.putAuthData(ParseAnonymousUtils.AUTH_TYPE, oldAnonymousAuthData);
     ParseUser partialMockCurrentUser = spy(currentUser);
+    when(partialMockCurrentUser.getObjectId()).thenReturn("oldObjectId");
     when(partialMockCurrentUser.getUsername()).thenReturn("oldUserName");
     when(partialMockCurrentUser.getPassword()).thenReturn("oldPassword");
     when(partialMockCurrentUser.getSessionToken()).thenReturn("oldSessionToken");
     ParseException saveException = new ParseException(ParseException.OTHER_CAUSE, "");
     doReturn(Task.<Void>forError(saveException))
         .when(partialMockCurrentUser)
-        .saveAsync(anyString(), Matchers.<Task<Void>>any());
+        .saveAsync(anyString(), eq(false), Matchers.<Task<Void>>any());
     ParseCurrentUserController currentUserController = mock(ParseCurrentUserController.class);
     when(currentUserController.getAsync(anyBoolean()))
         .thenReturn(Task.forResult(partialMockCurrentUser));
@@ -295,7 +297,7 @@ public void testSignUpAsyncWithMergeInDiskAnonymousUserSaveFailure() throws Exce
     verify(partialMockCurrentUser, times(1)).copyChangesFrom(eq(user));
     // Make sure we save currentUser
     verify(partialMockCurrentUser, times(1))
-        .saveAsync(eq("oldSessionToken"), Matchers.<Task<Void>>any());
+        .saveAsync(eq("oldSessionToken"), eq(false), Matchers.<Task<Void>>any());
     // Make sure we restore old username and password after save fails
     verify(partialMockCurrentUser, times(1)).setUsername("oldUserName");
     verify(partialMockCurrentUser, times(1)).setPassword("oldPassword");
@@ -575,7 +577,7 @@ public void testLinkWithAsyncWithSaveAsyncSuccess() throws Exception {
     ParseUser partialMockUser = spy(user);
     doReturn(Task.<Void>forResult(null))
         .when(partialMockUser)
-        .saveAsync(anyString(), Matchers.<Task<Void>>any());
+        .saveAsync(anyString(), eq(false), Matchers.<Task<Void>>any());
     String authType = "facebook";
     Map<String, String> authData = new HashMap<>();
     authData.put("token", "test");
@@ -587,7 +589,8 @@ public void testLinkWithAsyncWithSaveAsyncSuccess() throws Exception {
     // Make sure new authData is added
     assertSame(authData, partialMockUser.getAuthData().get("facebook"));
     // Make sure we save the user
-    verify(partialMockUser, times(1)).saveAsync(eq("sessionTokenAgain"), Matchers.<Task<Void>>any());
+    verify(partialMockUser, times(1))
+        .saveAsync(eq("sessionTokenAgain"), eq(false), Matchers.<Task<Void>>any());
     // Make sure synchronizeAuthData() is called
     verify(provider, times(1)).restoreAuthentication(authData);
   }
@@ -610,7 +613,7 @@ public void testLinkWithAsyncWithSaveAsyncFailure() throws Exception {
     Exception saveException = new Exception();
     doReturn(Task.<Void>forError(saveException))
         .when(partialMockUser)
-        .saveAsync(anyString(), Matchers.<Task<Void>>any());
+        .saveAsync(anyString(), eq(false), Matchers.<Task<Void>>any());
     String facebookAuthType = "facebook";
     Map<String, String> facebookAuthData = new HashMap<>();
     facebookAuthData.put("facebookToken", "facebookTest");
@@ -622,7 +625,8 @@ public void testLinkWithAsyncWithSaveAsyncFailure() throws Exception {
     // Make sure new authData is added
     assertSame(facebookAuthData, partialMockUser.getAuthData().get("facebook"));
     // Make sure we save the user
-    verify(partialMockUser, times(1)).saveAsync(eq("sessionTokenAgain"), Matchers.<Task<Void>>any());
+    verify(partialMockUser, times(1))
+        .saveAsync(eq("sessionTokenAgain"), eq(false), Matchers.<Task<Void>>any());
     // Make sure old authData is restored
     assertSame(anonymousAuthData, partialMockUser.getAuthData().get(ParseAnonymousUtils.AUTH_TYPE));
     // Verify exception