capacitor-native-google-one-tap-signin 0.0.13 → 0.0.15

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

@@ -1,6 +1,8 @@
 package com.proventask.capacitor.GoogleAuth;
 
 import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.IntentSenderRequest;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -30,6 +32,7 @@ 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.api.ApiException;
+import com.google.android.gms.common.api.ResolvableApiException;
 import com.google.android.gms.common.api.Scope;
 import com.google.android.gms.tasks.Task;
 
@@ -73,6 +76,8 @@ import java.util.concurrent.Executors;
 
 @CapacitorPlugin()
 public class GoogleAuth extends Plugin {
+
+    private static final String TAG = "GoogleAuth Plugin";
     private final static String VERIFY_TOKEN_URL = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=";
     private final static String FIELD_TOKEN_EXPIRES_IN = "expires_in";
     private final static String FIELD_ACCESS_TOKEN = "accessToken";
@@ -84,14 +89,22 @@ public class GoogleAuth extends Plugin {
     public static final int KAssumeStaleTokenSec = 60;
 
     private static final int REQ_ONE_TAP = 2;
+    private static final int RC_CREDENTIALS_READ = 3;
 
     private String webClientId;
     private SignInClient oneTapClient;
     private BeginSignInRequest signInRequest;
     private CredentialsClient mCredentialsClient;
 
+    private GoogleSignInClient mSignInClient;
+
     private String callbackId;
 
+    private boolean mIsResolving = false;
+    private ActivityResultLauncher<IntentSenderRequest> googleOneTapSignInActivityResultHandler;
+    //private ActivityResultLauncher<IntentSender> googleOneTapSignInActivityResultHandler;
+    //private ActivityResultLauncher<Intent> googleOneTapSignInActivityResultHandler;
+
     @Override
     public void load() {
         String clientId = getConfig()
@@ -122,31 +135,67 @@ public class GoogleAuth extends Plugin {
         // GoogleSignInOptions googleSignInOptions = googleSignInBuilder.build();
         // googleSignInClient = GoogleSignIn.getClient(this.getContext(), googleSignInOptions);
 
-        oneTapClient = Identity.getSignInClient(this.getContext());
+        oneTapClient = Identity.getSignInClient(this.getActivity());
 
         mCredentialsClient = Credentials.getClient(this.getContext());
 
+        GoogleSignInOptions.Builder gsoBuilder = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(clientId);
+
+        mSignInClient = GoogleSignIn.getClient(this.getContext(), gsoBuilder.build());
+
         // todo
         // reactContext.addActivityEventListener(new RNGoogleOneTapSignInActivityEventListener());
 
-//    var googleOneTapSignInActivityResultHandler = bridge.registerForActivityResult(
-//        new ActivityResultContracts.StartIntentSenderForResult(),
-//          (ActivityResultCallback<ActivityResult>) result -> {
-//            PluginCall savedCall = this.bridge.getSavedCall(callbackId);
-//            var intent = result.getData();
-//            var typeName = result.getClass();
+        googleOneTapSignInActivityResultHandler = bridge.registerForActivityResult(
+                new ActivityResultContracts.StartIntentSenderForResult(), // new ActivityResultContracts.StartActivityForResult(),
+                (ActivityResultCallback<ActivityResult>) result -> {
+
+                    var code = result.getResultCode();
+                    Intent data = result.getData();
+
+                    if (code == Activity.RESULT_OK) {
+                        //handleSignInResult(result);
+
+                        try {
+                            SignInCredential credential = oneTapClient.getSignInCredentialFromIntent(data);
+                        } catch (ApiException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                    var isCancel = code == Activity.RESULT_CANCELED;
+
+                    // handleSignInResult(result);
+
+//                    switch (result.getResultCode()) {
+//                        case Activity.RESULT_OK:
+//                            Intent data = result.getData();
+//                            handleSignInResult(result);
 //
-//            switch (result.getResultCode()) {
-//              case Activity.RESULT_OK:
-//                Intent data = result.getData();
-//                //PaymentData paymentData = PaymentData.getFromIntent(data);
-//                //  ...
-//                break;
-//              case Activity.RESULT_CANCELED:
-//                //  ...
-//                break;
-//            }
-//        });
+//                            PluginCall savedCall = this.bridge.getSavedCall(callbackId);
+//                            var intent = result.getData();
+//
+//
+//                            //PaymentData paymentData = PaymentData.getFromIntent(data);
+//                            //  ...
+//                            break;
+//                        case Activity.RESULT_CANCELED:
+//                            //  ...
+//                            break;
+                    //}
+                });
+
+    }
+
+    private void handleSignInResult(ActivityResult result) {
+        Task<GoogleSignInAccount> task = GoogleSignIn.getSignedInAccountFromIntent(result.getData());
+        try {
+            var account = task.getResult();
+            var email = account.getEmail();
+            Log.d(TAG, "handleSignInResult() called with: result = $account");
+        } catch (Exception ex) {
+            Log.e(TAG, "handleSignInResult: ", ex);
+        }
     }
 
 //  private class RNGoogleOneTapSignInActivityEventListener extends BaseActivityEventListener {
@@ -196,6 +245,68 @@ public class GoogleAuth extends Plugin {
 
     @PluginMethod()
     public void signIn(PluginCall call) {
+        CredentialRequest.Builder crBuilder = new CredentialRequest.Builder();
+        crBuilder.setAccountTypes(IdentityProviders.GOOGLE);
+
+        this.callbackId = call.getCallbackId();
+        this.bridge.saveCall(call);
+
+        mCredentialsClient.request(crBuilder.build()).addOnCompleteListener(
+                new OnCompleteListener<CredentialRequestResponse>() {
+                    @Override
+                    public void onComplete(@NonNull Task<CredentialRequestResponse> task) {
+
+                        if (task.isSuccessful()) {
+                            // Auto sign-in success
+                            //handleCredential(task.getResult().getCredential());
+                            return;
+                        }
+
+                        Exception e = task.getException();
+                        if (e instanceof ResolvableApiException) {
+                            // Getting credential needs to show some UI, start resolution
+                            ResolvableApiException rae = (ResolvableApiException) e;
+                            resolveResult(rae, RC_CREDENTIALS_READ);
+                        } else {
+                            Log.w(TAG, "request: not handling exception", e);
+                        }
+                    }
+                });
+    }
+
+    private void resolveResult(ResolvableApiException rae, int requestCode) {
+        if (!mIsResolving) {
+            //try {
+//            var resolutionIntent = rae.getResolution();
+                var intentSender = rae.getResolution().getIntentSender();
+
+
+            var intentSenderRequest = new IntentSenderRequest.Builder(intentSender).build();
+            googleOneTapSignInActivityResultHandler.launch(intentSenderRequest);
+
+
+                //rae.startResolutionForResult(this.getActivity(), requestCode);
+            //googleOneTapSignInActivityResultHandler.launch(mSignInClient.getSignInIntent());
+
+//                var x = bridge.registerForActivityResult(
+//                    new ActivityResultContracts.StartIntentSenderForResult(),
+//                    (ActivityResultCallback<ActivityResult>) result -> {
+//
+//                    Log.d(TAG, "signIn() called ${it.data}");
+//                    Log.d(TAG, "signIn() called ${it.resultCode}");
+//
+//                });
+
+                mIsResolving = true;
+            //} catch (IntentSender.SendIntentException e) {
+            //    Log.e(TAG, "Failed to send Credentials intent.", e);
+            //    mIsResolving = false;
+            //}
+        }
+    }
+
+    @PluginMethod()
+    public void signIn2(PluginCall call) {
         if (oneTapClient == null) {
             call.reject("oneTapClient is null, call initialize first."); // todo: is initialize correct?
             return;
@@ -230,6 +341,8 @@ public class GoogleAuth extends Plugin {
 //        runOnUiThread(new Runnable() {
 //            @Override
 //            public void run() {
+
+
                 oneTapClient.beginSignIn(signInRequest)
                         .addOnSuccessListener(new MyEventListener(call))
                         .addOnFailureListener(new MyEventListener(call));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-native-google-one-tap-signin",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Google One Tap sign-in plugin for capacitor.",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",