Prepare for vercel deploy

Author: Nzettodess

api/send-notification.js

@@ -0,0 +1,74 @@
+// Vercel serverless function to send OneSignal push notifications
+// Environment variables ONESIGNAL_API_KEY and ONESIGNAL_APP_ID must be set in Vercel dashboard
+
+export default async function handler(req, res) {
+    // Set CORS headers
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+
+    // Handle preflight
+    if (req.method === 'OPTIONS') {
+        return res.status(200).end();
+    }
+
+    // Only allow POST requests
+    if (req.method !== 'POST') {
+        return res.status(405).json({ error: 'Method not allowed' });
+    }
+
+    const { playerIds, title, message, data } = req.body;
+
+    // Validate required fields
+    if (!playerIds || !Array.isArray(playerIds) || playerIds.length === 0) {
+        return res.status(400).json({ error: 'playerIds array is required' });
+    }
+
+    if (!message) {
+        return res.status(400).json({ error: 'message is required' });
+    }
+
+    // Get secrets from environment
+    const apiKey = process.env.ONESIGNAL_API_KEY;
+    const appId = process.env.ONESIGNAL_APP_ID;
+
+    if (!apiKey || !appId) {
+        console.error('Missing ONESIGNAL_API_KEY or ONESIGNAL_APP_ID environment variables');
+        return res.status(500).json({ error: 'Server configuration error' });
+    }
+
+    // Build OneSignal notification payload
+    const notificationPayload = {
+        app_id: appId,
+        include_player_ids: playerIds,
+        headings: { en: title || 'Orbit' },
+        contents: { en: message },
+        data: data || {},
+        web_url: '/', // Open app when notification is clicked
+    };
+
+    try {
+        // Call OneSignal REST API
+        const response = await fetch('https://onesignal.com/api/v1/notifications', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Basic ${apiKey}`,
+            },
+            body: JSON.stringify(notificationPayload),
+        });
+
+        const result = await response.json();
+
+        if (!response.ok) {
+            console.error('OneSignal API error:', result);
+            return res.status(response.status).json({ error: 'OneSignal API error', details: result });
+        }
+
+        console.log('Notification sent successfully:', result.id);
+        return res.status(200).json({ success: true, notificationId: result.id });
+    } catch (error) {
+        console.error('Error sending notification:', error);
+        return res.status(500).json({ error: 'Failed to send notification' });
+    }
+}

lib/services/notification_service.dart

@@ -2,6 +2,10 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:http/http.dart' as http;
+import 'dart:convert';
+import 'dart:js_interop';
+import 'package:web/web.dart' as web;
 import '../models.dart';
 
 /// Service for managing push notifications (FCM) and in-app notifications
@@ -16,10 +20,14 @@ class NotificationService {
   static const String _pushEnabledKey = 'push_notifications_enabled';
   static const String _lastBirthdayCheckKey = 'last_birthday_check_date';
   static const String _lastMonthlyBirthdayKey = 'last_monthly_birthday_check';
+  
+  // OneSignal Push API - Vercel serverless function path
+  static const String _pushApiUrl = '/api/send-notification';
 
   bool _initialized = false;
   String? _currentUserId;
   String? _fcmToken;
+  String? _oneSignalPlayerId;
 
   /// Initialize the notification service
   Future<void> initialize(String userId) async {
@@ -44,6 +52,11 @@ class NotificationService {
     // Handle background/terminated message taps
     FirebaseMessaging.onMessageOpenedApp.listen(_handleMessageOpenedApp);
 
+    // Get OneSignal player ID and save to Firestore (web only)
+    if (kIsWeb) {
+      await _getAndSaveOneSignalPlayerId();
+    }
+    
     _initialized = true;
     debugPrint('NotificationService initialized for user: $userId');
   }
@@ -119,11 +132,124 @@ class NotificationService {
       debugPrint('Error removing FCM token: $e');
     }
 
+    // Also remove OneSignal player ID
+    if (_oneSignalPlayerId != null) {
+      try {
+        await _db.collection('users').doc(_currentUserId).update({
+          'oneSignalPlayerIds': FieldValue.arrayRemove([_oneSignalPlayerId]),
+        });
+        debugPrint('OneSignal player ID removed for user: $_currentUserId');
+      } catch (e) {
+        debugPrint('Error removing OneSignal player ID: $e');
+      }
+    }
+    
     _currentUserId = null;
     _fcmToken = null;
+    _oneSignalPlayerId = null;
     _initialized = false;
   }
 
+  // ============= OneSignal Integration =============
+
+  /// Get OneSignal player ID from JavaScript and save to Firestore
+  Future<void> _getAndSaveOneSignalPlayerId() async {
+    if (!kIsWeb) return;
+    
+    try {
+      // Call JavaScript function exposed in index.html
+      final playerId = await _callJsGetPlayerId();
+      
+      if (playerId != null && playerId.isNotEmpty) {
+        _oneSignalPlayerId = playerId;
+        await _saveOneSignalPlayerIdToFirestore(playerId);
+      }
+    } catch (e) {
+      debugPrint('Error getting OneSignal player ID: $e');
+    }
+  }
+
+  /// Call JavaScript getOneSignalPlayerId function
+  Future<String?> _callJsGetPlayerId() async {
+    if (!kIsWeb) return null;
+    
+    try {
+      final result = (web.window as dynamic).getOneSignalPlayerId?.call();
+      if (result != null) {
+        // Await the Promise
+        final jsPromise = result as JSPromise;
+        final value = await jsPromise.toDart;
+        return value?.toString();
+      }
+    } catch (e) {
+      debugPrint('JS getOneSignalPlayerId error: $e');
+    }
+    return null;
+  }
+
+  /// Save OneSignal player ID to Firestore
+  Future<void> _saveOneSignalPlayerIdToFirestore(String playerId) async {
+    if (_currentUserId == null) return;
+    
+    try {
+      await _db.collection('users').doc(_currentUserId).update({
+        'oneSignalPlayerIds': FieldValue.arrayUnion([playerId]),
+        'lastOneSignalUpdate': FieldValue.serverTimestamp(),
+      });
+      debugPrint('OneSignal player ID saved for user: $_currentUserId');
+    } catch (e) {
+      debugPrint('Error saving OneSignal player ID: $e');
+    }
+  }
+
+  /// Send push notification via Netlify serverless function
+  Future<void> _sendPushNotification({
+    required List<String> playerIds,
+    required String message,
+    String? title,
+    Map<String, dynamic>? data,
+  }) async {
+    if (playerIds.isEmpty) return;
+    
+    try {
+      final response = await http.post(
+        Uri.parse(_pushApiUrl),
+        headers: {'Content-Type': 'application/json'},
+        body: jsonEncode({
+          'playerIds': playerIds,
+          'title': title ?? 'Orbit',
+          'message': message,
+          'data': data,
+        }),
+      );
+      
+      if (response.statusCode == 200) {
+        debugPrint('Push notification sent successfully');
+      } else {
+        debugPrint('Push notification failed: ${response.body}');
+      }
+    } catch (e) {
+      debugPrint('Error sending push notification: $e');
+    }
+  }
+
+  /// Get OneSignal player IDs for a user
+  Future<List<String>> _getPlayerIdsForUser(String userId) async {
+    try {
+      final userDoc = await _db.collection('users').doc(userId).get();
+      if (userDoc.exists) {
+        final data = userDoc.data();
+        final playerIds = data?['oneSignalPlayerIds'];
+        if (playerIds != null && playerIds is List) {
+          return List<String>.from(playerIds);
+        }
+      }
+    } catch (e) {
+      debugPrint('Error getting player IDs for user $userId: $e');
+    }
+    return [];
+  }
+
   /// Handle foreground messages
   void _handleForegroundMessage(RemoteMessage message) {
     debugPrint('Foreground message received: ${message.notification?.title}');
@@ -199,11 +325,29 @@ class NotificationService {
       // Create new notification
       await _db.collection('notifications').add(notificationData);
       debugPrint('Created notification for $userId: $message');
+      
+      // Send push notification via OneSignal (don't await to avoid blocking)
+      _sendPushToUser(userId, message, type.name);
     } catch (e) {
       debugPrint('Error sending notification: $e');
     }
   }
 
+  /// Send push notification to a specific user
+  Future<void> _sendPushToUser(String userId, String message, String type) async {
+    // Don't send push to self
+    if (userId == _currentUserId) return;
+    
+    final playerIds = await _getPlayerIdsForUser(userId);
+    if (playerIds.isNotEmpty) {
+      await _sendPushNotification(
+        playerIds: playerIds,
+        message: message,
+        data: {'type': type},
+      );
+    }
+  }
+
   /// Send notifications to multiple users
   Future<void> sendNotificationToMany({
     required List<String> userIds,

pubspec.lock

@@ -915,7 +915,7 @@ packages:
     source: hosted
     version: "15.0.2"
   web:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: web
       sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"

pubspec.yaml

@@ -56,6 +56,7 @@ dependencies:
   url_launcher: ^6.3.2
   font_awesome_flutter: ^10.12.0
   firebase_messaging: ^16.0.4
+  web: ^1.1.0
 
 
 

vercel.json

@@ -0,0 +1,11 @@
+{
+    "buildCommand": "flutter build web --release",
+    "outputDirectory": "build/web",
+    "framework": null,
+    "rewrites": [
+        {
+            "source": "/(.*)",
+            "destination": "/index.html"
+        }
+    ]
+}

web/index.html

@@ -485,6 +485,43 @@ <h3>Install Orbit</h3>
     }
   </script>
 
+  <!-- OneSignal Web Push SDK -->
+  <script src="https://cdn.onesignal.com/sdks/web/v16/OneSignalSDK.page.js" defer></script>
+  <script>
+    window.OneSignalDeferred = window.OneSignalDeferred || [];
+    OneSignalDeferred.push(async function(OneSignal) {
+      await OneSignal.init({
+        appId: "YOUR_ONESIGNAL_APP_ID", // Replace with your OneSignal App ID
+        notifyButton: {
+          enable: false, // We use Flutter UI for notifications
+        },
+        allowLocalhostAsSecureOrigin: true, // For local development
+      });
+      
+      // Expose function to get player ID for Flutter
+      window.getOneSignalPlayerId = async function() {
+        try {
+          const playerId = await OneSignal.User.PushSubscription.id;
+          return playerId;
+        } catch (e) {
+          console.error('Error getting OneSignal player ID:', e);
+          return null;
+        }
+      };
+      
+      // Expose function to request permission
+      window.requestPushPermission = async function() {
+        try {
+          await OneSignal.Notifications.requestPermission();
+          return await window.getOneSignalPlayerId();
+        } catch (e) {
+          console.error('Error requesting push permission:', e);
+          return null;
+        }
+      };
+    });
+  </script>
+
   <script src="flutter_bootstrap.js" async></script>
 </body>