Merge pull request #9 from anotherdev/pk/feature-google-sign-in-on-hms

anotherdev · web-flow · commit a8343abeafab · 2020-10-15T16:24:01.000+07:00
Feature: Google Sign-In on HMS
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,6 +5,17 @@ android {
     def APP_NAME = "AuthRest"
     def APP_TITLE = "Firebase Auth REST API"
 
+    Properties properties = new Properties()
+    def propertiesFile = file('../local.properties')
+    if (propertiesFile.canRead()) {
+        properties.load(new FileInputStream(propertiesFile))
+        def KEYSTORE_FILE_KEY = "keystore.file"
+        if (properties.containsKey(KEYSTORE_FILE_KEY)) {
+            // Override debug keystore if one specified
+            android.signingConfigs.debug.storeFile = file(properties[KEYSTORE_FILE_KEY])
+        }
+    }
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
@@ -14,6 +25,12 @@ android {
         versionCode rootProject.ext.fullVersionCode
         versionName rootProject.ext.versionName
 
+        def GOOGLE_CLIENT_SECRET = "google.client.secret"
+        if (!properties.containsKey(GOOGLE_CLIENT_SECRET)) {
+            project.logger.log(LogLevel.ERROR, String.format("Can't find property: \"%s\" in the local.properties file", GOOGLE_CLIENT_SECRET))
+        }
+        buildConfigField("String", "GOOGLE_CLIENT_SECRET", properties[GOOGLE_CLIENT_SECRET])
+
         resValue "string", "app_name", APP_NAME
         resValue "string", "app_title", APP_TITLE
 
@@ -28,14 +45,6 @@ android {
         }
     }
 
-    Properties properties = new Properties()
-    def propertiesFile = file('../local.properties')
-    if (propertiesFile.canRead()) {
-        properties.load(new FileInputStream(propertiesFile))
-        if (properties != null && properties.containsKey('keystore.file')) {
-            android.signingConfigs.debug.storeFile = file(properties['keystore.file'])
-        }
-    }
     project.logger.lifecycle('android.signingConfigs.debug.storeFile: ' + android.signingConfigs.debug.storeFile)
 
     buildTypes {
@@ -75,9 +84,9 @@ dependencies {
 
     implementation "com.github.HITGIF:TextFieldBoxes:1.4.5"
 
-    implementation "com.google.android.gms:play-services-auth:18.0.0"
+    implementation "com.google.android.gms:play-services-auth:18.1.0"
 
-    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.google.android.material:material:1.2.1"
 
     implementation platform("com.google.firebase:firebase-bom:$firebaseBomVersion")
     implementation "com.google.firebase:firebase-analytics"
@@ -92,6 +101,8 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.2.19"
     implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
 
+    implementation "net.openid:appauth:0.7.1"
+
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxTestJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxTestEspressoVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.anotherdev.sample.firebase.auth">
 
     <application
@@ -28,6 +29,19 @@
 
         <activity android:name="com.anotherdev.sample.firebase.auth.MainActivity" />
 
+        <activity
+            android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            tools:node="replace">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="@string/auth_google_scheme"
+                    android:host="@string/auth_google_host"
+                    android:path="@string/auth_google_path" />
+            </intent-filter>
+        </activity>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/anotherdev/sample/firebase/auth/LoginActivity.java b/app/src/main/java/com/anotherdev/sample/firebase/auth/LoginActivity.java
@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -37,15 +38,26 @@
 import com.facebook.login.widget.LoginButton;
 import com.github.florent37.inlineactivityresult.rx.RxInlineActivityResult;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.firebase.FirebaseApp;
 import com.yarolegovich.lovelydialog.LovelyTextInputDialog;
 
+import net.openid.appauth.AuthorizationRequest;
+import net.openid.appauth.AuthorizationResponse;
+import net.openid.appauth.AuthorizationService;
+import net.openid.appauth.AuthorizationServiceConfiguration;
+import net.openid.appauth.ClientSecretBasic;
+import net.openid.appauth.ResponseTypeValues;
+
 import butterknife.BindView;
 import hu.akarnokd.rxjava3.bridge.RxJavaBridge;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -66,6 +78,7 @@ public class LoginActivity extends BaseActivity {
 
     private final CallbackManager facebookCallbackManager = CallbackManager.Factory.create();
     private GoogleSignInClient googleSignInClient;
+    private AuthorizationService appAuthService;
 
     private FirebaseAuth firebaseAuth;
 
@@ -75,6 +88,13 @@ protected int getActivityLayoutRes() {
         return R.layout.activity_login;
     }
 
+    private AuthorizationService getAppAuthService() {
+        if (appAuthService == null) {
+            appAuthService = new AuthorizationService(this);
+        }
+        return appAuthService;
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -353,6 +373,52 @@ public void onSuccess(LoginResult loginResult) {
                 });
     }
 
+    private Observable<String> getGoogleIdTokenBySdk() {
+        return new RxInlineActivityResult(this)
+                .request(googleSignInClient.getSignInIntent())
+                .map(result -> GoogleSignIn.getSignedInAccountFromIntent(result.getData()).getResult())
+                .map(GoogleSignInAccount::getIdToken)
+                .as(RxJavaBridge.toV3Observable());
+    }
+
+    private Observable<String> getGoogleIdTokenByChromeCustomTab() {
+        AuthorizationServiceConfiguration asc = new AuthorizationServiceConfiguration(
+                Uri.parse("https://accounts.google.com/o/oauth2/v2/auth"),
+                Uri.parse("https://www.googleapis.com/oauth2/v4/token")
+        );
+
+        String clientId = getString(R.string.default_web_client_id);
+        Uri redirectUri = new Uri.Builder()
+                .scheme(getString(R.string.auth_google_scheme))
+                .authority(getString(R.string.auth_google_host))
+                .path(getString(R.string.auth_google_path))
+                .build();
+        AuthorizationRequest.Builder builder = new AuthorizationRequest.Builder(asc, clientId, ResponseTypeValues.CODE, redirectUri)
+                .setScopes("profile email")
+                .setPrompt(AuthorizationRequest.Prompt.LOGIN);
+
+        AuthorizationService service = getAppAuthService();
+        return new RxInlineActivityResult(this)
+                .request(service.getAuthorizationRequestIntent(builder.build()))
+                .flatMap(result -> {
+                    Intent data = result.getData();
+                    Throwable cause = result.getCause();
+                    return data != null ? io.reactivex.Observable.just(data) : io.reactivex.Observable.error(cause != null ? cause : new UnknownError());
+                })
+                .map(AuthorizationResponse::fromIntent)
+                .flatMap(authResponse -> io.reactivex.Observable.<String>create(emitter -> service.performTokenRequest(
+                        authResponse.createTokenExchangeRequest(),
+                        new ClientSecretBasic(BuildConfig.GOOGLE_CLIENT_SECRET),
+                        (tokenResponse, e) -> {
+                            if (tokenResponse != null) {
+                                emitter.onNext(tokenResponse.idToken);
+                            } else {
+                                emitter.onError(e);
+                            }
+                        })))
+                .as(RxJavaBridge.toV3Observable());
+    }
+
     private void setupSignInWithGoogleButton(FirebaseAuth firebaseAuth) {
         setupButton(firebaseAuth,
                 signInWithGoogleButton,
@@ -362,24 +428,22 @@ private void setupSignInWithGoogleButton(FirebaseAuth firebaseAuth) {
                         onDestroy.add(unlinkProvider(user, signInWithGoogleButton, Provider.GOOGLE, R.string.google)
                                 .subscribe(() -> {}, RxUtil.ON_ERROR_LOG_V3));
                     } else {
-                        onDestroy.add(RxJavaBridge
-                                .toV3Disposable(new RxInlineActivityResult(this)
-                                        .request(googleSignInClient.getSignInIntent())
-                                        .map(result -> {
-                                            Intent data = result.getData();
-                                            return GoogleSignIn.getSignedInAccountFromIntent(data)
-                                                    .getResult();
-                                        })
-                                        .flatMapSingle(account -> {
-                                            String token = account.getIdToken();
-                                            IdpAuthCredential credential = GoogleAuthProvider.getCredential(token);
-                                            return RxJavaBridge.toV2Single(firebaseAuth.signInWithCredential(credential));
-                                        })
-                                        .doOnError(e -> {
-                                            dialog(e);
-                                            googleSignInClient.signOut();
-                                        })
-                                        .subscribe(io.reactivex.internal.functions.Functions.emptyConsumer(), RxUtil.ON_ERROR_LOG_V2)));
+                        final boolean hasGms = ConnectionResult.SUCCESS == GoogleApiAvailability.getInstance()
+                                .isGooglePlayServicesAvailable(this);
+                        Observable<String> getGoogleIdToken = hasGms
+                                ? getGoogleIdTokenBySdk()
+                                : getGoogleIdTokenByChromeCustomTab();
+                        //noinspection ResultOfMethodCallIgnored
+                        getGoogleIdToken.doOnSubscribe(onDestroy::add)
+                                .flatMapSingle(token -> {
+                                    IdpAuthCredential credential = GoogleAuthProvider.getCredential(token);
+                                    return firebaseAuth.signInWithCredential(credential);
+                                })
+                                .doOnError(e -> {
+                                    dialog(e);
+                                    googleSignInClient.signOut();
+                                })
+                                .subscribe(Functions.emptyConsumer(), RxUtil.ON_ERROR_LOG_V3);
                     }
                 },
                 auth -> {
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <string name="auth_google_scheme">https</string>
+    <string name="auth_google_host">idp.anotherdev.com</string>
+    <string name="auth_google_path">"/auth/handler/huawei-dtse"</string>
+
+</resources>
diff --git a/build.gradle b/build.gradle
@@ -8,12 +8,12 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -25,7 +25,7 @@ ext {
     targetCompatibility = JavaVersion.VERSION_1_8
 
     // Libraries
-    androidxAppCompatVersion = '1.1.0'
+    androidxAppCompatVersion = '1.2.0'
     androidxCoreKtxVersion = '1.3.1'
     androidxLifecycleVersion = '2.2.0'
     firebaseBomVersion = '25.6.0'
@@ -38,6 +38,6 @@ ext {
     timberVersion = '4.7.1'
 
     junitVersion = '4.13'
-    androidxTestJunitVersion = '1.1.1'
-    androidxTestEspressoVersion = '3.2.0'
+    androidxTestJunitVersion = '1.1.2'
+    androidxTestEspressoVersion = '3.3.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ buildscript {`
`8`	`8`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:4.0.1'`
	`11`	`+ classpath 'com.android.tools.build:gradle:4.0.2'`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`
`14`	`14`	`// in the individual module build.gradle files`
`15`	`15`
`16`		`- classpath 'com.google.gms:google-services:4.3.3'`
	`16`	`+ classpath 'com.google.gms:google-services:4.3.4'`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`