capacitor-native-google-one-tap-signin 5.2.0 → 6.0.0

package/README.md

@@ -1,6 +1,15 @@
-# Capacitor Native Google One Tap Signin plugin
+# Capacitor Native Sign in with Google plugin
 
-Wraps the native android One Tap api for ionic capacitor apps. One Tap Sign In is part of Sign in with Google and offers features as automatic sign-in on return visits.
+Wraps the native android and iOS Sign in with Google api for ionic capacitor apps. 
+
+### Features
+- Auto sign-in returning users (that you did not sign out). No user action needed but shows a status UI for a few seconds.*
+- New users can sign-up with one tap.
+- After sign-out users can sign-in with one tap.
+- You can attach a handler to your own custom sign-in button.
+
+
+* To avoid any UI, you could create your own authentication cookie. Send the google idToken to your server, verify it, create a JWT and return it as cookie. When the user returns, just verify your JWT cookie.
 
 This library intends to provide the best google authentication experience for each platform.
 
@@ -11,9 +20,7 @@ This library intends to provide the best google authentication experience for ea
 
 After a successful authentication, the idToken is returned as base64 and as object.
 
-The user is automatically signed-in, without a prompt after the first sign-in.
-
-The android minSdkVersion is 24, however the one-tap library seems to require API version 29. For lower API versions GoogleSignIn is used.
+The android minSdkVersion is 24. Tested with android 10 and above.
 
 # Install and Configure
 
@@ -25,6 +32,8 @@ The major version of this plugin indicates the capacitor version that it is comp
 npm i --save capacitor-native-google-one-tap-signin
 ```
 
+See [capacitor-native-google-one-tap-signin](https://www.npmjs.com/package/capacitor-native-google-one-tap-signin) on NPM
+
 #### 2. Update capacitor dependencies
 
 ```sh
@@ -44,14 +53,13 @@ If you get the error `[GSI_LOGGER]: The given origin is not allowed for the give
 
 # Usage
 
+### Example 1: Showing the button only if auto-sign-in or one-tap sign in fail.
 ```TypeScript
 import { GoogleOneTapAuth, SignInResult } from 'capacitor-native-google-one-tap-signin';
 
 await GoogleOneTapAuth.initialize({ clientId: clientId });
 
-// Example 1: Showing the button only if auto-sign-in or one-tap sign in fail.
-const signInResult = await GoogleOneTapAuth.tryAutoOrOneTapSignIn()
-  .then(res => res.signInResultOptionPromise);
+const signInResult = await GoogleOneTapAuth.tryAutoOrOneTapSignIn();
 if (signInResult.isSuccess) {
   console.log(signInResult);
 } else { 
@@ -62,20 +70,34 @@ if (signInResult.isSuccess) {
 
 // See the demo folder for an example application.
 ```
-
+  
+### Example 2: Trigger auto-sign-in and if not successful one-tap sign and show the button in parallel.
 ```TypeScript
 import { GoogleOneTapAuth, SignInResult } from 'capacitor-native-google-one-tap-signin';
 
 await GoogleOneTapAuth.initialize({ clientId: clientId });
 
-// Example 2: Trigger auto-sign-in or one-tap sign and show the button in parallel.
-const autoOrOneTapSuccessPromise = GoogleOneTapAuth.tryAutoOrOneTapSignIn()
-  .then(res => res.successPromise);
-const renderButtonPromise = GoogleOneTapAuth
-  .renderSignInButton('google-signin', {}, { text: 'continue_with' });
+const autoOrOneTapSuccessPromise = new Promise<SuccessSignInResult>(async (resolve) => {
+  const autoOrOneTapResult = await GoogleOneTapAuth.tryAutoOrOneTapSignIn();
+  // Ignore if the result is not success because the user can use the button.
+  if (autoOrOneTapResult.isSuccess) {
+    resolve(autoOrOneTapResult.success!);
+  }
+});
+const successResult = await GoogleOneTapAuth.addSignInActionToExistingButton(
+  'google-signin-existing-btn-parent', 'google-signin-existing-btn');
+  
 const signInResultSuccess = await Promise.race([autoOrOneTapSuccessPromise, renderButtonPromise]);
 console.log(signInResultSuccess);
+```
 
+```HTML
+<div id='google-signin-existing-btn-parent'>
+    <button id='google-signin-existing-btn'>Custom Sign-in Button</button>
+</div>
+```
+
+```TypeScript
 // See the demo folder for an example application.
 ```
 
@@ -108,7 +130,7 @@ See `src/definitions.ts` for a complete definition.
 initialize(options: InitializeOptions): Promise<void>;
 
 /**
- * Tries to either auto-sign-in the user or sign-in the user with just one tap/click.
+ * Tries to first auto-sign-in the user and if not successful sign-in the user with just one tap/click.
  * If there is a single google account and that account has previously signed into the app, 
  * then that user is auto signed in. A short popover is displayed during sign-in.
  * If there are multiple google accounts and more than one have previously signed into the 
@@ -117,41 +139,26 @@ initialize(options: InitializeOptions): Promise<void>;
  * the app or if the user has opt out of One Tap, then the response will indicate that 
  * the auto sign-in did not succeed.
  * See https://developers.google.com/identity/gsi/web/guides/features
- * @returns A Promise object that contains 3 properties with promises. One resolves only 
- * when authentication succeeds, the second on error and the third on success or error.
+ * @returns A Promise object that resolves to an object with isSuccess, success and noSuccess properties.
  */
 tryAutoOrOneTapSignIn()
-  : Promise<{
-    successPromise: Promise<SuccessSignInResult>;
-    noSuccess: Promise<NoSuccessSignInResult>;
-    signInResultOptionPromise: Promise<SignInResultOption>;
-  }>;
+  : Promise<SignInResultOption>;
 
 /**
  * Tries to show the sign-in UI without trying to auto sign-in the user.
- * @returns A Promise object that contains 3 properties with promises. One resolves only 
- * when authentication succeeds, the second on error and the third on success or error.
+ * @returns A Promise object that resolves to an object with isSuccess, success and noSuccess properties.
  */
 tryOneTapSignIn()
-  : Promise<{
-    successPromise: Promise<SuccessSignInResult>;
-    noSuccess: Promise<NoSuccessSignInResult>;
-    signInResultOptionPromise: Promise<SignInResultOption>;
-  }>;
+  : Promise<SignInResultOption>;
 
 /**
  * Tries to auto-sign-in the user without any user interaction needed.
  * If there is a single google account and that account has previously signed into the app, 
  * then that user is auto signed in. A short popover is displayed during sign-in.
- * @returns A Promise object that contains 3 properties with promises. One resolves only 
- * when authentication succeeds, the second on error and the third on success or error.
+ * @returns A Promise object that resolves to an object with isSuccess, success and noSuccess properties.
  */
 tryAutoSignIn()
-  : Promise<{
-    successPromise: Promise<SuccessSignInResult>;
-    noSuccess: Promise<NoSuccessSignInResult>;
-    signInResultOptionPromise: Promise<SignInResultOption>;
-  }>;
+  : Promise<SignInResultOption>;
 
 /**
  * Allows using a custom sign-in button.
@@ -184,7 +191,7 @@ renderSignInButton(
   : Promise<SuccessSignInResult>;
 
 /**
- * Closes the One Tap prompt and triggers a dismissed moment.
+ * Closes the One Tap prompt.
  */
 cancelOneTapDialog(): void;
 
@@ -202,7 +209,7 @@ getNonce(): string;
 ```
 
 # Design decisions
-Promises will not be rejected for anticipated unsuccessful control flow. For example, if the one tap auto-login does not succeed because there is no session then this is not exceptional but expected in many cases. Rejecting the promise would mean the caller would have to catch an exception when calling `await xy` and then run follow-up code in the catch block. However when creating the demo app it was also evident that it is useful to have a promise that only resolves when authentication succeeds. Therefore the `tryAutoOrOneTapSignIn` method returns a Promise object that contains 3 properties with promises. One resolves only when authentication succeeds, the second on error and the third on success or error.
+Promises will not be rejected for anticipated unsuccessful control flow. For example, if the one tap auto-login does not succeed because there is no session then this is not exceptional but expected in many cases. Rejecting the promise would mean the caller would have to catch an exception when calling `await xy` and then run follow-up code in the catch block. 
 
 Instead of creating one signIn method with many parameters that are only used in some cases (=unclear dependencies), there are two methods with different parameters and different return types.
 

package/android/build.gradle

@@ -10,16 +10,17 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    namespace "com.proventask.capacitor.GoogleOneTapAuth.capacitorgoogleauth"
-    compileSdkVersion 33
+    namespace "com.proventask.capacitor.googleOneTapAuth.capacitorgoogleauth"
+    compileSdk 34
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -34,6 +35,9 @@ android {
         targetCompatibility JavaVersion.VERSION_17
         sourceCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 repositories {
@@ -46,12 +50,21 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.test:monitor:1.6.1'
+    implementation 'androidx.test.ext:junit:1.1.5'
+    implementation 'androidx.core:core-ktx:1.13.1'
     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'
+    implementation 'androidx.credentials:credentials:1.2.2'
+    implementation 'com.google.android.libraries.identity.googleid:googleid:1.1.0'
+
+    // optional - needed for credentials support from play services, for devices running
+    // Android 13 and below.
+    implementation 'androidx.credentials:credentials-play-services-auth:1.2.2'
     implementation 'org.json:json:20220924'
 }
 

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

@@ -0,0 +1,247 @@
+package com.proventask.capacitor.googleOneTapAuth
+
+import android.content.Context
+import android.util.Log
+import androidx.credentials.ClearCredentialStateRequest
+import androidx.credentials.CredentialManager
+import androidx.credentials.CredentialOption
+import androidx.credentials.CustomCredential
+import androidx.credentials.GetCredentialRequest
+import androidx.credentials.GetCredentialResponse
+import androidx.credentials.exceptions.ClearCredentialException
+import androidx.credentials.exceptions.GetCredentialCancellationException
+import androidx.credentials.exceptions.GetCredentialInterruptedException
+import com.getcapacitor.JSObject
+import com.getcapacitor.Plugin
+import com.getcapacitor.PluginCall
+import com.getcapacitor.PluginMethod
+import com.getcapacitor.annotation.CapacitorPlugin
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.libraries.identity.googleid.GetGoogleIdOption
+import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
+import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
+import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+
+@CapacitorPlugin
+class GoogleOneTapAuth : Plugin() {
+    private val TAG = "GoogleOneTapAuth Plugin"
+    private val ReasonCodeSignInCancelled = "SIGN_IN_CANCELLED"
+    private val ReasonCodeSignInInterrupted = "SIGN_IN_INTERRUPTED"
+    private var webClientId: String? = null
+    private var nonce: String? = null
+    private lateinit var credentialManager: CredentialManager
+
+    override fun load() {
+    }
+
+    @PluginMethod
+    fun initialize(call: PluginCall) {
+        initializeOptionsFromCall(call)
+        credentialManager = CredentialManager.create(context)
+        call.resolve()
+    }
+
+    private fun initializeOptionsFromCall(call: PluginCall) {
+        // This must be the Client ID of type Web application NOT the Android Client ID.
+        webClientId = call.getString("clientId")
+        nonce = call.getString("nonce")
+    }
+
+    @PluginMethod
+    fun tryAutoOrOneTapSignIn(call: PluginCall) {
+        GlobalScope.launch {
+            var signInResult = signIn(true).await()
+
+            if (signInResult.idToken == null && signInResult.noSuccessReasonCode != ReasonCodeSignInCancelled) {
+                signInResult = signIn(false).await()
+            }
+            call.resolve(convertToJsonResult(signInResult))
+        }
+    }
+
+    @PluginMethod
+    fun tryAutoSignIn(call: PluginCall) {
+        GlobalScope.launch {
+            signIn(call, true)
+        }
+    }
+
+    @PluginMethod
+    fun tryOneTapSignIn(call: PluginCall) {
+        GlobalScope.launch {
+            signIn(call, false)
+        }
+    }
+
+    // For sign-up, set filterByAuthorizedAccounts to false.
+    private suspend fun signIn(call: PluginCall, filterByAuthorizedAccounts: Boolean) {
+        var signInResult = signIn(filterByAuthorizedAccounts).await()
+        if (signInResult.idToken == null && signInResult.noSuccessReasonCode !== ReasonCodeSignInInterrupted) {
+            signInResult = signIn(filterByAuthorizedAccounts).await()
+        }
+        call.resolve(convertToJsonResult(signInResult))
+    }
+
+    private suspend fun signIn(filterByAuthorizedAccounts: Boolean): Deferred<SignInResult> {
+        val googleIdOption = createGoogleIdOption(filterByAuthorizedAccounts)
+        return launchGetCredentialRequest(googleIdOption)
+    }
+
+    private fun createGoogleIdOption(filterByAuthorizedAccounts: Boolean): GetGoogleIdOption {
+        val googleIdOption: GetGoogleIdOption = GetGoogleIdOption.Builder()
+            .setFilterByAuthorizedAccounts(filterByAuthorizedAccounts)
+            .setServerClientId(this.webClientId!!)
+            // Enable automatic sign-in for returning users that have not signed out.
+            .setAutoSelectEnabled(true)
+            .setNonce(this.nonce)
+            .build();
+        return googleIdOption;
+    }
+
+    private fun createSignInWithGoogleButtonOption(): GetSignInWithGoogleOption {
+        // Trigger the Sign in with Google button flow.
+        val signInWithGoogleOption = GetSignInWithGoogleOption.Builder(webClientId!!)
+            // .setHostedDomainFilter()
+            .setNonce(nonce)
+            .build()
+        return signInWithGoogleOption;
+    }
+
+    private suspend fun launchGetCredentialRequest(credentialOption: CredentialOption): Deferred<SignInResult> {
+        val googleSignInDeferred = CompletableDeferred<SignInResult>()
+        val request: GetCredentialRequest = GetCredentialRequest.Builder()
+            .addCredentialOption(credentialOption)
+            .build()
+
+        try {
+            val result = credentialManager.getCredential(request = request, context = this.context)
+            handleSignIn(googleSignInDeferred, result)
+        } catch (e: GetCredentialCancellationException) {
+            googleSignInDeferred.complete(SignInResult(ReasonCodeSignInCancelled, e.message))
+        } catch (e: GetCredentialInterruptedException) { // should retry
+            googleSignInDeferred.complete(SignInResult(ReasonCodeSignInInterrupted, e.message))
+        } catch (t: Throwable) { // GetCredentialException
+            val exceptionType = t::class.java.simpleName
+            val errorMsg = "$exceptionType error in getCredential."
+            Log.i(TAG, errorMsg, t)
+            var errorMessage = t.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, or one-tap is not possible."
+            }
+            // Other errors:
+            // com.google.android.gms.common.api.ApiException: 10: Caller not whitelisted to call this API.
+            // --> Try if restarting the phone fixes the problem.
+            // --> Test to sign in several times to ensure it works repeatedly.
+            googleSignInDeferred.complete(SignInResult(null, errorMessage))
+        }
+        return googleSignInDeferred;
+    }
+
+    private fun handleSignIn(
+        googleSignInDeferred: CompletableDeferred<SignInResult>,
+        response: GetCredentialResponse
+    ) {
+        when (val credential = response.credential) {
+            // GoogleIdToken credential
+            is CustomCredential -> {
+                if (credential.type == GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL) {
+                    try {
+                        val googleIdTokenCredential =
+                            GoogleIdTokenCredential.createFrom(credential.data)
+                        googleSignInDeferred.complete(SignInResult(googleIdTokenCredential.idToken))
+                    } catch (e: GoogleIdTokenParsingException) {
+                        Log.e(TAG, "Received an invalid google id token response", e)
+                        googleSignInDeferred.completeExceptionally(e)
+                    }
+                } else {
+                    // Catch any unrecognized custom credential type here.
+                    Log.e(TAG, "Unexpected CustomCredential type of credential")
+                    googleSignInDeferred.completeExceptionally(Exception("Unexpected CustomCredential type: " + credential.type))
+                }
+            }
+
+            else -> {
+                // Catch any unrecognized credential type here.
+                Log.e(TAG, "Unexpected type of credential")
+                googleSignInDeferred.completeExceptionally(Exception("Unexpected type of credential: " + credential.type))
+            }
+        }
+    }
+
+    // This method is not part of the api but only called from GoogleOneTapAuth.ts in method renderSignInButton.
+    @PluginMethod
+    fun triggerGoogleSignIn(call: PluginCall) {
+        GlobalScope.launch {
+            // Trigger the Sign in with Google button flow.
+            val signInWithGoogleOption = createSignInWithGoogleButtonOption()
+            val signInResult = launchGetCredentialRequest(signInWithGoogleOption).await()
+            call.resolve(convertToJsonResult(signInResult))
+        }
+    }
+
+    private fun convertToJsonResult(signInResult: SignInResult): JSObject {
+        val result = JSObject()
+        val isSuccess = signInResult.idToken != null
+        result.put("isSuccess", isSuccess)
+
+        if (isSuccess) {
+            val successObj = JSObject()
+            successObj.put("idToken", signInResult.idToken)
+            result.put("success", successObj)
+        } else {
+            val errorObj = JSObject()
+            errorObj.put("noSuccessReasonCode", signInResult.noSuccessReasonCode)
+            errorObj.put("noSuccessAdditionalInfo", signInResult.noSuccessAdditionalInfo)
+            result.put("noSuccess", errorObj)
+        }
+        return result
+    }
+
+    private fun isGooglePlayServicesAvailable(context: Context): Boolean {
+        val googleApiAvailability = GoogleApiAvailability.getInstance()
+        val resultCode = googleApiAvailability.isGooglePlayServicesAvailable(context)
+        return resultCode == ConnectionResult.SUCCESS
+    }
+
+    @PluginMethod
+    fun cancelOneTapDialog(call: PluginCall) {
+    }
+
+    @PluginMethod
+    fun signOut(call: PluginCall) {
+        GlobalScope.launch {
+            try {
+                credentialManager.clearCredentialState(ClearCredentialStateRequest())
+                call.resolve(createSuccessSignOutResult())
+            } catch (e: ClearCredentialException) {
+                call.resolve(createErrorSignOutResult(e.toString()))
+            }
+        }
+    }
+
+    private fun createSuccessSignOutResult(): JSObject {
+        val signOutResult = JSObject()
+        signOutResult.put("isSuccess", true)
+        return signOutResult
+    }
+
+    private fun createErrorSignOutResult(errorMessage: String): JSObject {
+        val signOutResult = JSObject()
+        signOutResult.put("isSuccess", false)
+        signOutResult.put("error", errorMessage)
+        return signOutResult
+    }
+}

package/android/src/main/java/com/proventask/capacitor/googleOneTapAuth/SignInResult.kt

@@ -0,0 +1,15 @@
+package com.proventask.capacitor.googleOneTapAuth
+
+data class SignInResult(
+    var idToken: String? = null,
+    var noSuccessReasonCode: String? = null,
+    var noSuccessAdditionalInfo: String? = null
+) {
+    constructor(noSuccessReasonCode: String?, noSuccessAdditionalInfo: String?) : this(
+        null,
+        noSuccessReasonCode,
+        noSuccessAdditionalInfo
+    )
+
+    constructor(idToken: String?) : this(idToken, null, null)
+}

package/dist/docs.json

@@ -30,57 +30,51 @@
       },
       {
         "name": "tryAutoOrOneTapSignIn",
-        "signature": "() => Promise<{ successPromise: Promise<SuccessSignInResult>; noSuccess: Promise<NoSuccessSignInResult>; signInResultOptionPromise: Promise<SignInResultOption>; }>",
+        "signature": "() => Promise<SignInResultOption>",
         "parameters": [],
-        "returns": "Promise<{ successPromise: Promise<SuccessSignInResult>; noSuccess: Promise<NoSuccessSignInResult>; signInResultOptionPromise: Promise<SignInResultOption>; }>",
+        "returns": "Promise<SignInResultOption>",
         "tags": [
           {
             "name": "returns",
-            "text": "A Promise object that contains 3 properties with promises. One resolves only \nwhen authentication succeeds, the second on error and the third on success or error."
+            "text": "A Promise object that resolves to an object with isSuccess, success and noSuccess properties."
           }
         ],
-        "docs": "Tries to either auto-sign-in the user or sign-in the user with just one tap/click.\nIf there is a single google account and that account has previously signed into the app, \nthen that user is auto signed in. A short popover is displayed during sign-in.\nIf there are multiple google accounts and more than one have previously signed into the \napp then a user selection screen is shown.\nIf there is no active google session or if no user session has logged in previously in \nthe app or if the user has opt out of One Tap, then the response will indicate that \nthe auto sign-in did not succeed.\nSee https://developers.google.com/identity/gsi/web/guides/features",
+        "docs": "Tries to first auto-sign-in the user and if not successful sign-in the user with just one tap/click.\nIf there is a single google account and that account has previously signed into the app, \nthen that user is auto signed in. A short popover is displayed during sign-in.\nIf there are multiple google accounts and more than one have previously signed into the \napp then a user selection screen is shown.\nIf there is no active google session or if no user session has logged in previously in \nthe app or if the user has opt out of One Tap, then the response will indicate that \nthe auto sign-in did not succeed.\nSee https://developers.google.com/identity/gsi/web/guides/features",
         "complexTypes": [
-          "SuccessSignInResult",
-          "NoSuccessSignInResult",
           "SignInResultOption"
         ],
         "slug": "tryautooronetapsignin"
       },
       {
         "name": "tryOneTapSignIn",
-        "signature": "() => Promise<{ successPromise: Promise<SuccessSignInResult>; noSuccess: Promise<NoSuccessSignInResult>; signInResultOptionPromise: Promise<SignInResultOption>; }>",
+        "signature": "() => Promise<SignInResultOption>",
         "parameters": [],
-        "returns": "Promise<{ successPromise: Promise<SuccessSignInResult>; noSuccess: Promise<NoSuccessSignInResult>; signInResultOptionPromise: Promise<SignInResultOption>; }>",
+        "returns": "Promise<SignInResultOption>",
         "tags": [
           {
             "name": "returns",
-            "text": "A Promise object that contains 3 properties with promises. One resolves only \nwhen authentication succeeds, the second on error and the third on success or error."
+            "text": "A Promise object that resolves to an object with isSuccess, success and noSuccess properties."
           }
         ],
         "docs": "Tries to show the sign-in UI without trying to auto sign-in the user.",
         "complexTypes": [
-          "SuccessSignInResult",
-          "NoSuccessSignInResult",
           "SignInResultOption"
         ],
         "slug": "tryonetapsignin"
       },
       {
         "name": "tryAutoSignIn",
-        "signature": "() => Promise<{ successPromise: Promise<SuccessSignInResult>; noSuccess: Promise<NoSuccessSignInResult>; signInResultOptionPromise: Promise<SignInResultOption>; }>",
+        "signature": "() => Promise<SignInResultOption>",
         "parameters": [],
-        "returns": "Promise<{ successPromise: Promise<SuccessSignInResult>; noSuccess: Promise<NoSuccessSignInResult>; signInResultOptionPromise: Promise<SignInResultOption>; }>",
+        "returns": "Promise<SignInResultOption>",
         "tags": [
           {
             "name": "returns",
-            "text": "A Promise object that contains 3 properties with promises. One resolves only \nwhen authentication succeeds, the second on error and the third on success or error."
+            "text": "A Promise object that resolves to an object with isSuccess, success and noSuccess properties."
           }
         ],
         "docs": "Tries to auto-sign-in the user without any user interaction needed.\nIf there is a single google account and that account has previously signed into the app, \nthen that user is auto signed in. A short popover is displayed during sign-in.",
         "complexTypes": [
-          "SuccessSignInResult",
-          "NoSuccessSignInResult",
           "SignInResultOption"
         ],
         "slug": "tryautosignin"
@@ -166,7 +160,7 @@
         "parameters": [],
         "returns": "void",
         "tags": [],
-        "docs": "Closes the One Tap prompt and triggers a dismissed moment.",
+        "docs": "Closes the One Tap prompt.",
         "complexTypes": [],
         "slug": "cancelonetapdialog"
       },
@@ -244,6 +238,40 @@
         }
       ]
     },
+    {
+      "name": "SignInResultOption",
+      "slug": "signinresultoption",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "isSuccess",
+          "tags": [],
+          "docs": "Indicates if the success or noSuccess property is set.",
+          "complexTypes": [],
+          "type": "boolean"
+        },
+        {
+          "name": "success",
+          "tags": [],
+          "docs": "Success result.",
+          "complexTypes": [
+            "SuccessSignInResult"
+          ],
+          "type": "SuccessSignInResult"
+        },
+        {
+          "name": "noSuccess",
+          "tags": [],
+          "docs": "NoSuccess result.",
+          "complexTypes": [
+            "NoSuccessSignInResult"
+          ],
+          "type": "NoSuccessSignInResult"
+        }
+      ]
+    },
     {
       "name": "SuccessSignInResult",
       "slug": "successsigninresult",
@@ -311,40 +339,6 @@
         }
       ]
     },
-    {
-      "name": "SignInResultOption",
-      "slug": "signinresultoption",
-      "docs": "",
-      "tags": [],
-      "methods": [],
-      "properties": [
-        {
-          "name": "isSuccess",
-          "tags": [],
-          "docs": "Indicates if the success or noSuccess property is set.",
-          "complexTypes": [],
-          "type": "boolean"
-        },
-        {
-          "name": "success",
-          "tags": [],
-          "docs": "Success result.",
-          "complexTypes": [
-            "SuccessSignInResult"
-          ],
-          "type": "SuccessSignInResult"
-        },
-        {
-          "name": "noSuccess",
-          "tags": [],
-          "docs": "NoSuccess result.",
-          "complexTypes": [
-            "NoSuccessSignInResult"
-          ],
-          "type": "NoSuccessSignInResult"
-        }
-      ]
-    },
     {
       "name": "RenderSignInButtonOptions",
       "slug": "rendersigninbuttonoptions",

package/dist/esm/GoogleOneTapAuth.d.ts

@@ -1,4 +1,4 @@
-import type { InitializeOptions, GoogleOneTapAuthPlugin, SignInResultPromises, SuccessSignInResult, SignOutResult, RenderSignInButtonOptions } from './definitions';
+import type { InitializeOptions, GoogleOneTapAuthPlugin, SuccessSignInResult, SignOutResult, RenderSignInButtonOptions, SignInResultOption } from './definitions';
 declare class GoogleOneTapAuth implements GoogleOneTapAuthPlugin {
     private nonce?;
     private initializeStatus;
@@ -8,10 +8,10 @@ declare class GoogleOneTapAuth implements GoogleOneTapAuthPlugin {
     constructor();
     initialize(options: InitializeOptions): Promise<void>;
     private ensureInitialized;
-    tryAutoOrOneTapSignIn(): Promise<SignInResultPromises>;
-    tryOneTapSignIn(): Promise<SignInResultPromises>;
-    tryAutoSignIn(): Promise<SignInResultPromises>;
-    private toPromisesResult;
+    tryAutoOrOneTapSignIn(): Promise<SignInResultOption>;
+    tryOneTapSignIn(): Promise<SignInResultOption>;
+    tryAutoSignIn(): Promise<SignInResultOption>;
+    private onResultReceived;
     cancelOneTapDialog(): void;
     signOut(): Promise<SignOutResult>;
     addSignInActionToExistingButton(buttonParentId: string, buttonId: string): Promise<SuccessSignInResult>;