Skip to content

Email link sign in (Phase 1) #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 24, 2018
Merged

Email link sign in (Phase 1) #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
45e1e21
Most of the implementation and tests for email link sign in phase 1
lsirac Oct 15, 2018
aba1fcf
Fix auth:checkstyle error
lsirac Oct 15, 2018
e6e2fb3
Added loading animation
lsirac Oct 16, 2018
c4c43e6
Handle the invalid link flow (link is malformed, expired, or has alre…
lsirac Oct 17, 2018
fe06a27
Fix broken tests
lsirac Oct 17, 2018
b4d45dc
Changes from code review
lsirac Oct 19, 2018
6641ba5
More changes from code review
lsirac Oct 19, 2018
ff4a0f2
Adds circular loading progress bar while sending an email in EmailLin…
lsirac Oct 23, 2018
63fcb62
Removed redundant declarations and added annotations
lsirac Oct 23, 2018
65f4bd1
Fixes InvisibleFragment
lsirac Oct 23, 2018
0292dbf
Add transition from EmailLinkFragment to TroubleSigningInFragment
lsirac Oct 23, 2018
e37f42f
Show an error message when trying to sign in with email link when it …
lsirac Oct 23, 2018
d5027c4
Fix anonymous upgrade demo
lsirac Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/src/main/java/com/firebase/uidemo/ChooserActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import android.view.ViewGroup;
import android.widget.TextView;

import com.firebase.ui.auth.AuthUI;
import com.firebase.ui.auth.util.ExtraConstants;
import com.firebase.uidemo.auth.AnonymousUpgradeActivity;
import com.firebase.uidemo.auth.AuthUiActivity;
import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
Expand All @@ -43,6 +45,16 @@ public class ChooserActivity extends AppCompatActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

if (AuthUI.canHandleIntent(getIntent())) {
Intent intent = new Intent(ChooserActivity.this, AuthUiActivity
.class);
intent.putExtra(ExtraConstants.EMAIL_LINK_SIGN_IN, getIntent().getData().toString());
startActivity(intent);
finish();
return;
}

setContentView(R.layout.activity_chooser);
ButterKnife.bind(this);

Expand All @@ -51,7 +63,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
mActivities.setHasFixedSize(true);
}

private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
private static class ActivityChooserAdapter
extends RecyclerView.Adapter<ActivityStarterHolder> {
private static final Class[] CLASSES = new Class[]{
AuthUiActivity.class,
AnonymousUpgradeActivity.class,
Expand Down Expand Up @@ -97,7 +110,8 @@ public int getItemCount() {
}
}

private static class ActivityStarterHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
private static class ActivityStarterHolder extends RecyclerView.ViewHolder
implements View.OnClickListener {
private TextView mTitle;
private TextView mDescription;

Expand Down
31 changes: 24 additions & 7 deletions app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_anonymous_upgrade);
ButterKnife.bind(this);

updateUI();

// Got here from AuthUIActivity, and we need to deal with a merge conflict
// Occurs after catching an email link
IdpResponse response = IdpResponse.fromResultIntent(getIntent());
if (response != null) {
handleSignInResult(RC_SIGN_IN, ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT,
getIntent());
}
}

@OnClick(R.id.anon_sign_in)
Expand All @@ -81,10 +91,10 @@ public void onComplete(@NonNull Task<AuthResult> task) {
public void startAuthUI() {
List<AuthUI.IdpConfig> providers = ConfigurationUtils.getConfiguredProviders(this);
Intent intent = AuthUI.getInstance().createSignInIntentBuilder()
.setLogo(R.drawable.firebase_auth_120dp)
.setAvailableProviders(providers)
.enableAnonymousUsersAutoUpgrade()
.build();
.setLogo(R.drawable.firebase_auth_120dp)
.setAvailableProviders(providers)
.enableAnonymousUsersAutoUpgrade()
.build();
startActivityForResult(intent, RC_SIGN_IN);
}

Expand All @@ -105,7 +115,8 @@ public void onComplete(@NonNull Task<AuthResult> task) {
updateUI();

if (task.isSuccessful()) {
setStatus("Signed in as " + getUserIdentifier(task.getResult().getUser()));
setStatus("Signed in as " + getUserIdentifier(task.getResult()
.getUser()));
} else {
Log.w(TAG, "Merge failed", task.getException());
setStatus("Failed to resolve merge conflict, see logs.");
Expand All @@ -129,15 +140,21 @@ public void onComplete(@NonNull Task<Void> task) {
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
handleSignInResult(requestCode, resultCode, data);
}

private void handleSignInResult(int requestCode, int resultCode, Intent data) {
if (requestCode == RC_SIGN_IN) {
IdpResponse response = IdpResponse.fromResultIntent(data);
if (response == null) {
// User pressed back button
return;
}
if (resultCode == RESULT_OK) {
setStatus("Signed in as " + getUserIdentifier(FirebaseAuth.getInstance().getCurrentUser()));
} else if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
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.getCredentialForLinking();
Expand Down
95 changes: 90 additions & 5 deletions app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@
import com.firebase.ui.auth.AuthUI.IdpConfig;
import com.firebase.ui.auth.ErrorCodes;
import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.util.ExtraConstants;
import com.firebase.uidemo.R;
import com.firebase.uidemo.util.ConfigurationUtils;
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.ActionCodeSettings;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth;

Expand All @@ -57,8 +59,10 @@ public class AuthUiActivity extends AppCompatActivity {

private static final String GOOGLE_TOS_URL = "https://www.google.com/policies/terms/";
private static final String FIREBASE_TOS_URL = "https://firebase.google.com/terms/";
private static final String GOOGLE_PRIVACY_POLICY_URL = "https://www.google.com/policies/privacy/";
private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google.com/terms/analytics/#7_privacy";
private static final String GOOGLE_PRIVACY_POLICY_URL = "https://www.google" +
".com/policies/privacy/";
private static final String FIREBASE_PRIVACY_POLICY_URL = "https://firebase.google" +
".com/terms/analytics/#7_privacy";

private static final int RC_SIGN_IN = 100;

Expand All @@ -69,6 +73,7 @@ public class AuthUiActivity extends AppCompatActivity {
@BindView(R.id.twitter_provider) CheckBox mUseTwitterProvider;
@BindView(R.id.github_provider) CheckBox mUseGitHubProvider;
@BindView(R.id.email_provider) CheckBox mUseEmailProvider;
@BindView(R.id.email_link_provider) CheckBox mUseEmailLinkProvider;
@BindView(R.id.phone_provider) CheckBox mUsePhoneProvider;
@BindView(R.id.anonymous_provider) CheckBox mUseAnonymousProvider;

Expand Down Expand Up @@ -163,6 +168,23 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
});
}

mUseEmailLinkProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
flipPasswordProviderCheckbox(isChecked);
}
});

mUseEmailProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
flipEmailLinkProviderCheckbox(isChecked);
}
});

mUseEmailLinkProvider.setChecked(false);
mUseEmailProvider.setChecked(true);

if (ConfigurationUtils.isGoogleMisconfigured(this)
|| ConfigurationUtils.isFacebookMisconfigured(this)
|| ConfigurationUtils.isTwitterMisconfigured(this)
Expand All @@ -173,11 +195,44 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
mDarkTheme.setChecked(true);
}

catchEmailLinkSignIn();
}

public void catchEmailLinkSignIn() {
if (getIntent().getExtras() == null) {
return;
}
String link = getIntent().getExtras().getString(ExtraConstants.EMAIL_LINK_SIGN_IN);
if (link != null) {
signInWithEmailLink(link);
}
}

public void flipPasswordProviderCheckbox(boolean emailLinkProviderIsChecked) {
if (emailLinkProviderIsChecked) {
mUseEmailProvider.setChecked(false);
}
}

public void flipEmailLinkProviderCheckbox(boolean passwordProviderIsChecked) {
if (passwordProviderIsChecked) {
mUseEmailLinkProvider.setChecked(false);
}
}

@OnClick(R.id.sign_in)
public void signIn() {
AuthUI.SignInIntentBuilder builder = AuthUI.getInstance().createSignInIntentBuilder()
startActivityForResult(buildSignInIntent(/*link=*/null), RC_SIGN_IN);
}

public void signInWithEmailLink(@Nullable String link) {
startActivityForResult(buildSignInIntent(link), RC_SIGN_IN);
}

@NonNull
public Intent buildSignInIntent(@Nullable String link) {
AuthUI.SignInIntentBuilder builder = AuthUI.getInstance().createSignInIntentBuilder()
.setTheme(getSelectedTheme())
.setLogo(getSelectedLogo())
.setAvailableProviders(getSelectedProviders())
Expand All @@ -190,7 +245,17 @@ public void signIn() {
getSelectedPrivacyPolicyUrl());
}

startActivityForResult(builder.build(), RC_SIGN_IN);
if (link != null) {
builder.setEmailLink(link);
}

FirebaseAuth auth = FirebaseAuth.getInstance();

if (auth.getCurrentUser() != null && auth.getCurrentUser().isAnonymous()) {
builder.enableAnonymousUsersAutoUpgrade();
}

return builder.build();
}

@OnClick(R.id.sign_in_silent)
Expand Down Expand Up @@ -220,7 +285,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
protected void onResume() {
super.onResume();
FirebaseAuth auth = FirebaseAuth.getInstance();
if (auth.getCurrentUser() != null) {
if (auth.getCurrentUser() != null && getIntent().getExtras() == null) {
startSignedInActivity(null);
finish();
}
Expand All @@ -246,6 +311,12 @@ private void handleSignInResponse(int resultCode, @Nullable Intent data) {
return;
}

if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
Intent intent = new Intent(this, AnonymousUpgradeActivity.class).putExtra
(ExtraConstants.IDP_RESPONSE, response);
startActivity(intent);
}

showSnackbar(R.string.unknown_error);
Log.e(TAG, "Sign-in error: ", response.getError());
}
Expand Down Expand Up @@ -317,6 +388,20 @@ private List<IdpConfig> getSelectedProviders() {
.build());
}

if (mUseEmailLinkProvider.isChecked()) {
ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder()
.setAndroidPackageName("com.firebase.uidemo", true, null)
.setHandleCodeInApp(true)
.setUrl("https://google.com")
.build();

selectedProviders.add(new IdpConfig.EmailBuilder()
.setAllowNewAccounts(mAllowNewEmailAccounts.isChecked())
.setActionCodeSettings(actionCodeSettings)
.enableEmailLinkSignIn()
.build());
}

if (mUsePhoneProvider.isChecked()) {
selectedProviders.add(new IdpConfig.PhoneBuilder().build());
}
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
import butterknife.ButterKnife;
import butterknife.OnClick;

import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;

public class SignedInActivity extends AppCompatActivity {
private static final String TAG = "SignedInActivity";

Expand Down Expand Up @@ -187,6 +189,9 @@ private void populateProfile(@Nullable IdpResponse response) {
case PhoneAuthProvider.PROVIDER_ID:
providers.add(getString(R.string.providers_phone));
break;
case EMAIL_LINK_PROVIDER:
providers.add(getString(R.string.providers_email_link));
break;
case FirebaseAuthProvider.PROVIDER_ID:
// Ignore this provider, it's not very meaningful
break;
Expand Down
19 changes: 17 additions & 2 deletions app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import com.firebase.ui.auth.AuthUI;
import com.firebase.uidemo.R;
import com.google.firebase.auth.ActionCodeSettings;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -49,8 +50,6 @@ public static boolean isGitHubMisconfigured(@NonNull Context context) {
@NonNull
public static List<AuthUI.IdpConfig> getConfiguredProviders(@NonNull Context context) {
List<AuthUI.IdpConfig> providers = new ArrayList<>();
providers.add(new AuthUI.IdpConfig.EmailBuilder().build());
providers.add(new AuthUI.IdpConfig.PhoneBuilder().build());

if (!isGoogleMisconfigured(context)) {
providers.add(new AuthUI.IdpConfig.GoogleBuilder().build());
Expand All @@ -68,6 +67,22 @@ public static List<AuthUI.IdpConfig> getConfiguredProviders(@NonNull Context con
providers.add(new AuthUI.IdpConfig.GitHubBuilder().build());
}

ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be a constant within the demo app.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How would that work?

.setAndroidPackageName("com.firebase.uidemo", true, null)
.setHandleCodeInApp(true)
.setUrl("https://google.com")
.build();

providers.add(new AuthUI.IdpConfig.EmailBuilder()
.setAllowNewAccounts(true)
.enableEmailLinkSignIn()
.setActionCodeSettings(actionCodeSettings)
.build());


providers.add(new AuthUI.IdpConfig.PhoneBuilder().build());


return providers;
}
}
20 changes: 13 additions & 7 deletions app/src/main/res/layout/auth_ui_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout 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"
Expand All @@ -15,11 +14,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="16dp"
android:layout_marginRight="24dp"
android:layout_marginBottom="16dp"
android:paddingBottom="32dp"
android:orientation="vertical">
android:orientation="vertical"
android:paddingBottom="32dp">

<TextView
style="@style/Base.TextAppearance.AppCompat.Headline"
Expand All @@ -34,17 +33,17 @@
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:text="@string/sign_in_start" />

<Button
android:id="@+id/sign_in_silent"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_gravity="center"
android:layout_marginBottom="16dp"
android:text="@string/sign_in_silent" />

<TextView
Expand Down Expand Up @@ -89,6 +88,13 @@
android:checked="true"
android:text="@string/providers_email" />

<CheckBox
android:id="@+id/email_link_provider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/providers_email_link" />

<CheckBox
android:id="@+id/phone_provider"
android:layout_width="wrap_content"
Expand Down
Loading