Merge pull request #8 from anotherdev/pk/firebase-user-improvements

Firebase user improvements

Author: anotherdev

app/src/main/java/com/anotherdev/sample/firebase/auth/BaseActivity.java

@@ -22,7 +22,6 @@
 import com.anotherdev.sample.firebase.auth.intent.LoginIntent;
 import com.github.florent37.inlineactivityresult.rx.RxInlineActivityResult;
 import com.google.android.gms.common.SupportErrorDialogFragment;
-import com.google.firebase.FirebaseApp;
 import com.yarolegovich.lovelydialog.LovelyInfoDialog;
 
 import java.util.List;
@@ -122,8 +121,7 @@ private boolean findAndDismissGmsDialog() {
     }
 
     protected void requestAuthIfNeeded() {
-        FirebaseApp app = FirebaseApp.getInstance();
-        FirebaseAuth auth = FirebaseAuthRest.getInstance(app);
+        FirebaseAuth auth = FirebaseAuthRest.getInstance();
         FirebaseUser currentUser = auth.getCurrentUser();
 
         if (currentUser == null) {

app/src/main/java/com/anotherdev/sample/firebase/auth/LoginActivity.java

@@ -11,19 +11,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <TextView
-        android:id="@+id/auth_library_info_textview"
-        android:text="@string/app_title"
-        android:layout_margin="16dp"
-        android:layout_below="@id/toolbar"
-        android:layout_centerHorizontal="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
     <LinearLayout
         android:id="@+id/auth_user_info_layout"
         android:orientation="vertical"
-        android:layout_below="@id/auth_library_info_textview"
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -46,7 +37,6 @@
             android:orientation="vertical"
             android:gravity="bottom"
             android:padding="8dp"
-            android:layout_marginTop="8dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -66,7 +56,7 @@
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/auth_sign_in_email_button"
-                android:text="@string/sign_in__with_email"
+                android:text="@string/sign_in_with_email"
                 android:layout_margin="8dp"
                 android:layout_width="match_parent"
                 android:layout_height="@android:dimen/app_icon_size" />
@@ -86,15 +76,15 @@
 
                 <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/auth_sign_in_with_facebook_button"
-                    android:text="@string/sign_in__with_facebook"
+                    android:text="@string/facebook"
                     android:layout_width="match_parent"
                     android:layout_height="@android:dimen/app_icon_size" />
 
             </RelativeLayout>
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/auth_sign_in_with_google_button"
-                android:text="@string/sign_in__with_google"
+                android:text="@string/google"
                 android:layout_margin="8dp"
                 android:layout_width="match_parent"
                 android:layout_height="@android:dimen/app_icon_size" />
@@ -106,6 +96,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="@android:dimen/app_icon_size" />
 
+            <TextView
+                android:id="@+id/auth_library_info_textview"
+                android:text="@string/app_title"
+                android:gravity="center_horizontal"
+                android:layout_margin="16dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
             <TextView
                 android:id="@+id/app_info_textview"
                 android:text="@string/app_title"

app/src/main/res/drawable-xxxhdpi/ic_email_read_white_48dp.png

@@ -9,6 +9,18 @@
         android:title="@string/edit_profile"
         app:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/action_change_email"
+        android:icon="@drawable/ic_email_white_48dp"
+        android:title="@string/change_email"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_verify_email"
+        android:icon="@drawable/ic_email_read_white_48dp"
+        android:title="@string/verify_email"
+        app:showAsAction="ifRoom"/>
+
     <item
         android:id="@+id/action_change_password"
         android:icon="@drawable/ic_vpn_key_white_24dp"

app/src/main/res/drawable-xxxhdpi/ic_email_white_48dp.png

@@ -5,14 +5,19 @@
     <string name="password">Password</string>
     <string name="register">Register</string>
 
+    <string name="sign_in_with_x">Sign in with %s</string>
+    <string name="link_with_x">Link with %s</string>
+    <string name="unlink_from_x">Unlink from %s</string>
     <string name="sign_in_anonymously">Sign In Anonymously</string>
     <string name="register_email_password">Register Email/Password</string>
-    <string name="sign_in__with_email">Sign In With Email</string>
-    <string name="sign_in__with_facebook">Sign In With Facebook</string>
-    <string name="sign_in__with_google">Sign In With Google</string>
+    <string name="sign_in_with_email">Sign In With Email</string>
+    <string name="facebook">Facebook</string>
+    <string name="google">Google</string>
     <string name="log_out">Log Out</string>
 
     <string name="edit_profile">Edit Profile</string>
+    <string name="change_email">Change Email</string>
+    <string name="verify_email">Verify Email</string>
     <string name="change_password">Change Password</string>
     <string name="current_password">Current Password</string>
     <string name="new_password">New Password</string>

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

@@ -5,11 +5,13 @@
 
 import com.anotherdev.firebase.auth.provider.EmailAuthCredential;
 import com.anotherdev.firebase.auth.provider.IdpAuthCredential;
+import com.anotherdev.firebase.auth.provider.Provider;
 import com.anotherdev.firebase.auth.rest.api.model.SendPasswordResetEmailRequest;
 import com.anotherdev.firebase.auth.rest.api.model.SendPasswordResetEmailResponse;
 import com.google.firebase.FirebaseApp;
 
 import io.reactivex.rxjava3.annotations.CheckReturnValue;
+import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
 
@@ -28,6 +30,8 @@ public interface FirebaseAuth {
 
     boolean isSignedIn();
 
+    boolean isSignedInWith(Provider provider);
+
     @NonNull
     @CheckReturnValue
     Observable<FirebaseAuth> authStateChanges();
@@ -64,6 +68,10 @@ public interface FirebaseAuth {
     @CheckReturnValue
     Single<SignInResponse> linkWithCredential(@NonNull FirebaseUser user, @NonNull IdpAuthCredential credential);
 
+    @NonNull
+    @CheckReturnValue
+    Completable unlink(@NonNull FirebaseUser user, @NonNull String provider);
+
     @NonNull
     @CheckReturnValue
     Single<SendPasswordResetEmailResponse> sendPasswordResetEmail(SendPasswordResetEmailRequest request);

app/src/main/res/menu/menu_login.xml

@@ -15,6 +15,10 @@ public class FirebaseAuthRest {
             Collections.unmodifiableCollection(TOKEN_REFRESHER_MAP.values());
 
 
+    public static FirebaseAuth getInstance() {
+        return getInstance(FirebaseApp.getInstance());
+    }
+
     public static FirebaseAuth getInstance(FirebaseApp app) {
         final String name = app.getName();
         RestAuthTokenRefresher tokenRefresher = TOKEN_REFRESHER_MAP.get(name);

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

@@ -4,6 +4,8 @@
 import androidx.annotation.Nullable;
 
 import com.anotherdev.firebase.auth.provider.AuthCredential;
+import com.anotherdev.firebase.auth.provider.Provider;
+import com.anotherdev.firebase.auth.rest.api.model.SendEmailVerificationResponse;
 import com.google.gson.JsonObject;
 
 import java.util.List;
@@ -31,15 +33,23 @@ public interface FirebaseUser {
     @Nullable
     String getEmail();
 
+    boolean isEmailVerified();
+
     @NonNull
     List<UserInfo> getProviderData();
 
     boolean isAnonymous();
 
+    boolean isSignedInWith(@NonNull Provider provider);
+
     @NonNull
     @CheckReturnValue
     Single<SignInResponse> linkWithCredential(@NonNull AuthCredential credential);
 
+    @NonNull
+    @CheckReturnValue
+    Completable unlink(@NonNull String provider);
+
     @NonNull
     @CheckReturnValue
     Single<SignInResponse> reauthenticate(@NonNull AuthCredential credential);
@@ -52,7 +62,15 @@ public interface FirebaseUser {
     @CheckReturnValue
     Completable updateProfile(@NonNull UserProfileChangeRequest request);
 
+    @NonNull
+    @CheckReturnValue
+    Completable updateEmail(@NonNull String newEmail);
+
     @NonNull
     @CheckReturnValue
     Completable updatePassword(@NonNull String newPassword);
+
+    @NonNull
+    @CheckReturnValue
+    Single<SendEmailVerificationResponse> sendEmailVerification();
 }