Adds anonymous user upgrade to Email/Password sign in

Author: lsirac

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -41,6 +41,7 @@
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 
@@ -155,17 +156,25 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
 
     @OnClick(R.id.sign_in)
     public void signIn(View view) {
-        startActivityForResult(
-                AuthUI.getInstance().createSignInIntentBuilder()
-                        .setTheme(getSelectedTheme())
-                        .setLogo(getSelectedLogo())
-                        .setAvailableProviders(getSelectedProviders())
-                        .setTosAndPrivacyPolicyUrls(getSelectedTosUrl(),
-                                getSelectedPrivacyPolicyUrl())
-                        .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
-                                mEnableHintSelector.isChecked())
-                        .build(),
-                RC_SIGN_IN);
+        FirebaseAuth.getInstance()
+                .signInAnonymously()
+                .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        startActivityForResult(
+                                AuthUI.getInstance().createSignInIntentBuilder()
+                                        .setTheme(getSelectedTheme())
+                                        .setLogo(getSelectedLogo())
+                                        .setAvailableProviders(getSelectedProviders())
+                                        .setTosAndPrivacyPolicyUrls(getSelectedTosUrl(),
+                                                getSelectedPrivacyPolicyUrl())
+                                        .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
+                                                mEnableHintSelector.isChecked())
+                                        .setAutoUpgradeAnonymousUsers()
+                                        .build(),
+                                RC_SIGN_IN);
+                    }
+                });
     }
 
     @OnClick(R.id.sign_in_silent)
@@ -194,15 +203,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     @Override
     protected void onResume() {
         super.onResume();
-        FirebaseAuth auth = FirebaseAuth.getInstance();
-        if (auth.getCurrentUser() != null) {
-            startSignedInActivity(null);
-            finish();
-        }
+//        FirebaseAuth auth = FirebaseAuth.getInstance();
+//        if (auth.getCurrentUser() != null) {
+//            startSignedInActivity(null);
+//            finish();
+//        }
     }
 
     private void handleSignInResponse(int resultCode, Intent data) {
-        IdpResponse response = IdpResponse.fromResultIntent(data);
+        final IdpResponse response = IdpResponse.fromResultIntent(data);
 
         // Successfully signed in
         if (resultCode == RESULT_OK) {
@@ -221,6 +230,25 @@ private void handleSignInResponse(int resultCode, Intent data) {
                 return;
             }
 
+            if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+                AuthCredential credential = response.getCredentialForLinking();
+                // take data from anon user
+                // log in with credential
+                // update user
+                FirebaseAuth.getInstance().signInWithCredential(credential).addOnCompleteListener(
+                        new OnCompleteListener<AuthResult>() {
+                            @Override
+                            public void onComplete(@NonNull Task<AuthResult> task) {
+                                if (task.isSuccessful()) {
+                                    startSignedInActivity(response);
+                                } else {
+                                    // cry
+                                }
+                            }
+                        });
+                return;
+            }
+
             showSnackbar(R.string.unknown_error);
             Log.e(TAG, "Sign-in error: ", response.getError());
         }

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -1107,10 +1107,23 @@ public Intent build() {
      * Builder for the intent to start the user authentication flow.
      */
     public final class SignInIntentBuilder extends AuthIntentBuilder<SignInIntentBuilder> {
+
+        private boolean mEnableAnonymousUpgrade;
+
         private SignInIntentBuilder() {
             super();
         }
 
+        /**
+         * Enables or disables upgrading anonymous accounts to full accounts during the sign-in
+         * flow. This is disabled by default.
+         */
+        @NonNull
+        public SignInIntentBuilder setAutoUpgradeAnonymousUsers() {
+            mEnableAnonymousUpgrade = true;
+            return this;
+        }
+
         @Override
         protected FlowParameters getFlowParams() {
             return new FlowParameters(
@@ -1121,7 +1134,8 @@ protected FlowParameters getFlowParams() {
                     mTosUrl,
                     mPrivacyPolicyUrl,
                     mEnableCredentials,
-                    mEnableHints);
+                    mEnableHints,
+                    mEnableAnonymousUpgrade);
         }
     }
 }

auth/src/main/java/com/firebase/ui/auth/ErrorCodes.java

@@ -19,7 +19,8 @@ public final class ErrorCodes {
                     NO_NETWORK,
                     PLAY_SERVICES_UPDATE_CANCELLED,
                     DEVELOPER_ERROR,
-                    PROVIDER_ERROR
+                    PROVIDER_ERROR,
+                    ANONYMOUS_UPGRADE_MERGE_CONFLICT
             })
     @Retention(RetentionPolicy.SOURCE)
     public @interface Code {}
@@ -49,6 +50,11 @@ public final class ErrorCodes {
      */
     public static final int PROVIDER_ERROR = 4;
 
+    /**
+     * Anonymous account linking failed.
+     */
+    public static final int ANONYMOUS_UPGRADE_MERGE_CONFLICT = 5;
+
     private ErrorCodes() {
         throw new AssertionError("No instance for you!");
     }
@@ -67,6 +73,8 @@ public static String toFriendlyMessage(@Code int code) {
                 return "Developer error";
             case PROVIDER_ERROR:
                 return "Provider error";
+            case ANONYMOUS_UPGRADE_MERGE_CONFLICT:
+                return "Merge conflict";
             default:
                 throw new IllegalArgumentException("Unknown code: " + code);
         }

auth/src/main/java/com/firebase/ui/auth/FirebaseAuthAnonymousUpgradeException.java

@@ -0,0 +1,26 @@
+package com.firebase.ui.auth;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
+
+import com.firebase.ui.auth.IdpResponse;
+import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.FirebaseAuthUserCollisionException;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class FirebaseAuthAnonymousUpgradeException extends Exception {
+
+    private IdpResponse response;
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public FirebaseAuthAnonymousUpgradeException(@ErrorCodes.Code int code,
+                                                 @NonNull IdpResponse response) {
+        super(ErrorCodes.toFriendlyMessage(code));
+        this.response = response;
+    }
+
+    public IdpResponse getResponse() {
+        return response;
+    }
+}

auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

@@ -25,6 +25,7 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
 
@@ -45,6 +46,7 @@ public IdpResponse createFromParcel(Parcel in) {
                     in.readString(),
                     in.readInt() == 1,
                     (FirebaseUiException) in.readSerializable()
+                    in.<AuthCredential>readParcelable(AuthCredential.class.getClassLoader())
             );
         }
 
@@ -55,6 +57,7 @@ public IdpResponse[] newArray(int size) {
     };
 
     private final User mUser;
+    private final AuthCredential mPendingCredential;
 
     private final String mToken;
     private final String mSecret;
@@ -63,28 +66,34 @@ public IdpResponse[] newArray(int size) {
     private final FirebaseUiException mException;
 
     private IdpResponse(@NonNull FirebaseUiException e) {
-        this(null, null, null, false, e);
+        this(null, null, null, false, e, null);
     }
 
     private IdpResponse(
             @NonNull User user,
             @Nullable String token,
             @Nullable String secret,
             boolean isNewUser) {
-        this(user, token, secret, isNewUser, null);
+        this(user, token, secret, isNewUser, null, null);
+    }
+
+    private IdpResponse(AuthCredential credential, FirebaseUiException e) {
+        this(null, null, null, false, e, credential);
     }
 
     private IdpResponse(
             User user,
             String token,
             String secret,
             boolean isNewUser,
-            FirebaseUiException e) {
+            FirebaseUiException e
+            AuthCredential credential) {
         mUser = user;
         mToken = token;
         mSecret = secret;
         mIsNewUser = isNewUser;
         mException = e;
+        mPendingCredential = credential;
     }
 
     /**
@@ -207,6 +216,11 @@ public FirebaseUiException getError() {
         return mException;
     }
 
+    @Nullable
+    public AuthCredential getCredentialForLinking() {
+        return mPendingCredential;
+    }
+
     @Override
     public int describeContents() {
         return 0;
@@ -218,7 +232,6 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(mToken);
         dest.writeString(mSecret);
         dest.writeInt(mIsNewUser ? 1 : 0);
-
         ObjectOutputStream oos = null;
         try {
             oos = new ObjectOutputStream(new ByteArrayOutputStream());
@@ -241,6 +254,7 @@ public void writeToParcel(Parcel dest, int flags) {
                 } catch (IOException ignored) {}
             }
         }
+        dest.writeParcelable(mPendingCredential, 0);
     }
 
     @Override
@@ -281,13 +295,20 @@ public String toString() {
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public static class Builder {
         private final User mUser;
+        private final AuthCredential mPendingCredential;
 
         private String mToken;
         private String mSecret;
         private boolean mIsNewUser;
 
         public Builder(@NonNull User user) {
             mUser = user;
+            mPendingCredential = null;
+        }
+
+        public Builder(@NonNull AuthCredential pendingCredential) {
+            mUser = null;
+            mPendingCredential = pendingCredential;
         }
 
         public Builder(@NonNull IdpResponse response) {
@@ -305,29 +326,32 @@ public Builder setNewUser(boolean newUser) {
         public Builder setToken(String token) {
             mToken = token;
             return this;
-        }
+    }
 
         public Builder setSecret(String secret) {
             mSecret = secret;
             return this;
         }
 
         public IdpResponse build() {
-            String providerId = mUser.getProviderId();
-            if (!AuthUI.SUPPORTED_PROVIDERS.contains(providerId)) {
-                throw new IllegalStateException("Unknown provider: " + providerId);
+            if (mPendingCredential != null) {
+                return new IdpResponse(mPendingCredential, new FirebaseUiException(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT));
+            } else {
+                String providerId = mUser.getProviderId();
+                if (!AuthUI.SUPPORTED_PROVIDERS.contains(providerId)) {
+                    throw new IllegalStateException("Unknown provider: " + providerId);
+                }
+                if (AuthUI.SOCIAL_PROVIDERS.contains(providerId) && TextUtils.isEmpty(mToken)) {
+                    throw new IllegalStateException(
+                            "Token cannot be null when using a non-email provider.");
+                }
+                if (providerId.equals(TwitterAuthProvider.PROVIDER_ID)
+                        && TextUtils.isEmpty(mSecret)) {
+                    throw new IllegalStateException(
+                            "Secret cannot be null when using the Twitter provider.");
+                }
+                return new IdpResponse(mUser, mToken, mSecret, mIsNewUser);
             }
-            if (AuthUI.SOCIAL_PROVIDERS.contains(providerId) && TextUtils.isEmpty(mToken)) {
-                throw new IllegalStateException(
-                        "Token cannot be null when using a non-email provider.");
-            }
-            if (providerId.equals(TwitterAuthProvider.PROVIDER_ID)
-                    && TextUtils.isEmpty(mSecret)) {
-                throw new IllegalStateException(
-                        "Secret cannot be null when using the Twitter provider.");
-            }
-
-            return new IdpResponse(mUser, mToken, mSecret, mIsNewUser);
         }
     }
 }

auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java

@@ -13,6 +13,7 @@
 import com.firebase.ui.auth.data.model.UserCancellationException;
 import com.firebase.ui.auth.data.remote.SignInKickstarter;
 import com.firebase.ui.auth.ui.InvisibleActivityBase;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -41,6 +42,9 @@ protected void onSuccess(@NonNull IdpResponse response) {
             protected void onFailure(@NonNull Exception e) {
                 if (e instanceof UserCancellationException) {
                     finish(RESULT_CANCELED, null);
+                } else if (e instanceof FirebaseAuthAnonymousUpgradeException) {
+                    IdpResponse res = ((FirebaseAuthAnonymousUpgradeException) e).getResponse();
+                    finish(RESULT_CANCELED, new Intent().putExtra(ExtraConstants.IDP_RESPONSE, res));
                 } else {
                     finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
                 }