capacitor-native-google-one-tap-signin 0.0.21 → 0.0.22

package/README.md

@@ -8,6 +8,8 @@ Currently the idToken, id (e-mail), displayName, givenName, familyName, profileP
 
 The user is automatically signed-in, without a prompt after the first sign-in.
 
+API version 29 or higher seems to be required for one-tap sign-in to work.
+
 
 # Demos
 See the `demo` folder.

package/android/build.gradle

@@ -14,7 +14,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 31
     defaultConfig {
-        minSdkVersion 22
+        minSdkVersion 29
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
@@ -44,10 +44,12 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.google.android.gms:play-services-auth:20.4.1'
+    implementation 'com.google.android.gms:play-services-tasks:18.0.2'
+    implementation 'com.google.android.gms:play-services-base:18.0.1'
 }
 

package/android/src/main/java/com/proventask/capacitor/GoogleOneTapAuth/GoogleOneTapAuth.java

@@ -1,6 +1,7 @@
 package com.proventask.capacitor.GoogleOneTapAuth;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
@@ -15,15 +16,12 @@ import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
-import com.google.android.gms.auth.api.credentials.Credentials;
-import com.google.android.gms.auth.api.credentials.CredentialsClient;
 import com.google.android.gms.auth.api.identity.BeginSignInRequest;
 import com.google.android.gms.auth.api.identity.BeginSignInResult;
 import com.google.android.gms.auth.api.identity.Identity;
 import com.google.android.gms.auth.api.identity.SignInClient;
-import com.google.android.gms.auth.api.signin.GoogleSignIn;
-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.android.gms.common.api.ApiException;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
@@ -34,8 +32,6 @@ public class GoogleOneTapAuth extends Plugin {
 
     private String androidClientId;
     private SignInClient oneTapClient;
-    private CredentialsClient mCredentialsClient;
-    private GoogleSignInClient mSignInClient;
     private PluginCall currentPluginCall = null;
     private ActivityResultLauncher<IntentSenderRequest> googleOneTapSignInActivityResultHandlerIntentSenderRequest;
     private boolean isSignInInProgress = false;
@@ -49,11 +45,6 @@ public class GoogleOneTapAuth extends Plugin {
         }
 
         oneTapClient = Identity.getSignInClient(this.getActivity());
-        mCredentialsClient = Credentials.getClient(this.getContext());
-        // DEFAULT_SIGN_IN scopes are id and profile, see GoogleSignInOptions
-        var gsoBuilder = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .requestIdToken(androidClientId);
-        mSignInClient = GoogleSignIn.getClient(this.getContext(), gsoBuilder.build());
 
         googleOneTapSignInActivityResultHandlerIntentSenderRequest = bridge.registerForActivityResult(
                 new ActivityResultContracts.StartIntentSenderForResult(),
@@ -95,6 +86,7 @@ public class GoogleOneTapAuth extends Plugin {
     }
 
     private BeginSignInRequest createBeginSignInRequest(boolean tryAutoLogin) {
+
         return BeginSignInRequest.builder()
                 .setGoogleIdTokenRequestOptions(BeginSignInRequest.GoogleIdTokenRequestOptions.builder()
                         .setSupported(true)
@@ -110,24 +102,32 @@ public class GoogleOneTapAuth extends Plugin {
     }
 
     private void beginSignIn(boolean tryAutoLogin) {
-        var beginSignInRequest = createBeginSignInRequest(tryAutoLogin);
+        var context = this.getContext();
 
+        var beginSignInRequest = createBeginSignInRequest(tryAutoLogin);
         oneTapClient.beginSignIn(beginSignInRequest)
                 .addOnCompleteListener(new OnCompleteListener<BeginSignInResult>() {
                     @Override
                     public void onComplete(@NonNull Task<BeginSignInResult> task) {
                         if (task.isSuccessful()) {
+
                             var result = task.getResult();
                             var intentSender = result.getPendingIntent().getIntentSender();
                             var intentSenderRequest = new IntentSenderRequest.Builder(intentSender).build();
                             googleOneTapSignInActivityResultHandlerIntentSenderRequest.launch(intentSenderRequest);
+
                         } else {
                             if (tryAutoLogin) {
                                 beginSignIn(false);
-                            }
-                            else {
+                            } else {
                                 Log.e(TAG, "beginSignIn failed", task.getException());
                                 var errorMessage = task.getException().toString();
+                                if (!isGooglePlayServicesAvailable(context)) {
+                                    errorMessage += "\nGooglePlayService is not installed or must be updated.";
+                                }
+                                if (errorMessage.contains("Missing Feature{name=auth_api_credentials_begin_sign_in")) {
+                                    errorMessage += "\nGooglePlay is not installed or must be logged in to setup.";
+                                }
                                 if (errorMessage.contains("ApiException: 8")) {
                                     errorMessage += "\nOne reason for the exception is when the device has no internet.";
                                 }
@@ -139,6 +139,12 @@ public class GoogleOneTapAuth extends Plugin {
                 });
     }
 
+    private boolean isGooglePlayServicesAvailable(Context context) {
+        var googleApiAvailability = GoogleApiAvailability.getInstance();
+        int resultCode = googleApiAvailability.isGooglePlayServicesAvailable(context);
+        return resultCode == ConnectionResult.SUCCESS;
+    }
+
     @PluginMethod()
     public void signOut(final PluginCall call) {
         oneTapClient.signOut()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-native-google-one-tap-signin",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Google One Tap sign-in plugin for capacitor.",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -14,15 +14,15 @@
   "author": "David Neuy",
   "license": "MIT",
   "devDependencies": {
-    "@capacitor/android": "^4.0.1",
-    "@capacitor/cli": "^4.0.1",
-    "@capacitor/core": "^4.0.1",
-    "@capacitor/ios": "^4.0.1",
+    "@capacitor/android": "^4.6.2",
+    "@capacitor/cli": "^4.6.2",
+    "@capacitor/core": "^4.6.2",
+    "@capacitor/ios": "^4.6.2",
     "@ionic/prettier-config": "^2.0.0",
-    "@types/gapi": "0.0.42",
-    "@types/gapi.auth2": "0.0.56",
-    "prettier": "^2.7.1",
-    "typescript": "^4.7.4"
+    "@types/gapi": "^0.0.44",
+    "@types/gapi.auth2": "^0.0.57",
+    "prettier": "^2.8.3",
+    "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "@capacitor/core": "^4"