@dubsdotapp/expo 0.2.65 → 0.2.67

package/app.plugin.js

@@ -1,19 +1,27 @@
-const { withDangerousMod } = require('@expo/config-plugins');
+const {
+  withDangerousMod,
+  withProjectBuildGradle,
+  withAppBuildGradle,
+} = require('@expo/config-plugins');
 const fs = require('fs');
 const path = require('path');
 
+const GMS_CLASSPATH =
+  "classpath('com.google.gms:google-services:4.4.2')";
+const GMS_PLUGIN = 'apply plugin: "com.google.gms.google-services"';
+
 /**
  * @dubsdotapp/expo Expo config plugin.
  *
- * Generates a google-services.json for the Dubs Firebase project using the
- * app's own Android package name.  This allows Firebase (and therefore FCM)
- * to initialise automatically at runtime — no manual Firebase setup required.
+ * 1. Generates google-services.json (Dubs Firebase project + app's package name)
+ * 2. Adds the Google Services Gradle classpath + plugin so Firebase initialises
  *
  * Usage in app.json:
  *   ["@dubsdotapp/expo"]
  */
 function withDubsNotifications(config) {
-  return withDangerousMod(config, [
+  // Step 1 — write google-services.json
+  config = withDangerousMod(config, [
     'android',
     async (cfg) => {
       const packageName = cfg.android?.package;
@@ -23,6 +31,15 @@ function withDubsNotifications(config) {
         );
       }
 
+      const projectRoot = cfg.modRequest.projectRoot;
+      const filePath = path.join(projectRoot, 'android', 'app', '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)) {
+        return cfg;
+      }
+
       const googleServices = {
         project_info: {
           project_number: '161838368570',
@@ -33,52 +50,50 @@ function withDubsNotifications(config) {
           {
             client_info: {
               mobilesdk_app_id: '1:161838368570:android:5d77e05a49f7efc64b7203',
-              android_client_info: {
-                package_name: packageName,
-              },
+              android_client_info: { package_name: packageName },
             },
             oauth_client: [],
-            api_key: [
-              {
-                current_key: 'AIzaSyCtJKF-o1cZ3Y89oM5FlXIGsjFchETzzkM',
-              },
-            ],
-            services: {
-              appinvite_service: {
-                other_platform_oauth_client: [],
-              },
-            },
+            api_key: [{ current_key: 'AIzaSyCtJKF-o1cZ3Y89oM5FlXIGsjFchETzzkM' }],
+            services: { appinvite_service: { other_platform_oauth_client: [] } },
           },
         ],
         configuration_version: '1',
       };
 
-      const projectRoot = cfg.modRequest.projectRoot;
-      const filePath = path.join(
-        projectRoot,
-        'android',
-        'app',
-        'google-services.json',
-      );
-
-      // If the developer already has their own google-services.json, leave it alone.
-      // Their existing Firebase project will handle FCM just fine.
-      if (fs.existsSync(filePath)) {
-        return cfg;
-      }
-
-      // Also check the project root (some devs place it there for app.json googleServicesFile)
-      const rootGoogleServices = path.join(projectRoot, 'google-services.json');
-      if (fs.existsSync(rootGoogleServices)) {
-        return cfg;
-      }
-
       fs.mkdirSync(path.dirname(filePath), { recursive: true });
       fs.writeFileSync(filePath, JSON.stringify(googleServices, null, 2));
 
       return cfg;
     },
   ]);
+
+  // Step 2 — add Google Services classpath to project-level build.gradle
+  config = withProjectBuildGradle(config, (cfg) => {
+    if (cfg.modResults.contents.includes('com.google.gms:google-services')) {
+      return cfg;
+    }
+    // Insert after the last existing classpath line
+    cfg.modResults.contents = cfg.modResults.contents.replace(
+      /(classpath\(['"]org\.jetbrains\.kotlin:kotlin-gradle-plugin[^)]*\))/,
+      `$1\n    ${GMS_CLASSPATH}`,
+    );
+    return cfg;
+  });
+
+  // Step 3 — apply plugin in app-level build.gradle
+  config = withAppBuildGradle(config, (cfg) => {
+    if (cfg.modResults.contents.includes('com.google.gms.google-services')) {
+      return cfg;
+    }
+    // Add at the top, after the existing apply plugin lines
+    cfg.modResults.contents = cfg.modResults.contents.replace(
+      /(apply plugin: "com\.facebook\.react")/,
+      `$1\n${GMS_PLUGIN}`,
+    );
+    return cfg;
+  });
+
+  return config;
 }
 
 module.exports = withDubsNotifications;

package/dist/index.d.mts

@@ -902,7 +902,11 @@ interface PushNotificationStatus {
     enabled: boolean;
     /** Whether notification permission has been granted */
     hasPermission: boolean;
-    /** The Expo push token, if registered */
+    /** The push token (native FCM/APNs), if registered */
+    pushToken: string | null;
+    /**
+     * @deprecated Use pushToken instead. Kept for backwards compatibility.
+     */
     expoPushToken: string | null;
     /** Whether a registration operation is in progress */
     loading: boolean;

package/dist/index.d.ts

@@ -902,7 +902,11 @@ interface PushNotificationStatus {
     enabled: boolean;
     /** Whether notification permission has been granted */
     hasPermission: boolean;
-    /** The Expo push token, if registered */
+    /** The push token (native FCM/APNs), if registered */
+    pushToken: string | null;
+    /**
+     * @deprecated Use pushToken instead. Kept for backwards compatibility.
+     */
     expoPushToken: string | null;
     /** Whether a registration operation is in progress */
     loading: boolean;

package/dist/index.js

@@ -95,7 +95,6 @@ if (typeof self === "undefined" && typeof globalThis !== "undefined") {
 
 // src/constants.ts
 var DEFAULT_BASE_URL = "https://dubs-server-prod-9c91d3f01199.herokuapp.com/api/developer/v1";
-var DUBS_EXPO_PROJECT_ID = "aaca4fc9-64be-46b2-9be2-4175cb0f59a2";
 var DEFAULT_RPC_URL = "https://api.mainnet-beta.solana.com";
 var NETWORK_CONFIG = {
   "mainnet-beta": {
@@ -2371,7 +2370,7 @@ function usePushNotifications() {
   const { client, appName, pushEnabled } = useDubs();
   const channelId = (0, import_react16.useMemo)(() => appName.toLowerCase().replace(/[^a-z0-9-]/g, ""), [appName]);
   const [hasPermission, setHasPermission] = (0, import_react16.useState)(false);
-  const [expoPushToken, setExpoPushToken] = (0, import_react16.useState)(null);
+  const [pushToken, setPushToken] = (0, import_react16.useState)(null);
   const [loading, setLoading] = (0, import_react16.useState)(false);
   const [error, setError] = (0, import_react16.useState)(null);
   const registering = (0, import_react16.useRef)(false);
@@ -2432,11 +2431,9 @@ function usePushNotifications() {
         return false;
       }
       setHasPermission(true);
-      const tokenResult = await Notifications.getExpoPushTokenAsync({
-        projectId: DUBS_EXPO_PROJECT_ID
-      });
+      const tokenResult = await Notifications.getDevicePushTokenAsync();
       const token = tokenResult.data;
-      setExpoPushToken(token);
+      setPushToken(token);
       await registerTokenWithServer(token);
       setupAndroidChannels(Notifications);
       setLoading(false);
@@ -2452,14 +2449,14 @@ function usePushNotifications() {
     }
   }, [getNotificationsModule, registerTokenWithServer, setupAndroidChannels]);
   const unregister = (0, import_react16.useCallback)(async () => {
-    if (!expoPushToken) return;
+    if (!pushToken) return;
     try {
-      await client.unregisterPushToken(expoPushToken);
-      setExpoPushToken(null);
+      await client.unregisterPushToken(pushToken);
+      setPushToken(null);
     } catch (err) {
       console.error("[usePushNotifications] Unregister error:", err);
     }
-  }, [client, expoPushToken]);
+  }, [client, pushToken]);
   const restoreIfGranted = (0, import_react16.useCallback)(async () => {
     if (!pushEnabled) return;
     try {
@@ -2467,12 +2464,10 @@ function usePushNotifications() {
       if (!Notifications) return;
       const { status } = await Notifications.getPermissionsAsync();
       if (status !== "granted") return;
-      const tokenResult = await Notifications.getExpoPushTokenAsync({
-        projectId: DUBS_EXPO_PROJECT_ID
-      });
+      const tokenResult = await Notifications.getDevicePushTokenAsync();
       const token = tokenResult.data;
       await registerTokenWithServer(token);
-      setExpoPushToken(token);
+      setPushToken(token);
       setHasPermission(true);
       setupAndroidChannels(Notifications);
     } catch (err) {
@@ -2489,7 +2484,9 @@ function usePushNotifications() {
   return {
     enabled: pushEnabled,
     hasPermission,
-    expoPushToken,
+    pushToken,
+    expoPushToken: pushToken,
+    // backwards compat
     loading,
     error,
     register,