fix auth state change not broadcast to listeners due to some listeners are in different RestAuthProvider instance

Author: anotherdev

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) {