Merge pull request #3 from anotherdev/pk/firebase-user-api

Enhance FirebaseUser API

Author: anotherdev

app/build.gradle

@@ -60,7 +60,7 @@ dependencies {
 
     implementation "com.google.android.material:material:1.1.0"
 
-    implementation platform("com.google.firebase:firebase-bom:25.2.2")
+    implementation platform("com.google.firebase:firebase-bom:$firebaseBomVersion")
     implementation "com.google.firebase:firebase-analytics"
     implementation "com.google.firebase:firebase-database"
 

buildsystem/dependencies.gradle

@@ -2,7 +2,7 @@ ext {
     // Manifest version information!
     def versionMajor = 0
     def versionMinor = 1
-    def versionPatch = 2
+    def versionPatch = 3
     def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
     // Eko SDK version
@@ -28,6 +28,7 @@ ext {
     androidxAppCompatVersion = '1.1.0'
     androidxCoreKtxVersion = '1.2.0'
     androidxLifecycleVersion = '2.2.0'
+    firebaseBomVersion = '25.3.1'
     gsonVersion = '2.8.6'
     immutablesVersion = '2.8.2'
     okhttpVersion = '4.4.1'

firebase-auth-rest/core/build.gradle

@@ -72,7 +72,7 @@ dependencies {
 
     api "com.google.code.gson:gson:$gsonVersion"
 
-    implementation platform("com.google.firebase:firebase-bom:25.2.2")
+    implementation platform("com.google.firebase:firebase-bom:$firebaseBomVersion")
     implementation "com.google.firebase:firebase-auth-interop:19.0.0"
     api "com.google.firebase:firebase-common"
     implementation "com.google.firebase:firebase-core"

firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/FirebaseUser.java

@@ -4,7 +4,11 @@
 import androidx.annotation.Nullable;
 
 import com.anotherdev.firebase.auth.provider.AuthCredential;
+import com.google.gson.JsonObject;
 
+import java.util.List;
+
+import io.reactivex.rxjava3.annotations.CheckReturnValue;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Single;
 
@@ -15,6 +19,9 @@ public interface FirebaseUser {
     @Nullable
     String getIdToken();
 
+    @NonNull
+    JsonObject getUserInfo();
+
     @Nullable
     String getUid();
 
@@ -25,14 +32,27 @@ public interface FirebaseUser {
     String getEmail();
 
     @NonNull
+    List<UserInfo> getProviderData();
+
+    boolean isAnonymous();
+
+    @NonNull
+    @CheckReturnValue
     Single<SignInResponse> linkWithCredential(@NonNull AuthCredential credential);
 
     @NonNull
+    @CheckReturnValue
     Single<SignInResponse> reauthenticate(@NonNull AuthCredential credential);
 
     @NonNull
+    @CheckReturnValue
+    Completable reload();
+
+    @NonNull
+    @CheckReturnValue
     Completable updateProfile(@NonNull UserProfileChangeRequest request);
 
     @NonNull
+    @CheckReturnValue
     Completable updatePassword(@NonNull String newPassword);
 }

firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/UserInfo.java

@@ -0,0 +1,39 @@
+package com.anotherdev.firebase.auth;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.immutables.gson.Gson;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@Value.Style(strictBuilder = true)
+@Gson.TypeAdapters
+public interface UserInfo {
+
+    @SerializedName("rawId")
+    String getUid();
+
+    @Value.Default
+    @SerializedName("displayName")
+    default String getDisplayName() {
+        return "";
+    }
+
+    @Value.Default
+    @SerializedName("email")
+    default String getEmail() {
+        return "";
+    }
+
+    @Value.Default
+    @SerializedName("photoUrl")
+    default String getPhotoUrl() {
+        return "";
+    }
+
+    @Value.Default
+    @SerializedName("providerId")
+    default String getProviderId() {
+        return "";
+    }
+}

firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/data/Data.java

@@ -6,6 +6,8 @@
 import androidx.annotation.NonNull;
 
 import com.anotherdev.firebase.auth.data.model.FirebaseUserImpl;
+import com.anotherdev.firebase.auth.data.model.UserProfile;
+import com.anotherdev.firebase.auth.init.AppContext;
 import com.anotherdev.firebase.auth.util.FarGson;
 import com.f2prateek.rx.preferences2.Preference;
 import com.f2prateek.rx.preferences2.RxSharedPreferences;
@@ -15,37 +17,40 @@ public class Data {
 
     private static final Gson GSON = FarGson.get();
 
-    private final RxSharedPreferences rxSharedPreferences;
+    private static class DataHolder {
+        private static final SharedPreferences SHARED_PREFERENCES;
+        private static final RxSharedPreferences RX_SHARED_PREFERENCES;
+
+        static {
+            Context context = AppContext.get();
+            SHARED_PREFERENCES = context.getSharedPreferences(Data.class.getName(), Context.MODE_PRIVATE);
+            RX_SHARED_PREFERENCES = RxSharedPreferences.create(SHARED_PREFERENCES);
+        }
+    }
 
 
     private Data(Context context) {
-        SharedPreferences pref = context.getSharedPreferences(Data.class.getName(), Context.MODE_PRIVATE);
-        rxSharedPreferences = RxSharedPreferences.create(pref);
     }
 
     public Preference<String> getApiKey() {
-        return rxSharedPreferences.getString("google_api_key", "");
+        return DataHolder.RX_SHARED_PREFERENCES.getString("google_api_key", "");
     }
 
     public Preference<FirebaseUserImpl> getCurrentUser(@NonNull FirebaseUserImpl defaultValue) {
-        return rxSharedPreferences.getObject(
+        return DataHolder.RX_SHARED_PREFERENCES.getObject(
                 "current_user_info",
                 defaultValue,
-                new Preference.Converter<FirebaseUserImpl>() {
-                    @NonNull
-                    @Override
-                    public FirebaseUserImpl deserialize(@NonNull String json) {
-                        return GSON.fromJson(json, FirebaseUserImpl.class);
-                    }
-
-                    @NonNull
-                    @Override
-                    public String serialize(@NonNull FirebaseUserImpl user) {
-                        return GSON.toJson(user);
-                    }
-                });
+                new RxPreferenceGsonConverter<>(FirebaseUserImpl.class));
     }
 
+    public Preference<UserProfile> getUserProfile(@NonNull final String uid) {
+        return DataHolder.RX_SHARED_PREFERENCES.getObject(
+                uid,
+                UserProfile.builder().localId(uid).build(),
+                new RxPreferenceGsonConverter<>(UserProfile.class));
+    }
+
+
     public static Data from(Context context) {
         return new Data(context);
     }

firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/data/RxPreferenceGsonConverter.java

@@ -0,0 +1,30 @@
+package com.anotherdev.firebase.auth.data;
+
+import androidx.annotation.NonNull;
+
+import com.anotherdev.firebase.auth.util.FarGson;
+import com.f2prateek.rx.preferences2.Preference;
+import com.google.gson.Gson;
+
+class RxPreferenceGsonConverter<T> implements Preference.Converter<T> {
+
+    private final Gson GSON = FarGson.get();
+    private final Class<T> valueType;
+
+
+    RxPreferenceGsonConverter(Class<T> valueType) {
+        this.valueType = valueType;
+    }
+
+    @NonNull
+    @Override
+    public T deserialize(@NonNull String json) {
+        return GSON.fromJson(json, valueType);
+    }
+
+    @NonNull
+    @Override
+    public String serialize(@NonNull T value) {
+        return GSON.toJson(value);
+    }
+}

firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/data/model/FirebaseAuthData.java

@@ -0,0 +1,29 @@
+package com.anotherdev.firebase.auth.data.model;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+
+@SuppressWarnings("WeakerAccess")
+class FirebaseAuthData {
+
+    @SerializedName("identities")
+    FirebaseAuthIdentities identities = new FirebaseAuthIdentities();
+
+    @SerializedName("sign_in_provider")
+    String signInProvider = "unknown";
+
+
+    FirebaseAuthData() {
+    }
+
+    @NonNull
+    public FirebaseAuthIdentities getIdentities() {
+        return identities;
+    }
+
+    @NonNull
+    public String getSignInProvider() {
+        return signInProvider;
+    }
+}

firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/data/model/FirebaseAuthIdentities.java

@@ -0,0 +1,43 @@
+package com.anotherdev.firebase.auth.data.model;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Collections;
+import java.util.List;
+
+@SuppressWarnings("WeakerAccess")
+class FirebaseAuthIdentities {
+
+    @SerializedName("google.com")
+    List<String> google = Collections.emptyList();
+
+    @SerializedName("facebook.com")
+    List<String> facebook = Collections.emptyList();
+
+    @SerializedName("email")
+    List<String> email = Collections.emptyList();
+
+
+    @NonNull
+    public List<String> getGoogle() {
+        return google;
+    }
+
+    @NonNull
+    public List<String> getFacebook() {
+        return facebook;
+    }
+
+    @NonNull
+    public List<String> getEmail() {
+        return email;
+    }
+
+    public boolean isEmpty() {
+        return google.isEmpty()
+                && facebook.isEmpty()
+                && email.isEmpty();
+    }
+}