Refactor SignInResponse to Immutables. Add UserProfileChangeResponse because the object returned from REST API is not a SignInResponse (no refresh token).

Author: anotherdev

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

@@ -1,32 +1,35 @@
 package com.anotherdev.firebase.auth;
 
-@SuppressWarnings("WeakerAccess")
-public class SignInResponse {
+import androidx.annotation.Nullable;
 
-    String idToken;
-    String email;
-    String refreshToken;
-    String expiresIn;
-    String localId;
+import com.google.gson.annotations.SerializedName;
 
+import org.immutables.gson.Gson;
+import org.immutables.value.Value;
 
-    public String getIdToken() {
-        return idToken;
-    }
+@Value.Immutable
+@Value.Style(strictBuilder = true)
+@Gson.TypeAdapters
+public interface SignInResponse {
 
-    public String getEmail() {
-        return email;
-    }
+    @SerializedName("idToken")
+    String getIdToken();
 
-    public String getRefreshToken() {
-        return refreshToken;
-    }
+    @Nullable
+    @SerializedName("email")
+    String getEmail();
+
+    @SerializedName("refreshToken")
+    String getRefreshToken();
+
+    @SerializedName("expiresIn")
+    String getExpiresIn();
+
+    @SerializedName("localId")
+    String getLocalId();
 
-    public String getExpiresIn() {
-        return expiresIn;
-    }
 
-    public String getLocalId() {
-        return localId;
+    static ImmutableSignInResponse.Builder builder() {
+        return ImmutableSignInResponse.builder();
     }
 }

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

@@ -0,0 +1,22 @@
+package com.anotherdev.firebase.auth;
+
+@SuppressWarnings("WeakerAccess")
+public class UserProfileChangeResponse {
+
+    String localId;
+    String email;
+    String displayName;
+
+
+    public String getLocalId() {
+        return localId;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+}

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

@@ -2,6 +2,7 @@
 
 import com.anotherdev.firebase.auth.SignInResponse;
 import com.anotherdev.firebase.auth.UserProfileChangeRequest;
+import com.anotherdev.firebase.auth.UserProfileChangeResponse;
 import com.anotherdev.firebase.auth.rest.api.model.IdTokenRequest;
 import com.anotherdev.firebase.auth.rest.api.model.SignInRequest;
 import com.anotherdev.firebase.auth.rest.api.model.SignInWithCustomTokenRequest;
@@ -39,7 +40,7 @@ public interface IdentityToolkitApi {
     Single<JsonObject> getAccounts(@Body IdTokenRequest request);
 
     @POST("v1/accounts:update")
-    Single<SignInResponse> updateProfile(@Body UserProfileChangeRequest request);
+    Single<UserProfileChangeResponse> updateProfile(@Body UserProfileChangeRequest request);
 
     @POST("v1/accounts:update")
     Single<SignInResponse> updatePassword(@Body UserPasswordChangeRequest request);