Merge pull request #6 from anotherdev/pk/feature-account-linking

anotherdev · web-flow · commit bcc941aaefc2 · 2020-07-01T14:12:35.000+07:00
Feature account linking
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -2,7 +2,7 @@ ext {
     // Manifest version information!
     def versionMajor = 0
     def versionMinor = 1
-    def versionPatch = 4
+    def versionPatch = 5
     def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
     // Eko SDK version
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/AuthError.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/AuthError.java
@@ -33,9 +33,12 @@ public class AuthError {
     AuthError() {
     }
 
-    AuthError(int code, String message) {
+    AuthError(int code, @Nullable Throwable cause) {
         this.code = code;
-        this.message = message;
+        if (cause != null) {
+            this.cause = cause.getCause();
+            this.message = cause.getMessage();
+        }
     }
 
     public int getCode() {
@@ -96,7 +99,7 @@ public static AuthError fromThrowable(@Nullable Throwable t) {
             }
             cause = cause.getCause();
         }
-        return t != null ? new AuthError(ERROR_CLIENT, t.toString()) : UNKNOWN;
+        return new AuthError(ERROR_CLIENT, t);
     }
 
     private static boolean isClientSideNetworkError(@NonNull Throwable t) {
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/FirebaseAuth.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/FirebaseAuth.java
@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.anotherdev.firebase.auth.provider.EmailAuthCredential;
 import com.anotherdev.firebase.auth.provider.IdpAuthCredential;
 import com.anotherdev.firebase.auth.rest.api.model.SendPasswordResetEmailRequest;
 import com.anotherdev.firebase.auth.rest.api.model.SendPasswordResetEmailResponse;
@@ -43,6 +44,10 @@ public interface FirebaseAuth {
     @CheckReturnValue
     Single<SignInResponse> signInWithEmailAndPassword(@NonNull String email, @NonNull String password);
 
+    @NonNull
+    @CheckReturnValue
+    Single<SignInResponse> signInWithEmailAndPassword(@NonNull EmailAuthCredential credential);
+
     @NonNull
     @CheckReturnValue
     Single<SignInResponse> signInWithCredential(@NonNull IdpAuthCredential credential);
@@ -51,6 +56,10 @@ public interface FirebaseAuth {
     @CheckReturnValue
     Single<SignInResponse> signInWithCustomToken(@NonNull String customToken);
 
+    @NonNull
+    @CheckReturnValue
+    Single<SignInResponse> linkWithCredential(@NonNull FirebaseUser user, @NonNull EmailAuthCredential credential);
+
     @NonNull
     @CheckReturnValue
     Single<SignInResponse> linkWithCredential(@NonNull FirebaseUser user, @NonNull IdpAuthCredential credential);
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/internal/CustomFirebaseExceptions.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/internal/CustomFirebaseExceptions.java
@@ -0,0 +1,42 @@
+package com.anotherdev.firebase.auth.internal;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.anotherdev.firebase.auth.util.Strings;
+import com.google.gson.JsonObject;
+
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.ResponseBody;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class CustomFirebaseExceptions {
+
+    @NonNull
+    public static HttpException createCustom(int code, @Nullable String message) {
+        JsonObject error = createFirebaseExceptionJson(code, message);
+        MediaType mediaType = MediaType.parse("application/json; charset=UTF-8");
+        okhttp3.Response rawResponse = new okhttp3.Response.Builder()
+                .code(code)
+                .message(Strings.nullToEmpty(message))
+                .protocol(Protocol.QUIC)
+                .request(new Request.Builder().url("http://localhost/").build())
+                .build();
+        ResponseBody errorBody = ResponseBody.create(error.toString(), mediaType);
+        Response<?> errorResponse = Response.error(errorBody, rawResponse);
+        return new HttpException(errorResponse);
+    }
+
+    @NonNull
+    private static JsonObject createFirebaseExceptionJson(int code, @Nullable String message) {
+        JsonObject error = new JsonObject();
+        error.addProperty("code", code);
+        error.addProperty("message", message);
+        JsonObject json = new JsonObject();
+        json.add("error", error);
+        return json;
+    }
+}
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/provider/IdpAuthCredential.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/provider/IdpAuthCredential.java
@@ -12,6 +12,7 @@ public interface IdpAuthCredential extends AuthCredential {
     @NonNull
     String getPostBody();
 
+    @Deprecated
     default boolean returnIdpCredential() {
         return true;
     }
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/rest/RestAuthProvider.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/rest/RestAuthProvider.java
@@ -11,11 +11,15 @@
 import com.anotherdev.firebase.auth.data.Data;
 import com.anotherdev.firebase.auth.data.model.FirebaseUserImpl;
 import com.anotherdev.firebase.auth.data.model.UserProfile;
+import com.anotherdev.firebase.auth.internal.CustomFirebaseExceptions;
+import com.anotherdev.firebase.auth.provider.EmailAuthCredential;
+import com.anotherdev.firebase.auth.provider.EmailAuthProvider;
 import com.anotherdev.firebase.auth.provider.IdpAuthCredential;
 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.GetAccountInfoRequest;
 import com.anotherdev.firebase.auth.rest.api.model.GetAccountInfoResponse;
+import com.anotherdev.firebase.auth.rest.api.model.ImmutableSignInWithEmailPasswordRequest;
 import com.anotherdev.firebase.auth.rest.api.model.ImmutableSignInWithIdpRequest;
 import com.anotherdev.firebase.auth.rest.api.model.SendPasswordResetEmailRequest;
 import com.anotherdev.firebase.auth.rest.api.model.SendPasswordResetEmailResponse;
@@ -25,6 +29,7 @@
 import com.anotherdev.firebase.auth.rest.api.model.SignInWithIdpRequest;
 import com.anotherdev.firebase.auth.util.IdTokenParser;
 import com.anotherdev.firebase.auth.util.RxUtil;
+import com.anotherdev.firebase.auth.util.Strings;
 import com.f2prateek.rx.preferences2.Preference;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -116,14 +121,15 @@ public Single<SignInResponse> createUserWithEmailAndPassword(@NonNull String ema
     @NonNull
     @Override
     public Single<SignInResponse> signInWithEmailAndPassword(@NonNull String email, @NonNull String password) {
-        SignInWithEmailPasswordRequest request = SignInWithEmailPasswordRequest.builder()
-                .email(email)
-                .password(password)
-                .build();
-        return RestAuthApi.auth()
-                .signInWithEmailAndPassword(request)
-                .map(this::saveCurrentUser)
-                .map(this::getAccountInfo);
+        EmailAuthCredential credential = EmailAuthProvider.getCredential(email, password);
+        return signInWithEmailAndPassword(credential);
+    }
+
+    @NonNull
+    @Override
+    public Single<SignInResponse> signInWithEmailAndPassword(@NonNull EmailAuthCredential credential) {
+        ImmutableSignInWithEmailPasswordRequest.Builder builder = SignInWithEmailPasswordRequest.builder();
+        return performSignInWithEmailAndPassword(builder, credential);
     }
 
     @NonNull
@@ -145,15 +151,35 @@ public Single<SignInResponse> signInWithCustomToken(@NonNull String customToken)
                 .map(this::getAccountInfo);
     }
 
+    @NonNull
+    @Override
+    public Single<SignInResponse> linkWithCredential(@NonNull FirebaseUser user, @NonNull EmailAuthCredential credential) {
+        ImmutableSignInWithEmailPasswordRequest.Builder builder = SignInWithEmailPasswordRequest.builder()
+                .idToken(user.getIdToken());
+        return performSignInWithEmailAndPassword(builder, credential);
+    }
+
+    private Single<SignInResponse> performSignInWithEmailAndPassword(@NonNull ImmutableSignInWithEmailPasswordRequest.Builder builder,
+                                                                     @NonNull EmailAuthCredential credential) {
+        SignInWithEmailPasswordRequest request = builder
+                .email(credential.getEmail())
+                .password(credential.getPassword())
+                .build();
+        return RestAuthApi.auth()
+                .signInWithEmailAndPassword(request)
+                .map(this::saveCurrentUser)
+                .map(this::getAccountInfo);
+    }
+
     @NonNull
     @Override
     public Single<SignInResponse> linkWithCredential(@NonNull FirebaseUser user, @NonNull IdpAuthCredential credential) {
-        String idToken = user.getIdToken();
-        ImmutableSignInWithIdpRequest.Builder builder = SignInWithIdpRequest.builder().idToken(idToken);
+        ImmutableSignInWithIdpRequest.Builder builder = SignInWithIdpRequest.builder()
+                .idToken(user.getIdToken());
         return performSignInWithCredential(builder, credential);
     }
 
-    private Single<SignInResponse> performSignInWithCredential(ImmutableSignInWithIdpRequest.Builder builder,
+    private Single<SignInResponse> performSignInWithCredential(@NonNull ImmutableSignInWithIdpRequest.Builder builder,
                                                                @NonNull IdpAuthCredential credential ) {
         SignInWithIdpRequest request = builder
                 .requestUri(credential.getRequestUri(this))
@@ -162,7 +188,23 @@ private Single<SignInResponse> performSignInWithCredential(ImmutableSignInWithId
         return RestAuthApi.auth()
                 .signInWithCredential(request)
                 .map(this::saveCurrentUser)
-                .map(this::getAccountInfo);
+                .map(this::getAccountInfo)
+                .onErrorResumeNext(e -> {
+                    final String originalMessage = Strings.nullToEmpty(e.getMessage());
+                    if (e instanceof IllegalStateException
+                            && originalMessage.contains("required attributes are not set")
+                            && originalMessage.contains("refreshToken")) {
+                        Timber.i(e, "Firebase return 200 but without refresh token");
+                        String baseErrorMessage = String.format("Sign in with %s failed.", credential.getProvider());
+                        StringBuilder error = new StringBuilder(baseErrorMessage);
+                        if (!isSignedIn()) {
+                            error.append(" Maybe the account is not properly linked.");
+                        }
+                        return Single.error(CustomFirebaseExceptions.createCustom(400, error.toString()));
+                    } else {
+                        return Single.error(e);
+                    }
+                });
     }
 
     @NonNull
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/rest/api/model/SignInWithEmailPasswordRequest.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/rest/api/model/SignInWithEmailPasswordRequest.java
@@ -8,7 +8,7 @@
 @Value.Immutable
 @Value.Style(strictBuilder = true)
 @Gson.TypeAdapters
-public interface SignInWithEmailPasswordRequest extends SignInRequest {
+public interface SignInWithEmailPasswordRequest extends SignInRequest, OptionalIdTokenRequest {
 
     @SerializedName("email")
     String getEmail();
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/rest/api/model/SignInWithIdpRequest.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/rest/api/model/SignInWithIdpRequest.java
@@ -1,7 +1,5 @@
 package com.anotherdev.firebase.auth.rest.api.model;
 
-import androidx.annotation.Nullable;
-
 import com.google.gson.annotations.SerializedName;
 
 import org.immutables.gson.Gson;
@@ -10,11 +8,7 @@
 @Value.Immutable
 @Value.Style(strictBuilder = true)
 @Gson.TypeAdapters
-public interface SignInWithIdpRequest extends SignInRequest, IdTokenRequest {
-
-    @Nullable
-    @Override
-    String getIdToken();
+public interface SignInWithIdpRequest extends SignInRequest, OptionalIdTokenRequest {
 
     @SerializedName("requestUri")
     String getRequestUri();
diff --git a/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/util/Strings.java b/firebase-auth-rest/core/src/main/java/com/anotherdev/firebase/auth/util/Strings.java
@@ -0,0 +1,15 @@
+package com.anotherdev.firebase.auth.util;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public final class Strings {
+
+    private Strings() {}
+
+
+    @NonNull
+    public static String nullToEmpty(@Nullable String string) {
+        return (string == null) ? "" : string;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,12 @@ public class AuthError {`
`33`	`33`	`AuthError() {`
`34`	`34`	`}`
`35`	`35`
`36`		`- AuthError(int code, String message) {`
	`36`	`+ AuthError(int code, @Nullable Throwable cause) {`
`37`	`37`	`this.code = code;`
`38`		`- this.message = message;`
	`38`	`+ if (cause != null) {`
	`39`	`+ this.cause = cause.getCause();`
	`40`	`+ this.message = cause.getMessage();`
	`41`	`+ }`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`public int getCode() {`
`@@ -96,7 +99,7 @@ public static AuthError fromThrowable(@Nullable Throwable t) {`
`96`	`99`	`}`
`97`	`100`	`cause = cause.getCause();`
`98`	`101`	`}`
`99`		`- return t != null ? new AuthError(ERROR_CLIENT, t.toString()) : UNKNOWN;`
	`102`	`+ return new AuthError(ERROR_CLIENT, t);`
`100`	`103`	`}`
`101`	`104`
`102`	`105`	`private static boolean isClientSideNetworkError(@NonNull Throwable t) {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public interface IdpAuthCredential extends AuthCredential {`
`12`	`12`	`@NonNull`
`13`	`13`	`String getPostBody();`
`14`	`14`
	`15`	`+ @Deprecated`
`15`	`16`	`default boolean returnIdpCredential() {`
`16`	`17`	`return true;`
`17`	`18`	`}`