fix some profile data doesn't update when send modification commands

Author: anotherdev

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

@@ -220,14 +220,7 @@ public Single<SignInResponse> reauthenticate(@NonNull AuthCredential credential)
     @NonNull
     @Override
     public Completable reload() {
-        return Completable.fromAction(() -> {
-            if (idToken != null) {
-                getAuthInternal().getAccountInfo(idToken);
-            } else {
-                String error = String.format("idToken is null. Cannot reload user: %s", getUid());
-                throw new IllegalStateException(error);
-            }
-        });
+        return Completable.fromAction(() -> getAuthInternal().getAccountInfo());
     }
 
     @NonNull
@@ -236,8 +229,8 @@ public Completable updateProfile(@NonNull UserProfileChangeRequest request) {
         return Single.just(ImmutableUserProfileChangeRequest.copyOf(request))
                 .map(req -> req.withIdToken(idToken))
                 .flatMap(req -> RestAuthApi.auth().updateProfile(req))
-                .doOnSuccess(response -> getAuthInternal().getAccessToken(true))
-                .flatMapCompletable(ignored -> Completable.complete());
+                .flatMap(response -> getAuthInternal().exchangeToken())
+                .flatMapCompletable(ignored -> reload());
     }
 
     @NonNull
@@ -249,8 +242,8 @@ public Completable updateEmail(@NonNull String newEmail) {
                         .email(email)
                         .build())
                 .flatMap(req -> RestAuthApi.auth().updateEmail(req))
-                .doOnSuccess(response -> getAuthInternal().saveCurrentUser(response))
-                .flatMapCompletable(ignored -> Completable.complete());
+                .map(response -> getAuthInternal().saveCurrentUser(response))
+                .flatMapCompletable(response -> reload());
     }
 
     @NonNull

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

@@ -21,6 +21,7 @@
 import com.anotherdev.firebase.auth.provider.Provider;
 import com.anotherdev.firebase.auth.rest.api.RestAuthApi;
 import com.anotherdev.firebase.auth.rest.api.model.ExchangeTokenRequest;
+import com.anotherdev.firebase.auth.rest.api.model.ExchangeTokenResponse;
 import com.anotherdev.firebase.auth.rest.api.model.GetAccountInfoRequest;
 import com.anotherdev.firebase.auth.rest.api.model.GetAccountInfoResponse;
 import com.anotherdev.firebase.auth.rest.api.model.ImmutableSignInWithEmailPasswordRequest;
@@ -296,6 +297,21 @@ public Task<GetTokenResult> getAccessToken(boolean forceRefresh) {
         return source.getTask();
     }
 
+    public Single<ExchangeTokenResponse> exchangeToken() {
+        return exchangeToken(userStore.get());
+    }
+
+    public Single<ExchangeTokenResponse> exchangeToken(@NonNull FirebaseUserImpl user) {
+        return Single.fromCallable(user::getRefreshToken)
+                .map(token -> ExchangeTokenRequest.builder().refreshToken(token).build())
+                .flatMap(request -> RestAuthApi.token().exchangeToken(request))
+                .doOnError(e -> Timber.tag("http").e(e))
+                .map(response -> {
+                    saveCurrentUser(response.getIdToken(), response.getRefreshToken());
+                    return response;
+                });
+    }
+
     @Nullable
     @Override
     public String getUid() {
@@ -334,6 +350,10 @@ private SignInResponse getAccountInfo(SignInResponse signInResponse) {
         return signInResponse;
     }
 
+    public void getAccountInfo() {
+        getAccountInfo(userStore.get().getIdToken());
+    }
+
     @WorkerThread
     public void getAccountInfo(@NonNull String idToken) {
         GetAccountInfoRequest request = GetAccountInfoRequest.builder()