react-native-acoustic-connect-beta 18.0.39 → 18.0.40

package/plugin/src/withConnectAndroidConfig.ts

@@ -6,7 +6,13 @@
 // be provided in an agreement with Acoustic, L.P. Any unauthorized copying or
 // distribution of content from this file is prohibited.
 
-import { withAppBuildGradle, type ConfigPlugin } from '@expo/config-plugins'
+import {
+  withAppBuildGradle,
+  withDangerousMod,
+  type ConfigPlugin,
+} from '@expo/config-plugins'
+import * as fs from 'fs'
+import * as path from 'path'
 import type { ConnectPluginProps } from './withConnectNSE'
 
 // The Gradle snippet that runs the SDK's config.gradle. config.gradle reads
@@ -68,3 +74,83 @@ export const withConnectAndroidConfig: ConfigPlugin<ConnectPluginProps> = (
     cfg.modResults.contents = appendConfigGradleApply(cfg.modResults.contents)
     return cfg
   })
+
+/** True when ConnectConfig.json at `projectRoot` has Connect.PushEnabled === true. */
+function isPushEnabled(projectRoot: string): boolean {
+  const configPath = path.join(projectRoot, 'ConnectConfig.json')
+  if (!fs.existsSync(configPath)) return false
+  try {
+    const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8')) as {
+      Connect?: { PushEnabled?: unknown }
+    }
+    return parsed.Connect?.PushEnabled === true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Fail fast at prebuild when push is enabled but `android.package` is absent
+ * from the configured `google-services.json`. FCM matches its client by package
+ * name, so a mismatch makes Gradle fail much later at
+ * `:app:processDebugGoogleServices` with the opaque "No matching client found
+ * for package name …" — and only after a full prebuild + Gradle config. Surface
+ * it here, at the moment the native project is (re)generated, with the exact fix
+ * (CA-144135 §10b). `acoustic-connect doctor` performs the same check up front;
+ * this is the guard for a developer who runs `expo run:android` directly.
+ *
+ * Only the genuine MISMATCH throws. A missing package / googleServicesFile is
+ * left to `doctor` and the build itself (this mod doesn't duplicate those).
+ */
+export const withConnectAndroidGoogleServicesMatch: ConfigPlugin<
+  ConnectPluginProps
+> = (config) =>
+  withDangerousMod(config, [
+    'android',
+    async (cfg) => {
+      const projectRoot = cfg._internal?.projectRoot
+      if (!projectRoot || !isPushEnabled(projectRoot)) return cfg
+
+      const androidPackage = cfg.android?.package
+      if (!androidPackage) return cfg
+
+      // Most Expo + FCM consumers omit android.googleServicesFile and rely on
+      // the default ./google-services.json at the project root. Mirror that
+      // default (and `acoustic-connect doctor`'s) so the match check isn't
+      // silently skipped for the common case.
+      const gsFile = cfg.android?.googleServicesFile ?? 'google-services.json'
+      const gsPath = path.isAbsolute(gsFile)
+        ? gsFile
+        : path.join(projectRoot, gsFile)
+      if (!fs.existsSync(gsPath)) return cfg // missing file is doctor's / the build's concern
+
+      let parsed: {
+        client?: Array<{
+          client_info?: { android_client_info?: { package_name?: string } }
+        }>
+      }
+      try {
+        parsed = JSON.parse(fs.readFileSync(gsPath, 'utf8'))
+      } catch {
+        return cfg // malformed google-services.json — doctor/build will report it
+      }
+
+      const packages = (parsed.client ?? [])
+        .map((c) => c.client_info?.android_client_info?.package_name)
+        .filter((p): p is string => typeof p === 'string')
+
+      if (packages.length > 0 && !packages.includes(androidPackage)) {
+        throw new Error(
+          `[react-native-acoustic-connect-beta] android.package "${androidPackage}" ` +
+            `has no matching client in ${gsFile} (it has: ${packages.join(', ')}).\n\n` +
+            `FCM matches its client by package name, so the Android build would ` +
+            `fail at :app:processDebugGoogleServices. Register "${androidPackage}" in ` +
+            `the same Firebase project and re-download google-services.json, or set ` +
+            `app.json android.package to one of the registered packages.\n` +
+            `Note: changing android.package requires a clean prebuild — ` +
+            `\`npx expo prebuild --platform android --clean\`.`
+        )
+      }
+      return cfg
+    },
+  ])

package/plugin/src/withConnectIosSigning.ts

@@ -0,0 +1,107 @@
+// Copyright (C) 2026 Acoustic, L.P. All rights reserved.
+//
+// NOTICE: This file contains material that is confidential and proprietary to
+// Acoustic, L.P. and/or other developers. No license is granted under any
+// intellectual or industrial property rights of Acoustic, L.P. except as may
+// be provided in an agreement with Acoustic, L.P. Any unauthorized copying or
+// distribution of content from this file is prohibited.
+
+import { withXcodeProject, type ConfigPlugin } from '@expo/config-plugins'
+import type { ExpoConfig } from '@expo/config-types'
+import * as fs from 'fs'
+import * as path from 'path'
+
+import type { ConnectPluginProps } from './withConnectNSE'
+
+// Derive the xcode project type from the callback (the `xcode` package ships no
+// types of its own) — same approach as withConnectNSE.
+type XcodeProject = Parameters<
+  Parameters<typeof withXcodeProject>[1]
+>[0]['modResults']
+
+const PLACEHOLDER_TEAM = 'YOUR_TEAM_ID'
+
+/**
+ * Resolves the iOS signing team (Apple Team ID) for the host + push extensions.
+ *
+ * Priority:
+ *  1. `iosDevelopmentTeam` plugin prop in app.json (explicit override)
+ *  2. `Connect.iOSDevelopmentTeam` in `<projectRoot>/ConnectConfig.json`
+ *
+ * Returns `undefined` when neither source provides a real value (the placeholder
+ * `YOUR_TEAM_ID` counts as unset). The mod is then a no-op — never a regression.
+ */
+export function resolveDevelopmentTeam(
+  projectRoot: string,
+  props: ConnectPluginProps
+): string | undefined {
+  const fromProp = props.iosDevelopmentTeam?.trim()
+  if (fromProp && fromProp !== PLACEHOLDER_TEAM) return fromProp
+
+  const configPath = path.join(projectRoot, 'ConnectConfig.json')
+  if (fs.existsSync(configPath)) {
+    try {
+      const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8')) as {
+        Connect?: { iOSDevelopmentTeam?: unknown }
+      }
+      const team = parsed.Connect?.iOSDevelopmentTeam
+      if (typeof team === 'string' && team.trim() && team.trim() !== PLACEHOLDER_TEAM)
+        return team.trim()
+    } catch {
+      // Malformed JSON is already surfaced by resolveAppGroupIdentifier (which
+      // runs earlier in the NSE mod) — don't double-report here.
+    }
+  }
+  return undefined
+}
+
+/**
+ * Expo Config Plugin mod that stamps `DEVELOPMENT_TEAM` onto every target's
+ * build configuration in the generated Xcode project (host + ConnectNSE +
+ * ConnectNCE), so all three sign consistently.
+ *
+ * Why this matters: the NSE mod injects the `aps-environment` entitlement, but
+ * a CLI build (`expo run:ios` / `xcodebuild`) with no signing team falls back
+ * to ad-hoc signing (`CODE_SIGN_IDENTITY = -`), which DROPS that entitlement —
+ * so the OS issues no APNs token and push silently fails (CA-144135 §6). Setting
+ * the team closes that loop on the prebuild path the SDK owns. Provisioning
+ * itself still needs the developer's Apple ID in Xcode and
+ * `-allowProvisioningUpdates` on the build (documented in the README).
+ *
+ * No-op when no team is configured (no regression for consumers who sign in the
+ * Xcode GUI or via EAS, which manages the whole chain itself).
+ *
+ * Must run AFTER withConnectNSE / withConnectNCE so the extension targets exist.
+ */
+export const withConnectIosSigning: ConfigPlugin<ConnectPluginProps> = (
+  config,
+  props = {}
+) => {
+  const projectRoot = config._internal?.projectRoot
+  // withConnectNSE already throws an actionable error when projectRoot is
+  // missing; here we simply skip so we never throw twice for the same cause.
+  if (!projectRoot) return config
+
+  const team = resolveDevelopmentTeam(projectRoot, props)
+  if (!team) return config
+
+  return withXcodeProject(config, (c) => {
+    const xcodeProject: XcodeProject = c.modResults
+    const configurations = xcodeProject.pbxXCBuildConfigurationSection() as Record<
+      string,
+      { buildSettings?: Record<string, string | undefined> }
+    >
+    // Set the team on every build configuration that has a buildSettings block
+    // (host + both extensions). Project-level configs get it too, which is
+    // harmless and ensures consistency across all targets.
+    for (const key of Object.keys(configurations)) {
+      const entry = configurations[key]
+      if (entry && typeof entry === 'object' && entry.buildSettings) {
+        entry.buildSettings.DEVELOPMENT_TEAM = team
+      }
+    }
+    return c
+  }) as ExpoConfig
+}
+
+export default withConnectIosSigning

package/plugin/src/withConnectNSE.ts

@@ -28,6 +28,13 @@ import * as path from 'path'
 export interface ConnectPluginProps {
   /** Explicit App Group override. Wins over ConnectConfig.json when set. */
   iosAppGroupIdentifier?: string
+  /**
+   * Apple Team ID (10-char) used to sign the host app and the push extensions.
+   * Wins over `Connect.iOSDevelopmentTeam` in ConnectConfig.json when set.
+   * Required for push: without a team, a CLI build drops the `aps-environment`
+   * entitlement to ad-hoc signing and the OS issues no APNs token.
+   */
+  iosDevelopmentTeam?: string
 }
 
 // ─── App Group resolution ─────────────────────────────────────────────────────