fix: minor fixes

Author: lucaswitch

android/build.gradle

@@ -68,7 +68,7 @@ dependencies {
   // Needed oauth libraries
   implementation 'androidx.browser:browser:1.9.0'
   implementation 'androidx.credentials:credentials:1.5.0'
-  implementation 'androidx.credentials:credentials-play-services-auth:1.5.0'
+  implementation("androidx.credentials:credentials-play-services-auth:1.6.0-rc01")
   implementation 'com.google.android.libraries.identity.googleid:googleid:1.2.0'
   implementation 'com.google.android.gms:play-services-auth:21.5.0'
 }

android/src/main/java/com/oauthessentials/CredentialError.kt

@@ -0,0 +1,7 @@
+package com.oauthessentials
+
+enum class CredentialError(val code: String) {
+  NO_ACTIVITY_ERROR("NO_ACTIVITY_ERROR"),
+  INVALID_RESULT_ERROR("INVALID_RESULT_ERROR"),
+  NOT_SUPPORTED_ERROR("NOT_SUPPORTED")
+}

android/src/main/java/com/oauthessentials/CustomTabsActivity.kt

@@ -6,7 +6,7 @@ import android.content.Intent.FLAG_ACTIVITY_NO_HISTORY
 import android.os.Bundle
 import android.util.Log
 import androidx.browser.customtabs.CustomTabsIntent
-import com.oauthessentials.OauthEssentialsModule.Companion.DEEPLINK_WEB_APPLE_INTENT
+import com.oauthessentials.OauthEssentialsModule.Companion.APPLE_SIGN_IN_SUCCESS_RECEIVED_INTENT
 import com.oauthessentials.OauthEssentialsModule.Companion.DISPLAY_CUSTOM_TABS_INTENT
 import com.oauthessentials.OauthEssentialsModule.Companion.LOG_TAG
 
@@ -76,7 +76,7 @@ class CustomTabsActivity : Activity() {
     Log.d(LOG_TAG, "Received new incoming intent")
     intent.data?.let { uri ->
       sendBroadcast(
-        Intent(DEEPLINK_WEB_APPLE_INTENT).apply {
+        Intent(APPLE_SIGN_IN_SUCCESS_RECEIVED_INTENT).apply {
           setPackage(applicationContext.packageName)
           putExtra("url", uri.toString())
         }

android/src/main/java/com/oauthessentials/OauthEssentialsModule.kt

@@ -12,7 +12,6 @@ import android.util.Patterns
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
-import androidx.core.view.WindowCompat
 import androidx.credentials.CreatePasswordRequest
 import androidx.credentials.CredentialManager
 import androidx.credentials.GetCredentialRequest
@@ -34,8 +33,9 @@ import java.util.Base64
 
 class OauthEssentialsModule(reactContext: ReactApplicationContext) :
   NativeOauthEssentialsSpec(reactContext) {
+  private var appleSignInPromiseSettler: RCTPromiseSettler? = null
 
-  private val deepLinkReceiver = object : BroadcastReceiver() {
+  private val receiver = object : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
       val url = intent?.getStringExtra("url")
       Log.d(LOG_TAG, "Receiving deep link ${url}")
@@ -64,12 +64,6 @@ class OauthEssentialsModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  enum class CredentialError(val code: String) {
-    NO_ACTIVITY_ERROR("NO_ACTIVITY_ERROR"),
-    INVALID_RESULT_ERROR("INVALID_RESULT_ERROR"),
-    NOT_SUPPORTED_ERROR("NOT_SUPPORTED")
-  }
-
   @SuppressLint("ObsoleteSdkInt")
   override fun getTypedExportedConstants(): MutableMap<String, Boolean> {
     hasGooglePlayServices()
@@ -88,8 +82,7 @@ class OauthEssentialsModule(reactContext: ReactApplicationContext) :
 
   private fun getAppleIdSupported(): Boolean = true
 
-  private fun getCredentialManagerSupported(): Boolean =
-    Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+  private fun getCredentialManagerSupported(): Boolean = true
 
   @RequiresApi(Build.VERSION_CODES.O)
   override fun hybridSignIn(clientId: String, options: ReadableMap, promise: Promise) {
@@ -222,79 +215,35 @@ class OauthEssentialsModule(reactContext: ReactApplicationContext) :
       return
     }
 
-    if (getCredentialManagerSupported()) {
-      CoroutineScope(Dispatchers.IO).launch {
-        try {
-          val manager = CredentialManager.create(activity)
-          val randomBytes = ByteArray(32)
-          SecureRandom.getInstanceStrong().nextBytes(randomBytes)
-          val randomNonce = Base64.getUrlEncoder().withoutPadding().encodeToString(randomBytes)
-
-          val googleIdOption: GetGoogleIdOption = GetGoogleIdOption.Builder()
-            .setNonce(randomNonce)
-            .setServerClientId(clientId)
-            .setFilterByAuthorizedAccounts(options.getBoolean("authorizedAccounts"))
-            .setAutoSelectEnabled(options.getBoolean("autoSelectEnabled"))
-            .build()
-
-          val request: GetCredentialRequest = GetCredentialRequest.Builder()
-            .addCredentialOption(googleIdOption)
-            .build()
-
-
-          resolveAndEmit(
-            CredentialFactory.fromCredentialResponse(
-              manager.getCredential(activity, request)
-            ), promise
-          )
-        } catch (e: GetCredentialCancellationException) {
-          Log.d(LOG_TAG, e.toString())
-          resolveAndEmit(CredentialFactory.fromCancelled(), promise)
-        } catch (e: Throwable) {
-          rejectAndEmitEvent(CredentialError.INVALID_RESULT_ERROR.code, e.toString(), promise)
-        }
-      }
-    } else {
-      CoroutineScope(Dispatchers.IO).launch {
-        try {
-          Identity.getSignInClient(activity)
-          BeginSignInRequest.builder()
-            .setGoogleIdTokenRequestOptions(
-              BeginSignInRequest.GoogleIdTokenRequestOptions.builder()
-                .setSupported(true)
-                .setServerClientId(clientId)
-                .setFilterByAuthorizedAccounts(options.getBoolean("authorizedAccounts"))
-                .build()
-            )
-            .build()
-
-//          suspendCancellableCoroutine { continuation ->
-//            oneTapClient.beginSignIn(signInRequest)
-//              .addOnSuccessListener { res -> continuation.resume(res) }
-//              .addOnFailureListener { e -> continuation.resumeWithException(e) }
-//          }
-
-          // todo needs to be launched from a different activity
-//
-//          resolveAndEmit(
-//            CredentialFactory.fromLegacyCredentialResponse(
-//              oneTapClient.getSignInCredentialFromIntent(intent)
-//            ),
-//            promise
-//          )
-        } catch (e: ApiException) {
-          when (e.statusCode) {
-            CommonStatusCodes.CANCELED -> {
-              resolveAndEmit(CredentialFactory.fromCancelled(), promise)
-            }
+    CoroutineScope(Dispatchers.IO).launch {
+      try {
+        val manager = CredentialManager.create(activity)
+        val randomBytes = ByteArray(32)
+        SecureRandom.getInstanceStrong().nextBytes(randomBytes)
+        val randomNonce = Base64.getUrlEncoder().withoutPadding().encodeToString(randomBytes)
 
-            else -> {
-              rejectAndEmitEvent(CredentialError.INVALID_RESULT_ERROR.code, e.toString(), promise)
-            }
-          }
-        } catch (e: Exception) {
-          rejectAndEmitEvent(CredentialError.INVALID_RESULT_ERROR.code, e.toString(), promise)
-        }
+        val googleIdOption: GetGoogleIdOption = GetGoogleIdOption.Builder()
+          .setNonce(randomNonce)
+          .setServerClientId(clientId)
+          .setFilterByAuthorizedAccounts(options.getBoolean("authorizedAccounts"))
+          .setAutoSelectEnabled(options.getBoolean("autoSelectEnabled"))
+          .build()
+
+        val request: GetCredentialRequest = GetCredentialRequest.Builder()
+          .addCredentialOption(googleIdOption)
+          .build()
+
+
+        resolveAndEmit(
+          CredentialFactory.fromCredentialResponse(
+            manager.getCredential(activity, request)
+          ), promise
+        )
+      } catch (e: GetCredentialCancellationException) {
+        Log.d(LOG_TAG, e.toString())
+        resolveAndEmit(CredentialFactory.fromCancelled(), promise)
+      } catch (e: Throwable) {
+        rejectAndEmitEvent(CredentialError.INVALID_RESULT_ERROR.code, e.toString(), promise)
       }
     }
   }
@@ -367,7 +316,6 @@ class OauthEssentialsModule(reactContext: ReactApplicationContext) :
     }
   }
 
-
   /**
    * Gets if has google play services.
    */
@@ -382,22 +330,25 @@ class OauthEssentialsModule(reactContext: ReactApplicationContext) :
     super.initialize()
 
     Log.d(LOG_TAG, "Registering deep link broadcast receiver")
-    val filter = IntentFilter(WEB_APPLE_ID_BROADCAST_INTENT)
-    val filter = IntentFilter(DEEPLINK_WEB_APPLE_INTENT)
     ContextCompat.registerReceiver(
       reactApplicationContext.applicationContext,
-      deepLinkReceiver,
-      filter,
+      receiver,
+      IntentFilter().apply {
+        addAction(APPLE_SIGN_IN_SUCCESS_RECEIVED_INTENT)
+      },
       ContextCompat.RECEIVER_NOT_EXPORTED
     )
   }
 
   override fun invalidate() {
     super.invalidate()
     Log.d(LOG_TAG, "Unregistering deep link broadcast receiver")
-    reactApplicationContext.unregisterReceiver(deepLinkReceiver)
+    reactApplicationContext.unregisterReceiver(receiver)
   }
 
+  /**
+   * Gets parse web url.
+   */
   private fun parseWebUrl(url: String?): Uri {
     val url = url?.trim()
       ?: throw IllegalArgumentException("URL cannot be null")
@@ -454,7 +405,8 @@ class OauthEssentialsModule(reactContext: ReactApplicationContext) :
     const val NAME = NativeOauthEssentialsSpec.NAME
 
     const val LOG_TAG = "NativeOauthEssentials"
-    const val DEEPLINK_WEB_APPLE_INTENT = "com.oauthessentials.WEB_APPLE_DEEP_LINK_INTENT"
+    const val APPLE_SIGN_IN_SUCCESS_RECEIVED_INTENT =
+      "com.oauthessentials.APPLE_SIGN_IN_SUCCESS_RECEIVED_INTENT"
     const val DISPLAY_CUSTOM_TABS_INTENT = "com.oauthessentials.DISPLAY_CUSTOM_TABS"
   }
 }

ios/AppleIdRetriever.swift

@@ -7,8 +7,10 @@ public class AppleIdRetriever: RCTPromiseSettler,
 
   override init(
     resolve: @escaping RCTPromiseResolveBlock,
-    reject: @escaping RCTPromiseRejectBlock) {
-    super.init(resolve: resolve, reject: reject)
+    reject: @escaping RCTPromiseRejectBlock,
+    emitEvent: ((String, NSDictionary) -> Void)?
+  ) {
+    super.init(resolve: resolve, reject: reject, emitEvent: emitEvent)
 
     let controller = ASAuthorizationController(authorizationRequests: [
       ASAuthorizationAppleIDProvider().createRequest(),
@@ -60,6 +62,7 @@ public class AppleIdRetriever: RCTPromiseSettler,
       ]
 
       self.resolve?(result)
+      self.emitEvent?("onCredentialSuccess", result as NSDictionary)
     }
   }
 
@@ -69,5 +72,9 @@ public class AppleIdRetriever: RCTPromiseSettler,
       error.localizedDescription,
       error
     )
+    self.emitEvent?("onCredentialFailure", [
+      "code": CredentialError.invalidResult.rawValue,
+      "message": error.localizedDescription
+    ])
   }
 }

ios/CredentialError.swift

@@ -0,0 +1,6 @@
+public enum CredentialError: String {
+  case noSignInAvailable = "NO_SIGN_IN_AVAILABLE"
+  case invalidResult = "INVALID_RESULT_ERROR"
+  case simultaneousCallError = "SIMULTANEOUS_CALL_ERROR"
+  case notSupportedError = "NOT_SUPPORTED_ERROR"
+}