@iternio/react-native-auto-play 0.7.0 → 0.8.0

package/README.md

@@ -682,7 +682,7 @@ Below is a concise overview of the most important props per template. Optional p
 
 | Prop | Type | Required | Notes |
 | --- | --- | --- | --- |
-| `signInMethod` | `SignInMethod` | ✅ | The sign-in method configuration. Can be QRSignIn, PinSignIn, InputSignIn. |
+| `signInMethod` | `SignInMethod` | ✅ | The sign-in method configuration. Can be QRSignIn, PinSignIn, InputSignIn, GoogleSignIn. |
 | `title` | `string` | ❌ | Header title. |
 | `additionalText` | `string` | ❌ | Additional descriptive text. |
 | `instructions` | `string` | ❌ | Sign-in Instructions text. |
@@ -696,6 +696,19 @@ Below is a concise overview of the most important props per template. Optional p
 | QR | `QrSignIn` | QR Code sign in |
 | PIN | `PinSignIn` | PIN Code sign in (1–12 characters) |
 | Input | `InputSignIn` | Text sign in, for example mail/username and password |
+| Google | `GoogleSignIn` | Sign in with Google. Requires Google Play services 23.08 or newer — check `SignInTemplate.isGoogleSignInAvailable()` first. |
+
+`GoogleSignIn` takes a `serverClientId` (your **Web** OAuth client ID), a `signInButtonText` and a `callback(error?, account?)`. On success the returned `GoogleSignInAccount` always carries both `idToken` and `serverAuthCode` (offline access, `openid` `profile` `email` scopes) for your backend. If the user cancels, or either the account picker or the authorization step fails, `callback` is called with an `error` and no account.
+
+**Sign in with Google needs a recent Play services.** Constructing a `SignInTemplate` with `GoogleSignIn` throws `playServicesUnavailable` (and `updateTemplate` rejects with it) when Google Play services is missing or older than 23.08 (e.g. Android Automotive builds without GMS). Pick a different method up front instead:
+
+```ts
+const signInMethod: SignInMethod = SignInTemplate.isGoogleSignInAvailable()
+  ? { method: SignInMethods.GOOGLE, serverClientId, signInButtonText: 'Sign in with Google', callback }
+  : { method: SignInMethods.QR, url: loginUrl };
+```
+
+`isGoogleSignInAvailable()` always returns `false` on iOS.
 
 For InputSignIn the keyboard and input fields can be configured with following properties:
 

package/android/build.gradle

@@ -165,7 +165,9 @@ dependencies {
     implementation "androidx.car.app:app-projected:1.7.0"
   }
 
-  implementation 'com.google.android.gms:play-services-base:18.10.0'
-  implementation 'com.google.android.gms:play-services-auth:21.5.1'
+  implementation 'com.google.android.gms:play-services-auth:22.0.0'
+  implementation 'androidx.credentials:credentials:1.6.0'
+  implementation 'androidx.credentials:credentials-play-services-auth:1.6.0'
+  implementation 'com.google.android.libraries.identity.googleid:googleid:1.1.1'
 }
 

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AutoPlayError.kt

@@ -8,3 +8,7 @@ class TemplateNotFoundException(private val templateId: String) :
 class VoiceInputCancelledException : Exception("voiceInputCancelled") {
     override fun toString(): String = "voiceInputCancelled"
 }
+
+class PlayServicesUnavailableException : Exception("playServicesUnavailable") {
+    override fun toString(): String = "playServicesUnavailable"
+}

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridSignInTemplate.kt

@@ -1,5 +1,8 @@
 package com.margelo.nitro.swe.iternio.reactnativeautoplay
 
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.SignInTemplate
@@ -9,14 +12,34 @@ class HybridSignInTemplate : HybridSignInTemplateSpec() {
         val context = AndroidAutoSession.getRootContext()
             ?: throw IllegalArgumentException("createSignInTemplate failed, no carContext found")
 
+        assertSignInMethodAvailable(config)
+
         val template = SignInTemplate(context, config)
         AndroidAutoTemplate.setTemplate(config.id, template)
     }
 
     override fun updateTemplate(templateId: String, config: SignInTemplateConfig): Promise<Unit> {
         return Promise.async {
+            assertSignInMethodAvailable(config)
             val template = AndroidAutoTemplate.getTemplate<SignInTemplate>(templateId)
             template.updateTemplate(config)
         }
     }
+
+    override fun isGoogleSignInAvailable(): Boolean {
+        val context = NitroModules.applicationContext ?: return false
+
+        // on older versions sign in with google is no longer supported
+        val googleServiceMinVersion = 230815045
+        val available = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+                context, googleServiceMinVersion
+            )
+        return ConnectionResult.SUCCESS == available
+    }
+
+    private fun assertSignInMethodAvailable(config: SignInTemplateConfig) {
+        if (config.signInMethod?.asFourthOrNull() != null && !isGoogleSignInAvailable()) {
+            throw PlayServicesUnavailableException()
+        }
+    }
 }

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/SignInWithGoogleActivity.kt

@@ -4,42 +4,90 @@ import android.os.Binder
 import android.os.Bundle
 import android.os.IBinder
 import androidx.activity.ComponentActivity
-import androidx.activity.result.ActivityResult
+import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import androidx.credentials.CredentialManager
+import androidx.credentials.GetCredentialRequest
+import androidx.lifecycle.lifecycleScope
+import com.google.android.gms.auth.api.identity.AuthorizationRequest
+import com.google.android.gms.auth.api.identity.Identity
+import com.google.android.gms.common.Scopes
+import com.google.android.gms.common.api.Scope
+import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
+import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
+import kotlinx.coroutines.launch
 import java.security.InvalidParameterException
-import javax.annotation.Nullable
 
 class SignInWithGoogleActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
 
-        val signInCompleteCallback = intent.extras?.getBinder(BINDER_KEY) as OnSignInComplete?
+    private var callback: OnSignInComplete? = null
+    private var idCredential: GoogleIdTokenCredential? = null
+
+    private val authLauncher = registerForActivityResult(
+        ActivityResultContracts.StartIntentSenderForResult()
+    ) { result ->
+        val auth = runCatching {
+            Identity.getAuthorizationClient(this)
+                .getAuthorizationResultFromIntent(result.data)
+        }.getOrNull()
+        finishWith(auth?.serverAuthCode)
+    }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        callback = intent.extras?.getBinder(BINDER_KEY) as OnSignInComplete?
         val serverClientId = intent.extras?.getString("serverClientId")
             ?: throw InvalidParameterException("missing serverClientId parameter")
 
-        val activityResultLauncher = registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
-        ) { result: ActivityResult ->
-            val account = GoogleSignIn.getSignedInAccountFromIntent(
-                result.data
-            ).result
-            signInCompleteCallback?.onSignInComplete(account)
-            finish()
-        }
+        lifecycleScope.launch {
+            // 1. Authentication: ID token
+            val request = GetCredentialRequest.Builder()
+                .addCredentialOption(GetSignInWithGoogleOption.Builder(serverClientId).build())
+                .build()
+            try {
+                val result = CredentialManager.create(this@SignInWithGoogleActivity)
+                    .getCredential(this@SignInWithGoogleActivity, request)
+                idCredential = GoogleIdTokenCredential.createFrom(result.credential.data)
+            } catch (_: Exception) {
+                callback?.onSignInComplete(null, null)
+                finish()
+                return@launch
+            }
 
-        val googleSignInClient = GoogleSignIn.getClient(
-            this,
-            GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .requestServerAuthCode(serverClientId)
-                .requestEmail()
-                .requestIdToken(serverClientId)
+            // 2. Authorization: server auth code
+            val authRequest = AuthorizationRequest.builder()
+                // matches the legacy DEFAULT_SIGN_IN + requestEmail() scopes, so the exchanged
+                // server auth code grants the same access as before the Credential Manager migration
+                .setRequestedScopes(
+                    listOf(Scope(Scopes.OPEN_ID), Scope(Scopes.PROFILE), Scope(Scopes.EMAIL))
+                )
+                .requestOfflineAccess(serverClientId)
                 .build()
-        )
-        activityResultLauncher.launch(googleSignInClient.signInIntent)
+            Identity.getAuthorizationClient(this@SignInWithGoogleActivity)
+                .authorize(authRequest)
+                .addOnSuccessListener { res ->
+                    if (res.hasResolution()) {
+                        authLauncher.launch(
+                            IntentSenderRequest.Builder(res.pendingIntent!!.intentSender).build()
+                        )
+                    } else {
+                        finishWith(res.serverAuthCode)
+                    }
+                }
+                .addOnFailureListener { finishWith(null) }
+        }
+    }
+
+    private fun finishWith(serverAuthCode: String?) {
+        // a cancelled or failed authorization step yields no server auth code; report it as a
+        // failed sign in so callers get either an error or a complete account, as with the
+        // legacy GoogleSignIn flow, never an account without a server auth code
+        if (serverAuthCode == null) {
+            callback?.onSignInComplete(null, null)
+        } else {
+            callback?.onSignInComplete(idCredential, serverAuthCode)
+        }
+        finish()
     }
 
     /**
@@ -49,9 +97,13 @@ class SignInWithGoogleActivity : ComponentActivity() {
         /**
          * Notifies that sign in flow completed.
          *
-         * @param account the account signed in or `null` if there were issues signing in.
+         * @param credential the account signed in or `null` if there were issues signing in.
+         * @param serverAuthCode the server auth code, always non-null when [credential] is non-null.
          */
-        abstract fun onSignInComplete(@Nullable account: GoogleSignInAccount?)
+        abstract fun onSignInComplete(
+            credential: GoogleIdTokenCredential?,
+            serverAuthCode: String?
+        )
     }
 
     companion object {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/SignInTemplate.kt

@@ -1,8 +1,8 @@
 package com.margelo.nitro.swe.iternio.reactnativeautoplay.template
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
+import android.util.Base64
 import androidx.car.app.CarContext
 import androidx.car.app.model.Action
 import androidx.car.app.model.ActionStrip
@@ -18,7 +18,9 @@ import androidx.car.app.model.signin.ProviderSignInMethod
 import androidx.car.app.model.signin.QRCodeSignInMethod
 import androidx.car.app.model.signin.SignInTemplate
 import androidx.core.graphics.drawable.IconCompat
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import androidx.core.net.toUri
+import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
+import com.margelo.nitro.NitroModules
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.KeyboardType
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAction
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroActionType
@@ -26,8 +28,8 @@ import com.margelo.nitro.swe.iternio.reactnativeautoplay.R
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.SignInTemplateConfig
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.SignInWithGoogleActivity
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.TextInputType
+import org.json.JSONObject
 import java.security.InvalidParameterException
-import androidx.core.net.toUri
 
 class SignInTemplate(
     context: CarContext, config: SignInTemplateConfig
@@ -115,32 +117,35 @@ class SignInTemplate(
                         ).build()
                     )
                     setOnClickListener(ParkedOnlyOnClickListener.create {
-                        val extras = Bundle(1)
+                        val extras = Bundle(2)
                         extras.putBinder(
                             SignInWithGoogleActivity.BINDER_KEY,
                             object : SignInWithGoogleActivity.OnSignInComplete() {
-                                override fun onSignInComplete(account: GoogleSignInAccount?) {
-                                    if (account == null) {
+                                override fun onSignInComplete(
+                                    credential: GoogleIdTokenCredential?,
+                                    serverAuthCode: String?
+                                ) {
+                                    if (credential == null) {
                                         googleSignIn.callback("Error signing in", null)
-                                    } else {
-                                        googleSignIn.callback(
-                                            null,
-                                            com.margelo.nitro.swe.iternio.reactnativeautoplay.GoogleSignInAccount(
-                                                serverAuthCode = account.serverAuthCode,
-                                                email = account.email,
-                                                id = account.id,
-                                                displayName = account.displayName,
-                                                photoUrl = account.photoUrl?.toString(),
-                                                idToken = account.idToken,
-                                                givenName = account.givenName,
-                                                familyName = account.familyName
-                                            )
-                                        )
+                                        return
                                     }
+                                    googleSignIn.callback(
+                                        null,
+                                        com.margelo.nitro.swe.iternio.reactnativeautoplay.GoogleSignInAccount(
+                                            serverAuthCode = serverAuthCode,
+                                            email = credential.id,
+                                            id = subFromIdToken(credential.idToken),
+                                            displayName = credential.displayName,
+                                            photoUrl = credential.profilePictureUri?.toString(),
+                                            idToken = credential.idToken,
+                                            givenName = credential.givenName,
+                                            familyName = credential.familyName
+                                        )
+                                    )
                                 }
                             })
                         extras.putString("serverClientId", googleSignIn.serverClientId)
-                        context.startActivity(
+                        NitroModules.applicationContext?.startActivity(
                             Intent().setClass(context, SignInWithGoogleActivity::class.java)
                                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).putExtras(extras)
                         )
@@ -211,4 +216,13 @@ class SignInTemplate(
         config.onPopped?.let { it() }
         templates.remove(templateId)
     }
+
+    private fun subFromIdToken(idToken: String): String? = runCatching {
+        val payload = idToken.split(".")[1]
+        val json = String(
+            Base64.decode(payload, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP),
+            Charsets.UTF_8
+        )
+        JSONObject(json).getString("sub")
+    }.getOrNull()
 }

package/lib/specs/SignInTemplate.nitro.d.ts

@@ -8,5 +8,6 @@ export interface SignInTemplate extends HybridObject<{
 }> {
     createSignInTemplate(config: SignInTemplateConfig): void;
     updateTemplate(templateId: string, config: SignInTemplateConfig): Promise<void>;
+    isGoogleSignInAvailable(): boolean;
 }
 export {};

package/lib/templates/SignInTemplate.d.ts

@@ -46,4 +46,9 @@ export declare class SignInTemplate extends Template<SignInTemplateConfig, SignI
      * @returns A promise that resolves when the template is updated.
      */
     updateTemplate(updatedConfig: SignInTemplateUpdateConfig): Promise<void> | undefined;
+    /**
+     * Whether "Sign in with Google" is usable, i.e. Google Play services 23.08+ is installed.
+     * Check this before creating a `SignInTemplate` with `GoogleSignIn` — creation throws otherwise.
+     */
+    static isGoogleSignInAvailable(): boolean;
 }

package/lib/templates/SignInTemplate.js

@@ -48,4 +48,11 @@ export class SignInTemplate extends Template {
         }
         return HybridSignInTemplate?.updateTemplate(this.id, nitroConfig);
     }
+    /**
+     * Whether "Sign in with Google" is usable, i.e. Google Play services 23.08+ is installed.
+     * Check this before creating a `SignInTemplate` with `GoogleSignIn` — creation throws otherwise.
+     */
+    static isGoogleSignInAvailable() {
+        return HybridSignInTemplate?.isGoogleSignInAvailable() ?? false;
+    }
 }

package/lib-cjs/templates/SignInTemplate.js

@@ -51,5 +51,12 @@ class SignInTemplate extends Template_1.Template {
         }
         return exports.HybridSignInTemplate?.updateTemplate(this.id, nitroConfig);
     }
+    /**
+     * Whether "Sign in with Google" is usable, i.e. Google Play services 23.08+ is installed.
+     * Check this before creating a `SignInTemplate` with `GoogleSignIn` — creation throws otherwise.
+     */
+    static isGoogleSignInAvailable() {
+        return exports.HybridSignInTemplate?.isGoogleSignInAvailable() ?? false;
+    }
 }
 exports.SignInTemplate = SignInTemplate;

package/nitrogen/generated/android/c++/JHybridSignInTemplateSpec.cpp

@@ -144,5 +144,10 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       return __promise;
     }();
   }
+  bool JHybridSignInTemplateSpec::isGoogleSignInAvailable() {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean()>("isGoogleSignInAvailable");
+    auto __result = method(_javaPart);
+    return static_cast<bool>(__result);
+  }
 
 } // namespace margelo::nitro::swe::iternio::reactnativeautoplay

package/nitrogen/generated/android/c++/JHybridSignInTemplateSpec.hpp

@@ -56,6 +56,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
     // Methods
     void createSignInTemplate(const SignInTemplateConfig& config) override;
     std::shared_ptr<Promise<void>> updateTemplate(const std::string& templateId, const SignInTemplateConfig& config) override;
+    bool isGoogleSignInAvailable() override;
 
   private:
     jni::global_ref<JHybridSignInTemplateSpec::JavaPart> _javaPart;

package/nitrogen/generated/android/kotlin/com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridSignInTemplateSpec.kt

@@ -37,6 +37,10 @@ abstract class HybridSignInTemplateSpec: HybridObject() {
   @DoNotStrip
   @Keep
   abstract fun updateTemplate(templateId: String, config: SignInTemplateConfig): Promise<Unit>
+  
+  @DoNotStrip
+  @Keep
+  abstract fun isGoogleSignInAvailable(): Boolean
 
   // Default implementation of `HybridObject.toString()`
   override fun toString(): String {

package/nitrogen/generated/shared/c++/HybridSignInTemplateSpec.cpp

@@ -16,6 +16,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
     registerHybrids(this, [](Prototype& prototype) {
       prototype.registerHybridMethod("createSignInTemplate", &HybridSignInTemplateSpec::createSignInTemplate);
       prototype.registerHybridMethod("updateTemplate", &HybridSignInTemplateSpec::updateTemplate);
+      prototype.registerHybridMethod("isGoogleSignInAvailable", &HybridSignInTemplateSpec::isGoogleSignInAvailable);
     });
   }
 

package/nitrogen/generated/shared/c++/HybridSignInTemplateSpec.hpp

@@ -53,6 +53,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       // Methods
       virtual void createSignInTemplate(const SignInTemplateConfig& config) = 0;
       virtual std::shared_ptr<Promise<void>> updateTemplate(const std::string& templateId, const SignInTemplateConfig& config) = 0;
+      virtual bool isGoogleSignInAvailable() = 0;
 
     protected:
       // Hybrid Setup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",

package/src/specs/SignInTemplate.nitro.ts

@@ -7,4 +7,5 @@ interface SignInTemplateConfig extends NitroTemplateConfig, NitroSignInTemplateC
 export interface SignInTemplate extends HybridObject<{ android: 'kotlin' }> {
   createSignInTemplate(config: SignInTemplateConfig): void;
   updateTemplate(templateId: string, config: SignInTemplateConfig): Promise<void>;
+  isGoogleSignInAvailable(): boolean;
 }

package/src/templates/SignInTemplate.ts

@@ -114,4 +114,12 @@ export class SignInTemplate extends Template<
 
     return HybridSignInTemplate?.updateTemplate(this.id, nitroConfig);
   }
+
+  /**
+   * Whether "Sign in with Google" is usable, i.e. Google Play services 23.08+ is installed.
+   * Check this before creating a `SignInTemplate` with `GoogleSignIn` — creation throws otherwise.
+   */
+  static isGoogleSignInAvailable(): boolean {
+    return HybridSignInTemplate?.isGoogleSignInAvailable() ?? false;
+  }
 }