react-native-oauth-essentials 1.0.12 → 1.2.0

package/android/build.gradle

@@ -60,24 +60,29 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  // googleid 1.2.1 ships Kotlin 2.4 metadata; the Kotlin of the app (RN: 2.1) only reads up to
+  // 2.2. Only this module references its classes, and the bytecode is plain JVM.
+  kotlinOptions {
+    freeCompilerArgs += ["-Xskip-metadata-version-check"]
+  }
 }
 
 dependencies {
   implementation "com.facebook.react:react-android"
 
   // Needed oauth libraries
-  implementation 'androidx.browser:browser:1.9.0'
-  // androidx.credentials fixado em estável 1.5.0 com `strictly`: o
-  // play-services-auth:21.5.0 puxa transitivamente credentials/-play-services-auth
-  // 1.6.0-rc01 (release candidate), cujo provider GMS deixa o chooser
-  // (SignInCredentialChooserActivity) pendurado — getCredential nunca resolve.
-  // `strictly` faz o downgrade da transitiva e propaga pro classpath do app.
+  implementation 'androidx.browser:browser:1.10.0'
+  // androidx.credentials fixado em 1.6.0 (estável) com `strictly`, para a
+  // transitiva do play-services-auth não puxar um release candidate cujo
+  // provider GMS deixa o chooser (SignInCredentialChooserActivity) pendurado —
+  // getCredential nunca resolve. `strictly` propaga o pin pro classpath do app.
   implementation('androidx.credentials:credentials') {
-    version { strictly '1.5.0' }
+    version { strictly '1.6.0' }
   }
   implementation('androidx.credentials:credentials-play-services-auth') {
-    version { strictly '1.5.0' }
+    version { strictly '1.6.0' }
   }
-  implementation 'com.google.android.libraries.identity.googleid:googleid:1.2.0'
-  implementation 'com.google.android.gms:play-services-auth:21.5.0'
+  implementation 'com.google.android.libraries.identity.googleid:googleid:1.2.1'
+  implementation 'com.google.android.gms:play-services-auth:22.0.0'
 }

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

@@ -3,5 +3,8 @@ 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")
+  NOT_SUPPORTED_ERROR("NOT_SUPPORTED_ERROR"),
+  NO_SIGN_IN_AVAILABLE("NO_SIGN_IN_AVAILABLE"),
+  BROWSER_UNAVAILABLE("BROWSER_UNAVAILABLE"),
+  CONFIGURATION_ERROR("CONFIGURATION_ERROR")
 }

package/android/src/main/java/com/oauthessentials/CredentialFactory.kt

@@ -9,6 +9,7 @@ import androidx.credentials.PasswordCredential
 import androidx.credentials.PublicKeyCredential
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
+import com.google.android.gms.auth.api.identity.AuthorizationResult
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 
 object CredentialFactory {
@@ -19,7 +20,8 @@ object CredentialFactory {
     APPLE_ID("APPLE_ID"),
     WEB_APPLE_ID("WEB_APPLE_ID"),
     CANCELLED("CANCELLED"),
-    PASSKEY("PASSKEY")
+    PASSKEY("PASSKEY"),
+    REDIRECT("REDIRECT")
   }
 
 
@@ -48,7 +50,10 @@ object CredentialFactory {
   /**
    * Creates from a response.
    */
-  fun fromCredentialResponse(result: GetCredentialResponse): WritableMap {
+  fun fromCredentialResponse(
+    result: GetCredentialResponse,
+    authorization: AuthorizationResult? = null
+  ): WritableMap {
     return Arguments.createMap().apply {
       val data = Arguments.createMap()
       when (val credential = result.credential) {
@@ -73,7 +78,15 @@ object CredentialFactory {
             data.putString("familyName", googleCred.familyName)
             data.putString("profilePictureUri", googleCred.profilePictureUri?.toString())
             data.putString("phoneNumber", googleCred.phoneNumber)
+            data.putString("email", googleCred.id)
             data.putBoolean("legacy", false)
+            data.putString("accessToken", authorization?.accessToken)
+            data.putString("serverAuthCode", authorization?.serverAuthCode)
+            if (authorization != null) {
+              data.putArray("grantedScopes", Arguments.fromList(authorization.grantedScopes))
+            } else {
+              data.putNull("grantedScopes")
+            }
           }
 
           else -> {
@@ -89,6 +102,15 @@ object CredentialFactory {
     }
   }
 
+  fun fromRedirect(url: String): WritableMap {
+    return Arguments.createMap().apply {
+      putString("type", CredentialsType.REDIRECT.code)
+      putMap("data", Arguments.createMap().apply {
+        putString("url", url)
+      })
+    }
+  }
+
   fun fromCancelled(): WritableMap {
     return Arguments.createMap().apply {
       putString("type", CredentialsType.CANCELLED.code)

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

@@ -1,6 +1,7 @@
 package com.oauthessentials
 
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NO_HISTORY
 import android.os.Bundle
@@ -10,6 +11,7 @@ import com.oauthessentials.OauthEssentialsModule.Companion.DISPLAY_CUSTOM_TABS_I
 import com.oauthessentials.OauthEssentialsModule.Companion.LOG_TAG
 import com.oauthessentials.OauthEssentialsModule.Companion.WEB_APPLE_DEEP_LINK_RECEIVED_INTENT
 import com.oauthessentials.OauthEssentialsModule.Companion.WEB_APPLE_CANCELLED_INTENT
+import com.oauthessentials.OauthEssentialsModule.Companion.WEB_BROWSER_UNAVAILABLE_INTENT
 
 class CustomTabsActivity : Activity() {
   private var deepLinkReceived = false
@@ -108,7 +110,18 @@ class CustomTabsActivity : Activity() {
       val tabIntent =
         CustomTabsIntent.Builder().setShowTitle(true).setUrlBarHidingEnabled(true).build()
       tabIntent.intent.addFlags(FLAG_ACTIVITY_NO_HISTORY)
-      tabIntent.launchUrl(this, uri)
+      try {
+        tabIntent.launchUrl(this, uri)
+      } catch (e: ActivityNotFoundException) {
+        Log.e(LOG_TAG, "No browser available to open $uri")
+        resultProcessed = true
+        sendBroadcast(
+          Intent(WEB_BROWSER_UNAVAILABLE_INTENT).apply {
+            setPackage(applicationContext.packageName)
+          }
+        )
+        finish()
+      }
     }
   }