@dubsdotapp/expo 0.5.19 → 0.5.21

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.js

@@ -3438,7 +3438,7 @@ function AuthGate({
   appName = "Dubs",
   accentColor
 }) {
-  const { client, pushEnabled } = useDubs();
+  const { client, pushEnabled, uiConfig } = useDubs();
   const auth = useAuth();
   const [phase, setPhase] = (0, import_react28.useState)("init");
   const [registrationPhase, setRegistrationPhase] = (0, import_react28.useState)(false);
@@ -3475,10 +3475,10 @@ function AuthGate({
     if (auth.status === "needsRegistration") setRegistrationPhase(true);
   }, [auth.status]);
   (0, import_react28.useEffect)(() => {
-    if (pushEnabled && auth.status === "authenticated" && registrationPhase && !isRestoredSession) {
+    if (pushEnabled && uiConfig.pushConfigured?.android && auth.status === "authenticated" && registrationPhase && !isRestoredSession) {
       setShowPushSetup(true);
     }
-  }, [pushEnabled, auth.status, registrationPhase, isRestoredSession]);
+  }, [pushEnabled, uiConfig.pushConfigured?.android, auth.status, registrationPhase, isRestoredSession]);
   (0, import_react28.useEffect)(() => {
     if (auth.token) onSaveToken(auth.token);
   }, [auth.token]);
@@ -3497,23 +3497,14 @@ function AuthGate({
     if (renderLoading) return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_jsx_runtime4.Fragment, { children: renderLoading("authenticating") });
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DefaultLoadingScreen, { status: "authenticating", appName, accentColor });
   }
-  if (auth.status === "authenticated") {
-    if (showPushSetup) {
-      return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
-        PushSetupScreen,
-        {
-          accentColor,
-          appName,
-          onComplete: () => setShowPushSetup(false)
-        }
-      );
-    }
+  const inRegistrationFlow = registrationPhase && (auth.status === "needsRegistration" || auth.status === "registering" || auth.status === "authenticated" && showPushSetup);
+  if (auth.status === "authenticated" && !inRegistrationFlow) {
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(AuthContext.Provider, { value: auth, children: [
       pushEnabled && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(PushTokenRestorer, {}),
       children
     ] });
   }
-  if (registrationPhase) {
+  if (inRegistrationFlow) {
     const isRegistering = auth.status === "registering";
     const regError = auth.status === "error" ? auth.error : null;
     if (renderRegistration) {
@@ -3527,7 +3518,9 @@ function AuthGate({
         error: regError,
         client,
         appName,
-        accentColor
+        accentColor,
+        pushStepActive: showPushSetup,
+        onPushComplete: () => setShowPushSetup(false)
       }
     );
   }
@@ -3607,10 +3600,13 @@ function DefaultRegistrationScreen({
   error,
   client,
   appName,
-  accentColor
+  accentColor,
+  pushStepActive,
+  onPushComplete
 }) {
   const t = useDubsTheme();
   const accent = accentColor || t.accent;
+  const push = usePushNotifications();
   const [step, setStep] = (0, import_react28.useState)(0);
   const [avatarSeed, setAvatarSeed] = (0, import_react28.useState)(generateSeed);
   const [avatarStyle, setAvatarStyle] = (0, import_react28.useState)("adventurer");
@@ -3846,6 +3842,58 @@ function DefaultRegistrationScreen({
       )
     ] })
   ] });
+  (0, import_react28.useEffect)(() => {
+    if (pushStepActive && step !== 3) {
+      animateToStep(3);
+    }
+  }, [pushStepActive]);
+  const handleEnablePush = async () => {
+    try {
+      await push.register();
+    } catch {
+    }
+    onPushComplete?.();
+  };
+  const renderPushStep = () => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: s.stepContainer, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: s.stepTop, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [s.title, { color: t.text }], children: "Enable Notifications" }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [s.subtitle, { color: t.textMuted }], children: "Stay in the loop with real-time updates" }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(StepIndicator, { currentStep: 3 }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: pushStyles.iconContainer, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: [pushStyles.bellCircle, { backgroundColor: accent + "20" }], children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [pushStyles.bellIcon, { color: accent }], children: "\u{1F514}" }) }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: pushStyles.benefitsList, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [pushStyles.benefitsHeader, { color: t.text }], children: "Get real-time updates when:" }),
+        [
+          "A fight you picked on goes LIVE",
+          "Your pick wins or loses",
+          "Final results and rankings"
+        ].map((item, i) => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: pushStyles.benefitRow, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: [pushStyles.bulletDot, { backgroundColor: accent }] }),
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [pushStyles.benefitText, { color: t.textMuted }], children: item })
+        ] }, i))
+      ] })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: s.bottomRow, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+        import_react_native8.TouchableOpacity,
+        {
+          style: [s.secondaryBtn, { borderColor: t.border }],
+          onPress: onPushComplete,
+          activeOpacity: 0.7,
+          children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [s.secondaryBtnText, { color: t.textMuted }], children: "Maybe Later" })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+        import_react_native8.TouchableOpacity,
+        {
+          style: [s.primaryBtn, { backgroundColor: accent, flex: 1, opacity: push.loading ? 0.7 : 1 }],
+          onPress: handleEnablePush,
+          disabled: push.loading,
+          activeOpacity: 0.8,
+          children: push.loading ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.ActivityIndicator, { color: "#FFFFFF", size: "small" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: s.primaryBtnText, children: "Enable Notifications" })
+        }
+      )
+    ] })
+  ] });
   const renderStep = () => {
     switch (step) {
       case 0:
@@ -3854,6 +3902,8 @@ function DefaultRegistrationScreen({
         return renderUsernameStep();
       case 2:
         return renderReferralStep();
+      case 3:
+        return renderPushStep();
       default:
         return null;
     }
@@ -3894,77 +3944,6 @@ function PushTokenRestorer() {
   }, []);
   return null;
 }
-function PushSetupScreen({
-  accentColor,
-  appName,
-  onComplete
-}) {
-  const t = useDubsTheme();
-  const accent = accentColor || t.accent;
-  const push = usePushNotifications();
-  const fadeAnim = (0, import_react28.useRef)(new import_react_native8.Animated.Value(0)).current;
-  const slideAnim = (0, import_react28.useRef)(new import_react_native8.Animated.Value(30)).current;
-  (0, import_react28.useEffect)(() => {
-    import_react_native8.Animated.parallel([
-      import_react_native8.Animated.timing(fadeAnim, { toValue: 1, duration: 300, useNativeDriver: true }),
-      import_react_native8.Animated.timing(slideAnim, { toValue: 0, duration: 300, useNativeDriver: true })
-    ]).start();
-  }, [fadeAnim, slideAnim]);
-  const handleEnable = async () => {
-    await push.register();
-    onComplete();
-  };
-  const benefits = [
-    "A fight you picked on goes LIVE",
-    "Your pick wins or loses",
-    "Final results and rankings"
-  ];
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: [s.container, { backgroundColor: t.background }], children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
-    import_react_native8.Animated.View,
-    {
-      style: [
-        s.stepContainer,
-        { opacity: fadeAnim, transform: [{ translateY: slideAnim }] }
-      ],
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: s.stepTop, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [s.title, { color: t.text }], children: "Enable Notifications" }),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [s.subtitle, { color: t.textMuted }], children: "Stay in the loop with real-time updates" }),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(StepIndicator, { currentStep: 3 }),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: pushStyles.iconContainer, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: [pushStyles.bellCircle, { backgroundColor: accent + "20" }], children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [pushStyles.bellIcon, { color: accent }], children: "\u{1F514}" }) }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: pushStyles.benefitsList, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [pushStyles.benefitsHeader, { color: t.text }], children: "Get real-time updates when:" }),
-            benefits.map((item, i) => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: pushStyles.benefitRow, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.View, { style: [pushStyles.bulletDot, { backgroundColor: accent }] }),
-              /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [pushStyles.benefitText, { color: t.textMuted }], children: item })
-            ] }, i))
-          ] })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_native8.View, { style: s.bottomRow, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
-            import_react_native8.TouchableOpacity,
-            {
-              style: [s.secondaryBtn, { borderColor: t.border }],
-              onPress: onComplete,
-              activeOpacity: 0.7,
-              children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: [s.secondaryBtnText, { color: t.textMuted }], children: "Maybe Later" })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
-            import_react_native8.TouchableOpacity,
-            {
-              style: [s.primaryBtn, { backgroundColor: accent, flex: 1, opacity: push.loading ? 0.7 : 1 }],
-              onPress: handleEnable,
-              disabled: push.loading,
-              activeOpacity: 0.8,
-              children: push.loading ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.ActivityIndicator, { color: "#FFFFFF", size: "small" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react_native8.Text, { style: s.primaryBtnText, children: "Enable Notifications" })
-            }
-          )
-        ] })
-      ]
-    }
-  ) });
-}
 var pushStyles = import_react_native8.StyleSheet.create({
   iconContainer: { alignItems: "center", marginVertical: 24 },
   bellCircle: { width: 100, height: 100, borderRadius: 50, justifyContent: "center", alignItems: "center" },