Account Linking Phase 1

app/src/main/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.firebase.uidemo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.firebase.uidemo">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -17,7 +16,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-
         <activity android:name=".ChooserActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -37,6 +35,9 @@
         <activity
             android:name=".auth.SignedInActivity"
             android:label="@string/title_auth_activity" />
+        <activity
+            android:name=".auth.AccountLinkActivity"
+            android:label="@string/title_account_link"/>
 
         <!-- Firestore demo -->
         <activity
@@ -55,7 +56,6 @@
         <activity
             android:name=".storage.ImageActivity"
             android:label="@string/title_storage_activity" />
-
     </application>
 
 </manifest>

app/src/main/java/com/firebase/uidemo/ChooserActivity.java

@@ -25,6 +25,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.firebase.uidemo.auth.AccountLinkActivity;
 import com.firebase.uidemo.auth.AuthUiActivity;
 import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
 import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
@@ -51,20 +52,23 @@ protected void onCreate(Bundle savedInstanceState) {
     private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
         private static final Class[] CLASSES = new Class[]{
                 AuthUiActivity.class,
+                AccountLinkActivity.class,
                 FirestoreChatActivity.class,
                 RealtimeDbChatActivity.class,
                 ImageActivity.class,
         };
 
         private static final int[] DESCRIPTION_NAMES = new int[]{
                 R.string.title_auth_activity,
+                R.string.title_account_link,
                 R.string.title_firestore_activity,
                 R.string.title_realtime_database_activity,
                 R.string.title_storage_activity
         };
 
         private static final int[] DESCRIPTION_IDS = new int[]{
                 R.string.desc_auth,
+                R.string.desc_account_link,
                 R.string.desc_firestore,
                 R.string.desc_realtime_database,
                 R.string.desc_storage

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

@@ -0,0 +1,197 @@
+package com.firebase.uidemo.auth;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.uidemo.R;
+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;
+import com.google.firebase.auth.FirebaseUser;
+
+import java.util.Arrays;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class AccountLinkActivity extends AppCompatActivity {
+
+    private static final String TAG = "AccountLink";
+
+    private static final int RC_SIGN_IN = 123;
+
+    @BindView(R.id.status_text)
+    TextView mStatus;
+
+    @BindView(R.id.anon_sign_in)
+    Button mAnonSignInButton;
+
+    @BindView(R.id.begin_flow)
+    Button mLaunchUIButton;
+
+    @BindView(R.id.resolve_merge)
+    Button mResolveMergeButton;
+
+    @BindView(R.id.sign_out)
+    Button mSignOutButton;
+
+    private AuthCredential mPendingCredential;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_account_link);
+        ButterKnife.bind(this);
+    }
+
+    @OnClick(R.id.anon_sign_in)
+    public void signInAnonymously() {
+        FirebaseAuth.getInstance().signInAnonymously()
+                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        updateUI();
+
+                        if (task.isSuccessful()) {
+                            setStatus("Signed in anonymously as user "
+                                    + getUserIdentifier(task.getResult().getUser()));
+                        } else {
+                            setStatus("Anonymous sign in failed.");
+                        }
+                    }
+                });
+    }
+
+    @OnClick(R.id.begin_flow)
+    public void startAuthUI() {
+        List<AuthUI.IdpConfig> providers = Arrays.asList(
+                new AuthUI.IdpConfig.EmailBuilder().build(),
+                new AuthUI.IdpConfig.PhoneBuilder().build(),
+                new AuthUI.IdpConfig.GoogleBuilder().build());
+
+        Intent intent = AuthUI.getInstance().createSignInIntentBuilder()
+                .setAvailableProviders(providers)
+                .setIsSmartLockEnabled(false)
+                .setUpgradeAnonymousAccounts(true)
+                .build();
+
+        startActivityForResult(intent, RC_SIGN_IN);
+    }
+
+    @OnClick(R.id.resolve_merge)
+    public void resolveMerge() {
+        if (mPendingCredential == null) {
+            Toast.makeText(this, "Nothing to resolve.", Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        // TODO: Show how to do good data moving
+
+        FirebaseAuth.getInstance().signInWithCredential(mPendingCredential)
+                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        mPendingCredential = null;
+                        updateUI();
+
+                        if (task.isSuccessful()) {
+                            setStatus("Signed in as " + getUserIdentifier(task.getResult().getUser()));
+                        } else {
+                            Log.w(TAG, "Merge failed", task.getException());
+                            setStatus("Failed to resolve merge conflict, see logs.");
+                        }
+                    }
+                });
+    }
+
+    @OnClick(R.id.sign_out)
+    public void signOut() {
+        AuthUI.getInstance().signOut(this)
+                .addOnCompleteListener(new OnCompleteListener<Void>() {
+                    @Override
+                    public void onComplete(@NonNull Task<Void> task) {
+                        setStatus(null);
+                        updateUI();
+                    }
+                });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == RC_SIGN_IN) {
+            IdpResponse response = IdpResponse.fromResultIntent(data);
+            if (resultCode == RESULT_OK) {
+                setStatus("Signed in as " + getUserIdentifier(FirebaseAuth.getInstance().getCurrentUser()));
+            } else {
+                if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+                    setStatus("Merge conflict: user already exists.");
+                    mResolveMergeButton.setEnabled(true);
+                    mPendingCredential = response.getPendingCredential();
+                }
+            }
+
+            updateUI();
+        }
+    }
+
+    private void updateUI() {
+        FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
+
+        if (currentUser == null) {
+            // Not signed in
+            mAnonSignInButton.setEnabled(true);
+            mLaunchUIButton.setEnabled(false);
+            mResolveMergeButton.setEnabled(false);
+            mSignOutButton.setEnabled(false);
+        } else if (mPendingCredential == null && currentUser.isAnonymous()) {
+            // Anonymous user, waiting for linking
+            mAnonSignInButton.setEnabled(false);
+            mLaunchUIButton.setEnabled(true);
+            mResolveMergeButton.setEnabled(false);
+            mSignOutButton.setEnabled(true);
+        } else if (mPendingCredential == null && !currentUser.isAnonymous()) {
+            // Fully signed in
+            mAnonSignInButton.setEnabled(false);
+            mLaunchUIButton.setEnabled(false);
+            mResolveMergeButton.setEnabled(false);
+            mSignOutButton.setEnabled(true);
+        } else if (mPendingCredential != null) {
+            // Signed in anonymous, awaiting merge conflict
+            mAnonSignInButton.setEnabled(false);
+            mLaunchUIButton.setEnabled(false);
+            mResolveMergeButton.setEnabled(true);
+            mSignOutButton.setEnabled(true);
+        }
+    }
+
+    private void setStatus(String message) {
+        mStatus.setText(message);
+    }
+
+    private String getUserIdentifier(FirebaseUser user) {
+        if (user.isAnonymous()) {
+            return user.getUid();
+        } else if (!TextUtils.isEmpty(user.getEmail())) {
+            return user.getEmail();
+        } else if (!TextUtils.isEmpty(user.getPhoneNumber())) {
+            return user.getPhoneNumber();
+        } else {
+            return "unknown";
+        }
+    }
+}

app/src/main/res/layout/activity_account_link.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="24dp"
+    android:layout_marginRight="24dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginBottom="16dp"
+    android:orientation="vertical"
+    tools:context=".auth.AuthUiActivity">
+
+
+    <TextView
+        style="@style/Base.TextAppearance.AppCompat.Headline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:drawableTop="@drawable/firebase_auth_120dp"
+        android:text="@string/title_account_linking" />
+
+    <TextView
+        android:id="@+id/status_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:gravity="center"
+        android:textIsSelectable="true"
+        tools:text="This is the status view, sometimes it will have a very long status and other..." />
+
+    <Button
+        android:id="@+id/anon_sign_in"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/anonymous_sign_in" />
+
+    <Button
+        android:id="@+id/begin_flow"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/launch_auth_ui"
+        android:enabled="false" />
+
+    <Button
+        android:id="@+id/resolve_merge"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/resolve_merge_conflict"
+        android:enabled="false" />
+
+    <Button
+        android:id="@+id/sign_out"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/sign_out"
+        android:enabled="false" />
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -3,11 +3,13 @@
 
     <!-- Chooser -->
     <string name="title_auth_activity">Auth UI demo</string>
+    <string name="title_account_link">Auth UI Account Linking</string>
     <string name="title_firestore_activity">Cloud Firestore Demo</string>
     <string name="title_realtime_database_activity">Real-time database demo</string>
     <string name="title_storage_activity">Storage Image Demo</string>
 
     <string name="desc_auth">Demonstrates the Firebase Auth UI flow, with customization options.</string>
+    <string name="desc_account_link">Demonstrates upgrading an anonymous account using FirebaseUI.</string>
     <string name="desc_firestore">Demonstrates using a FirestoreRecyclerAdapter to load data from Cloud Firestore into a RecyclerView for a basic chat app.</string>
     <string name="desc_realtime_database">Demonstrates using a FirebaseRecyclerAdapter to load data from Firebase Database into a RecyclerView for a basic chat app.</string>
     <string name="desc_storage">Demonstrates displaying an image from Cloud Storage using Glide.</string>
@@ -65,6 +67,11 @@
     <string name="no_internet_connection">No internet connection</string>
     <string name="unknown_error">An unknown error occurred</string>
 
+    <string name="title_account_linking">FirebaseUI Account Linking</string>
+    <string name="anonymous_sign_in">Anonymous Sign In</string>
+    <string name="launch_auth_ui">Launch Auth UI</string>
+    <string name="resolve_merge_conflict">Resolve Merge Conflict</string>
+
     <!-- Auth UI - Signed in -->
     <string name="signed_in_header">You are signed in!</string>
     <string name="sign_out">Sign out</string>

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

@@ -992,7 +992,9 @@ public Intent build() {
      * Builder for the intent to start the user authentication flow.
      */
     public final class SignInIntentBuilder extends AuthIntentBuilder<SignInIntentBuilder> {
+
         private Boolean mAllowNewEmailAccounts;
+        private boolean mUpgradeAnonymous = false;
 
         private SignInIntentBuilder() {
             super();
@@ -1013,6 +1015,16 @@ public SignInIntentBuilder setAllowNewEmailAccounts(boolean enabled) {
             return this;
         }
 
+        /**
+         * Enables or disables upgrading anonymous accounts to full accounts during the sign-in
+         * flow. This is disabled by default.
+         */
+        @NonNull
+        public SignInIntentBuilder setUpgradeAnonymousAccounts(boolean enabled) {
+            mUpgradeAnonymous = enabled;
+            return this;
+        }
+
         @NonNull
         @Override
         public Intent build() {
@@ -1041,7 +1053,8 @@ protected FlowParameters getFlowParams() {
                     mTosUrl,
                     mPrivacyPolicyUrl,
                     mEnableCredentials,
-                    mEnableHints);
+                    mEnableHints,
+                    mUpgradeAnonymous);
         }
     }
 }