Merge pull request #7 from anotherdev/pk/bugfix-sync-auth-state

Fixed sync auth state not broadcast to all listeners

Author: anotherdev

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

@@ -7,16 +7,13 @@
 
 import androidx.annotation.NonNull;
 
-import com.anotherdev.firebase.auth.FirebaseAuthRest;
-import com.anotherdev.firebase.auth.util.RxUtil;
 import com.anotherdev.sample.firebase.auth.intent.LoginIntent;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 
 import butterknife.BindView;
-import io.reactivex.rxjava3.internal.functions.Functions;
 import studio.carbonylgroup.textfieldboxes.ExtendedEditText;
 import studio.carbonylgroup.textfieldboxes.TextFieldBoxes;
 
@@ -63,15 +60,6 @@ protected void onCreate(Bundle savedInstanceState) {
                 .addValueEventListener(new FarValueEventListener(privateTextFieldBoxes, privateEditText));
         globalPublicListener = globalPublicPath
                 .addValueEventListener(new FarValueEventListener(globalPublicTextFieldBoxes, globalPublicEditText));
-
-        onDestroy.add(FirebaseAuthRest.getInstance(app)
-                .authStateChanges()
-                .doOnNext(auth -> {
-                    Log.w(TAG, "authStateChanges() isSignedIn: " + auth.isSignedIn());
-                    rtdb.goOffline();
-                    rtdb.goOnline();
-                })
-                .subscribe(Functions.emptyConsumer(), RxUtil.ON_ERROR_LOG_V3));
     }
 
     @Override

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

buildsystem/dependencies.gradle

@@ -2,7 +2,7 @@ ext {
     // Manifest version information!
     def versionMajor = 0
     def versionMinor = 1
-    def versionPatch = 5
+    def versionPatch = 6
     def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
     // Eko SDK version
@@ -26,18 +26,18 @@ ext {
 
     // Libraries
     androidxAppCompatVersion = '1.1.0'
-    androidxCoreKtxVersion = '1.2.0'
+    androidxCoreKtxVersion = '1.3.1'
     androidxLifecycleVersion = '2.2.0'
-    firebaseBomVersion = '25.3.1'
+    firebaseBomVersion = '25.6.0'
     gsonVersion = '2.8.6'
     immutablesVersion = '2.8.2'
-    okhttpVersion = '4.4.1'
-    retrofitVersion = '2.7.2'
-    rxJava3Version = '3.0.1'
+    okhttpVersion = '4.8.0'
+    retrofitVersion = '2.9.0'
+    rxJava3Version = '3.0.4'
     rxJavaBridgeVersion = '3.0.0'
     timberVersion = '4.7.1'
 
-    junitVersion = '4.12'
+    junitVersion = '4.13'
     androidxTestJunitVersion = '1.1.1'
     androidxTestEspressoVersion = '3.2.0'
 }

firebase-auth-rest/core/build.gradle

@@ -68,7 +68,7 @@ dependencies {
     implementation 'com.f2prateek.rx.preferences2:rx-preferences:2.0.0'
 
     implementation "com.github.akarnokd:rxjava3-bridge:3.0.0"
-    implementation "com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0"
+    implementation "com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0" // FIXME migrate to official retrofit rxjava 3 adapter
 
     api "com.google.code.gson:gson:$gsonVersion"
 

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

@@ -6,23 +6,26 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class FirebaseAuthRest {
 
-    private static final Map<String, RestAuthTokenRefresher> TOKEN_REFRESHER_MAP = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<String, RestAuthTokenRefresher> TOKEN_REFRESHER_MAP = new ConcurrentHashMap<>();
     private static final Collection<RestAuthTokenRefresher> TOKEN_REFRESHER_VIEW =
             Collections.unmodifiableCollection(TOKEN_REFRESHER_MAP.values());
 
 
     public static FirebaseAuth getInstance(FirebaseApp app) {
         final String name = app.getName();
-        final RestAuthProvider auth = new RestAuthProvider(app);
-        if (!TOKEN_REFRESHER_MAP.containsKey(name)) {
-            TOKEN_REFRESHER_MAP.put(name, new RestAuthTokenRefresher(auth));
+        RestAuthTokenRefresher tokenRefresher = TOKEN_REFRESHER_MAP.get(name);
+        if (tokenRefresher == null) {
+            RestAuthProvider newAuth = new RestAuthProvider(app);
+            RestAuthTokenRefresher newTokenRefresher = new RestAuthTokenRefresher(newAuth);
+            RestAuthTokenRefresher current = TOKEN_REFRESHER_MAP.putIfAbsent(name, newTokenRefresher);
+            return current != null ? current.getAuth() : newTokenRefresher.getAuth();
+        } else {
+            return tokenRefresher.getAuth();
         }
-        return auth;
     }
 
     public static Collection<RestAuthTokenRefresher> getTokenRefreshers() {

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

@@ -1,5 +1,6 @@
 package com.anotherdev.firebase.auth.rest;
 
+import android.annotation.SuppressLint;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -64,6 +65,19 @@ public class RestAuthProvider implements FirebaseAuth, InternalAuthProvider {
     public RestAuthProvider(FirebaseApp app) {
         this.app = app;
         userStore = Data.from(app.getApplicationContext()).getCurrentUser(SIGNED_OUT);
+        initIdTokenBroadcast();
+    }
+
+    @SuppressLint("CheckResult")
+    private void initIdTokenBroadcast() {
+        //noinspection ResultOfMethodCallIgnored
+        userStore.asObservable()
+                .skip(1)
+                .subscribe(user -> {
+                    for (IdTokenListener listener : listeners) {
+                        listener.onIdTokenChanged(new InternalTokenResult(user.getIdToken()));
+                    }
+                }, RxUtil.ON_ERROR_LOG_V2);
     }
 
     @NonNull
@@ -290,10 +304,6 @@ private void saveCurrentUser(String idToken, String refreshToken) throws Firebas
 
         FirebaseUserImpl user = FirebaseUserImpl.from(app.getName(), idToken, refreshToken);
         userStore.set(user);
-
-        for (IdTokenListener l : listeners) {
-            l.onIdTokenChanged(new InternalTokenResult(idToken));
-        }
     }
 
     private SignInResponse getAccountInfo(SignInResponse signInResponse) {

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

@@ -25,6 +25,7 @@ public class RestAuthTokenRefresher implements IdTokenListener, LifecycleObserve
     private static final long MAX_RETRY_BACKOFF = MILLISECONDS.convert(5, MINUTES);
 
     private final Handler handler = new Handler();
+    @NonNull
     private final RestAuthProvider auth;
 
     private String ownerName;
@@ -33,10 +34,15 @@ public class RestAuthTokenRefresher implements IdTokenListener, LifecycleObserve
     private String lastToken;
 
 
-    public RestAuthTokenRefresher(RestAuthProvider auth) {
+    public RestAuthTokenRefresher(@NonNull RestAuthProvider auth) {
         this.auth = auth;
     }
 
+    @NonNull
+    public RestAuthProvider getAuth() {
+        return auth;
+    }
+
     @Override
     public void onIdTokenChanged(@NonNull InternalTokenResult result) {
         final String newToken = result.getToken();