@dubsdotapp/expo 0.5.20 → 0.5.22

package/app.plugin.js

@@ -15,14 +15,21 @@ const GMS_PLUGIN = 'apply plugin: "com.google.gms.google-services"';
 /**
  * @dubsdotapp/expo Expo config plugin.
  *
- * 1. Generates google-services.json (Dubs Firebase project + app's package name)
+ * 1. Stages the developer's google-services.json into android/app/ at prebuild time
+ *    (each consumer must bring their own Firebase project — no shared fallback)
  * 2. Adds the Google Services Gradle classpath + plugin so Firebase initialises
  *
+ * The plugin looks for google-services.json in two locations (in priority order):
+ *   1. <projectRoot>/google-services.json   ← recommended (committed by the dev)
+ *   2. <projectRoot>/android/app/google-services.json (already in place — leave alone)
+ *
+ * If neither exists, prebuild fails with a clear error. Push will not work without it.
+ *
  * Usage in app.json:
  *   ["@dubsdotapp/expo"]
  */
 function withDubsNotifications(config) {
-  // Step 1 — write google-services.json
+  // Step 1 — stage google-services.json into android/app/
   config = withDangerousMod(config, [
     'android',
     async (cfg) => {
@@ -34,38 +41,28 @@ function withDubsNotifications(config) {
       }
 
       const projectRoot = cfg.modRequest.projectRoot;
-      const filePath = path.join(projectRoot, 'android', 'app', 'google-services.json');
+      const targetPath = path.join(projectRoot, 'android', 'app', 'google-services.json');
+      const rootPath = path.join(projectRoot, 'google-services.json');
 
-      // Skip if developer already has their own Firebase config
-      const rootGoogleServices = path.join(projectRoot, 'google-services.json');
-      if (fs.existsSync(filePath) || fs.existsSync(rootGoogleServices)) {
+      if (fs.existsSync(targetPath)) {
+        // Already in place (e.g. committed under android/app/) — leave it alone
         return cfg;
       }
 
-      const googleServices = {
-        project_info: {
-          project_number: '161838368570',
-          project_id: 'dubs-a835d',
-          storage_bucket: 'dubs-a835d.firebasestorage.app',
-        },
-        client: [
-          {
-            client_info: {
-              mobilesdk_app_id: '1:161838368570:android:5d77e05a49f7efc64b7203',
-              android_client_info: { package_name: packageName },
-            },
-            oauth_client: [],
-            api_key: [{ current_key: 'AIzaSyCtJKF-o1cZ3Y89oM5FlXIGsjFchETzzkM' }],
-            services: { appinvite_service: { other_platform_oauth_client: [] } },
-          },
-        ],
-        configuration_version: '1',
-      };
-
-      fs.mkdirSync(path.dirname(filePath), { recursive: true });
-      fs.writeFileSync(filePath, JSON.stringify(googleServices, null, 2));
+      if (fs.existsSync(rootPath)) {
+        // Developer dropped it at project root — copy into android/app/ where Gradle expects
+        fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+        fs.copyFileSync(rootPath, targetPath);
+        return cfg;
+      }
 
-      return cfg;
+      throw new Error(
+        '@dubsdotapp/expo plugin: google-services.json not found.\n' +
+          '  Download it from your Firebase project (Project settings → General → Your apps) and place it at:\n' +
+          `    ${path.join(projectRoot, 'google-services.json')}\n` +
+          '  The package name in Firebase must match android.package in app.json: ' +
+          `${packageName}`,
+      );
     },
   ]);
 

package/dist/index.d.mts

@@ -1212,11 +1212,29 @@ interface ShortVideo {
 declare function useShorts(league?: string, limit?: number): QueryResult<ShortVideo[]>;
 
 interface PushNotificationStatus {
-    /** Whether push notifications are enabled in the SDK configuration */
+    /**
+     * Whether push is currently delivering to this user — the right signal for
+     * UI bindings like a "Notifications: Enabled/Disabled" toggle.
+     *
+     * Equivalent to `enabled && !!pushToken`. Goes false after `unregister()`
+     * even though OS permission is still granted. Goes true after `register()`
+     * succeeds.
+     *
+     * Use this — NOT `hasPermission` — when binding switches/toggles.
+     */
+    isActive: boolean;
+    /** Whether push notifications are enabled in the SDK configuration (the `pushEnabled` prop on DubsProvider). */
     enabled: boolean;
-    /** Whether notification permission has been granted */
+    /**
+     * Whether OS-level notification permission has been granted on this device.
+     *
+     * Note: this stays true after `unregister()` because the OS doesn't revoke
+     * permission when a server token is dropped. Useful for permission-flow
+     * prompts (e.g. "Re-enable in Settings" hint), but NOT for "is push on" UI —
+     * use `isActive` for that.
+     */
     hasPermission: boolean;
-    /** The push token (native FCM/APNs), if registered */
+    /** The native device push token (FCM/APNs), if currently registered with the server. */
     pushToken: string | null;
     /**
      * @deprecated Use pushToken instead. Kept for backwards compatibility.

package/dist/index.d.ts

@@ -1212,11 +1212,29 @@ interface ShortVideo {
 declare function useShorts(league?: string, limit?: number): QueryResult<ShortVideo[]>;
 
 interface PushNotificationStatus {
-    /** Whether push notifications are enabled in the SDK configuration */
+    /**
+     * Whether push is currently delivering to this user — the right signal for
+     * UI bindings like a "Notifications: Enabled/Disabled" toggle.
+     *
+     * Equivalent to `enabled && !!pushToken`. Goes false after `unregister()`
+     * even though OS permission is still granted. Goes true after `register()`
+     * succeeds.
+     *
+     * Use this — NOT `hasPermission` — when binding switches/toggles.
+     */
+    isActive: boolean;
+    /** Whether push notifications are enabled in the SDK configuration (the `pushEnabled` prop on DubsProvider). */
     enabled: boolean;
-    /** Whether notification permission has been granted */
+    /**
+     * Whether OS-level notification permission has been granted on this device.
+     *
+     * Note: this stays true after `unregister()` because the OS doesn't revoke
+     * permission when a server token is dropped. Useful for permission-flow
+     * prompts (e.g. "Re-enable in Settings" hint), but NOT for "is push on" UI —
+     * use `isActive` for that.
+     */
     hasPermission: boolean;
-    /** The push token (native FCM/APNs), if registered */
+    /** The native device push token (FCM/APNs), if currently registered with the server. */
     pushToken: string | null;
     /**
      * @deprecated Use pushToken instead. Kept for backwards compatibility.

package/dist/index.js

@@ -2830,6 +2830,7 @@ function usePushNotifications() {
     restoreIfGranted();
   }, []);
   return {
+    isActive: pushEnabled && !!pushToken,
     enabled: pushEnabled,
     hasPermission,
     pushToken,