feat: Upgrade Firebase Functions dependencies, enhance notification service with APNS support and FCM

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "travelmate-a47f5"
+  }
+}

android/app/build.gradle.kts

@@ -22,6 +22,7 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
 
     kotlinOptions {
@@ -59,6 +60,10 @@ android {
     }
 }
 
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+}
+
 flutter {
     source = "../.."
 }

firebase.json

@@ -1 +1,37 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"travelmate-a47f5","appId":"1:521527250907:android:be3db7fc84f053ec7da1fe","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"travelmate-a47f5","configurations":{"android":"1:521527250907:android:be3db7fc84f053ec7da1fe","ios":"1:521527250907:ios:64b41be39c54db1c7da1fe","windows":"1:521527250907:web:53ff98bcdb8c218f7da1fe"}}}}}}
+{
+  "flutter": {
+    "platforms": {
+      "android": {
+        "default": {
+          "projectId": "travelmate-a47f5",
+          "appId": "1:521527250907:android:be3db7fc84f053ec7da1fe",
+          "fileOutput": "android/app/google-services.json"
+        }
+      },
+      "dart": {
+        "lib/firebase_options.dart": {
+          "projectId": "travelmate-a47f5",
+          "configurations": {
+            "android": "1:521527250907:android:be3db7fc84f053ec7da1fe",
+            "ios": "1:521527250907:ios:64b41be39c54db1c7da1fe",
+            "windows": "1:521527250907:web:53ff98bcdb8c218f7da1fe"
+          }
+        }
+      }
+    }
+  },
+  "functions": [
+    {
+      "source": "functions",
+      "codebase": "default",
+      "disallowLegacyRuntimeConfig": true,
+      "ignore": [
+        "node_modules",
+        ".git",
+        "firebase-debug.log",
+        "firebase-debug.*.log",
+        "*.local"
+      ]
+    }
+  ]
+}

functions/.gitignore

@@ -0,0 +1,2 @@
+node_modules/
+*.local

functions/index.js

@@ -1,27 +1,14 @@
-const functions = require("firebase-functions");
+const functions = require("firebase-functions/v1");
 const admin = require("firebase-admin");
 
 admin.initializeApp();
 
-// Helper function to send notifications
+// Helper function to send notifications to a list of users
-async function sendNotificationToTripParticipants(tripId, title, body, excludeUserId) {
+async function sendNotificationToUsers(userIds, title, body, excludeUserId, data = {}) {
     try {
-        const tripDoc = await admin.firestore().collection("trips").doc(tripId).get();
-        if (!tripDoc.exists) {
-            console.log(`Trip ${tripId} not found`);
-            return;
-        }
-
-        const trip = tripDoc.data();
-        const participants = trip.participants || [];
-        // Add creator if not in participants list (though usually they are)
-        if (trip.createdBy && !participants.includes(trip.createdBy)) {
-            participants.push(trip.createdBy);
-        }
-
         const tokens = [];
 
-        for (const userId of participants) {
+        for (const userId of userIds) {
             if (userId === excludeUserId) continue;
 
             const userDoc = await admin.firestore().collection("users").doc(userId).get();
@@ -41,8 +28,8 @@ async function sendNotificationToTripParticipants(tripId, title, body, excludeUs
                 },
                 tokens: tokens,
                 data: {
-                    tripId: tripId,
                     click_action: "FLUTTER_NOTIFICATION_CLICK",
+                    ...data
                 },
             };
 
@@ -55,13 +42,31 @@ async function sendNotificationToTripParticipants(tripId, title, body, excludeUs
 }
 
 exports.onActivityCreated = functions.firestore
-    .document("trips/{tripId}/activities/{activityId}")
+    .document("activities/{activityId}")
     .onCreate(async (snapshot, context) => {
         const activity = snapshot.data();
-        const tripId = context.params.tripId;
+        const tripId = activity.tripId;
-        const createdBy = activity.createdBy || "Unknown"; // Assuming createdBy field exists
+        const createdBy = activity.createdBy || "Unknown";
 
-        // Fetch creator name if possible, otherwise use generic message
+        if (!tripId) {
+            console.log("No tripId found in activity");
+            return;
+        }
+
+        // Fetch trip to get participants
+        const tripDoc = await admin.firestore().collection("trips").doc(tripId).get();
+        if (!tripDoc.exists) {
+            console.log(`Trip ${tripId} not found`);
+            return;
+        }
+
+        const trip = tripDoc.data();
+        const participants = trip.participants || [];
+        if (trip.createdBy && !participants.includes(trip.createdBy)) {
+            participants.push(trip.createdBy);
+        }
+
+        // Fetch creator name
         let creatorName = "Quelqu'un";
         if (createdBy !== "Unknown") {
             const userDoc = await admin.firestore().collection("users").doc(createdBy).get();
@@ -70,56 +75,72 @@ exports.onActivityCreated = functions.firestore
             }
         }
 
-        await sendNotificationToTripParticipants(
+        await sendNotificationToUsers(
-            tripId,
+            participants,
             "Nouvelle activité !",
-            `${creatorName} a ajouté une nouvelle activité : ${activity.title}`,
+            `${creatorName} a ajouté une nouvelle activité : ${activity.name || activity.title}`,
-            createdBy
+            createdBy,
+            { tripId: tripId }
         );
     });
 
 exports.onMessageCreated = functions.firestore
-    .document("trips/{tripId}/messages/{messageId}")
+    .document("groups/{groupId}/messages/{messageId}")
     .onCreate(async (snapshot, context) => {
         const message = snapshot.data();
-        const tripId = context.params.tripId;
+        const groupId = context.params.groupId;
         const senderId = message.senderId;
 
-        let senderName = "Quelqu'un";
+        // Fetch group to get members
-        if (senderId) {
+        const groupDoc = await admin.firestore().collection("groups").doc(groupId).get();
-            const userDoc = await admin.firestore().collection("users").doc(senderId).get();
+        if (!groupDoc.exists) {
-            if (userDoc.exists) {
+            console.log(`Group ${groupId} not found`);
-                senderName = userDoc.data().prenom || "Quelqu'un";
+            return;
-            }
         }
 
-        await sendNotificationToTripParticipants(
+        const group = groupDoc.data();
-            tripId,
+        const memberIds = group.memberIds || [];
+
+        let senderName = message.senderName || "Quelqu'un";
+
+        await sendNotificationToUsers(
+            memberIds,
             "Nouveau message",
-            `${senderName} : ${message.content}`,
+            `${senderName} : ${message.text}`,
-            senderId
+            senderId,
+            { groupId: groupId }
         );
     });
 
 exports.onExpenseCreated = functions.firestore
-    .document("trips/{tripId}/expenses/{expenseId}")
+    .document("expenses/{expenseId}")
     .onCreate(async (snapshot, context) => {
         const expense = snapshot.data();
-        const tripId = context.params.tripId;
+        const groupId = expense.groupId;
-        const paidBy = expense.paidBy;
+        const paidBy = expense.paidById || expense.paidBy;
 
-        let payerName = "Quelqu'un";
+        if (!groupId) {
-        if (paidBy) {
+            console.log("No groupId found in expense");
-            const userDoc = await admin.firestore().collection("users").doc(paidBy).get();
+            return;
-            if (userDoc.exists) {
-                payerName = userDoc.data().prenom || "Quelqu'un";
-            }
         }
 
-        await sendNotificationToTripParticipants(
+        // Fetch group to get members
-            tripId,
+        const groupDoc = await admin.firestore().collection("groups").doc(groupId).get();
+        if (!groupDoc.exists) {
+            console.log(`Group ${groupId} not found`);
+            return;
+        }
+
+        const group = groupDoc.data();
+        const memberIds = group.memberIds || [];
+
+        let payerName = expense.paidByName || "Quelqu'un";
+
+        await sendNotificationToUsers(
+            memberIds,
             "Nouvelle dépense",
             `${payerName} a ajouté une dépense : ${expense.amount} ${expense.currency || '€'}`,
-            paidBy
+            paidBy,
+            { groupId: groupId }
         );
     });

functions/package.json

@@ -1,25 +1,23 @@
 {
-    "name": "functions",
+  "name": "functions",
-    "description": "Cloud Functions for Travel Mate",
+  "description": "Cloud Functions for Firebase",
-    "scripts": {
+  "scripts": {
-        "lint": "eslint .",
+    "serve": "firebase emulators:start --only functions",
-        "serve": "firebase emulators:start --only functions",
+    "shell": "firebase functions:shell",
-        "shell": "firebase functions:shell",
+    "start": "npm run shell",
-        "start": "npm run shell",
+    "deploy": "firebase deploy --only functions",
-        "deploy": "firebase deploy --only functions",
+    "logs": "firebase functions:log"
-        "logs": "firebase functions:log"
+  },
-    },
+  "engines": {
-    "engines": {
+    "node": "20"
-        "node": "18"
+  },
-    },
+  "main": "index.js",
-    "main": "index.js",
+  "dependencies": {
-    "dependencies": {
+    "firebase-admin": "^13.6.0",
-        "firebase-admin": "^11.8.0",
+    "firebase-functions": "^7.0.0"
-        "firebase-functions": "^4.3.1"
+  },
-    },
+  "devDependencies": {
-    "devDependencies": {
+    "firebase-functions-test": "^3.4.1"
-        "eslint": "^8.15.0",
+  },
-        "eslint-config-google": "^0.14.0"
+  "private": true
-    },
-    "private": true
 }

ios/Podfile.lock

@@ -1216,6 +1216,9 @@ PODS:
   - Firebase/Firestore (12.4.0):
     - Firebase/CoreOnly
     - FirebaseFirestore (~> 12.4.0)
+  - Firebase/Messaging (12.4.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 12.4.0)
   - Firebase/Storage (12.4.0):
     - Firebase/CoreOnly
     - FirebaseStorage (~> 12.4.0)
@@ -1223,9 +1226,13 @@ PODS:
     - Firebase/Auth (= 12.4.0)
     - firebase_core
     - Flutter
-  - firebase_core (4.2.0):
+  - firebase_core (4.2.1):
     - Firebase/CoreOnly (= 12.4.0)
     - Flutter
+  - firebase_messaging (16.0.4):
+    - Firebase/Messaging (= 12.4.0)
+    - firebase_core
+    - Flutter
   - firebase_storage (13.0.3):
     - Firebase/Storage (= 12.4.0)
     - firebase_core
@@ -1269,6 +1276,20 @@ PODS:
     - gRPC-Core (~> 1.69.0)
     - leveldb-library (~> 1.22)
     - nanopb (~> 3.30910.0)
+  - FirebaseInstallations (12.4.0):
+    - FirebaseCore (~> 12.4.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - PromisesObjC (~> 2.4)
+  - FirebaseMessaging (12.4.0):
+    - FirebaseCore (~> 12.4.0)
+    - FirebaseInstallations (~> 12.4.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Reachability (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
   - FirebaseSharedSwift (12.4.0)
   - FirebaseStorage (12.4.0):
     - FirebaseAppCheckInterop (~> 12.4.0)
@@ -1278,6 +1299,8 @@ PODS:
     - GoogleUtilities/Environment (~> 8.1)
     - GTMSessionFetcher/Core (< 6.0, >= 3.4)
   - Flutter (1.0.0)
+  - flutter_local_notifications (0.0.1):
+    - Flutter
   - geolocator_apple (1.2.0):
     - Flutter
     - FlutterMacOS
@@ -1292,6 +1315,9 @@ PODS:
     - FlutterMacOS
     - GoogleSignIn (~> 9.0)
     - GTMSessionFetcher (>= 3.4.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - GoogleMaps (9.4.0):
     - GoogleMaps/Maps (= 9.4.0)
   - GoogleMaps/Maps (9.4.0)
@@ -1456,8 +1482,10 @@ DEPENDENCIES:
   - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
   - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
   - Flutter (from `Flutter`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
   - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
@@ -1485,9 +1513,12 @@ SPEC REPOS:
     - FirebaseCoreInternal
     - FirebaseFirestore
     - FirebaseFirestoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
     - FirebaseSharedSwift
     - FirebaseStorage
     - Google-Maps-iOS-Utils
+    - GoogleDataTransport
     - GoogleMaps
     - GoogleSignIn
     - GoogleUtilities
@@ -1507,10 +1538,14 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_auth/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_messaging:
+    :path: ".symlinks/plugins/firebase_messaging/ios"
   firebase_storage:
     :path: ".symlinks/plugins/firebase_storage/ios"
   Flutter:
     :path: Flutter
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/darwin"
   google_maps_flutter_ios:
@@ -1542,7 +1577,8 @@ SPEC CHECKSUMS:
   cloud_firestore: 79014bb3b303d451717ed5fe69fded8a2b2e8dc2
   Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
   firebase_auth: c2b8be95d602d4e8a9148fae72333ef78e69cc20
-  firebase_core: 744984dbbed8b3036abf34f0b98d80f130a7e464
+  firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
+  firebase_messaging: c17a29984eafce4b2997fe078bb0a9e0b06f5dde
   firebase_storage: 0ba617a05b24aec050395e4d5d3773c0d7518a15
   FirebaseAppCheckInterop: f734c802f21fe1da0837708f0f9a27218c8a4ed0
   FirebaseAuth: 4a2aed737c84114a9d9b33d11ae1b147d6b94889
@@ -1552,13 +1588,17 @@ SPEC CHECKSUMS:
   FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
   FirebaseFirestore: 2a6183381cf7679b1bb000eb76a8e3178e25dee2
   FirebaseFirestoreInternal: 6577a27cd5dc3722b900042527f86d4ea1626134
+  FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
+  FirebaseMessaging: d33971b7bb252745ea6cd31ab190d1a1df4b8ed5
   FirebaseSharedSwift: 93426a1de92f19e1199fac5295a4f8df16458daa
   FirebaseStorage: 20d6b56fb8a40ebaa03d6a2889fe33dac64adb73
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
   google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
   google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
   GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1

lib/blocs/user/user_bloc.dart

@@ -1,6 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:travel_mate/services/notification_service.dart';
 import 'user_event.dart' as event;
 import 'user_state.dart' as state;
 
@@ -45,6 +46,12 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
         return;
       }
 
+      // Initialize notifications and update token
+      final notificationService = NotificationService();
+      await notificationService.initialize();
+      final fcmToken = await notificationService.getFCMToken();
+      print('DEBUG: UserBloc - FCM Token retrieved: $fcmToken');
+
       // Fetch user data from Firestore
       final userDoc = await _firestore
           .collection('users')
@@ -57,6 +64,7 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
           id: currentUser.uid,
           email: currentUser.email ?? '',
           prenom: currentUser.displayName ?? 'Voyageur',
+          fcmToken: fcmToken,
         );
 
         await _firestore
@@ -70,6 +78,20 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
           'id': currentUser.uid,
           ...userDoc.data()!,
         });
+
+        // Update FCM token if it changed
+        if (fcmToken != null && user.fcmToken != fcmToken) {
+          print('DEBUG: UserBloc - Updating FCM token in Firestore');
+          await _firestore.collection('users').doc(currentUser.uid).update({
+            'fcmToken': fcmToken,
+          });
+          print('DEBUG: UserBloc - FCM token updated');
+        } else {
+          print(
+            'DEBUG: UserBloc - FCM token not updated. Local: $fcmToken, Firestore: ${user.fcmToken}',
+          );
+        }
+
         emit(state.UserLoaded(user));
       }
     } catch (e) {

lib/blocs/user/user_state.dart

@@ -81,6 +81,9 @@ class UserModel {
   /// User's profile picture URL (optional).
   final String? profilePictureUrl;
 
+  /// Firebase Cloud Messaging token for push notifications.
+  final String? fcmToken;
+
   /// Creates a new [UserModel] instance.
   ///
   /// [id], [email], and [prenom] are required fields.
@@ -93,6 +96,7 @@ class UserModel {
     this.authMethod,
     this.phoneNumber,
     this.profilePictureUrl,
+    this.fcmToken,
   });
 
   /// Creates a [UserModel] instance from a JSON map.
@@ -108,6 +112,7 @@ class UserModel {
       authMethod: json['authMethod'] ?? json['platform'],
       phoneNumber: json['phoneNumber'],
       profilePictureUrl: json['profilePictureUrl'],
+      fcmToken: json['fcmToken'],
     );
   }
 
@@ -123,6 +128,7 @@ class UserModel {
       'authMethod': authMethod,
       'phoneNumber': phoneNumber,
       'profilePictureUrl': profilePictureUrl,
+      'fcmToken': fcmToken,
     };
   }
 }

lib/components/account/group_expenses_page.dart

@@ -213,8 +213,8 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
         ),
       ),
       floatingActionButton: FloatingActionButton(
+        heroTag: 'group_expenses_fab',
         onPressed: _showAddExpenseDialog,
-        heroTag: "add_expense_fab",
         backgroundColor: Colors.blue,
         foregroundColor: Colors.white,
         elevation: 4,

lib/components/home/home_content.dart

@@ -155,6 +155,7 @@ class _HomeContentState extends State<HomeContent>
                 ),
               ),
               floatingActionButton: FloatingActionButton(
+                heroTag: 'home_fab',
                 onPressed: () async {
                   final tripBloc = context.read<TripBloc>();
 

lib/components/map/map_content.dart

@@ -663,6 +663,7 @@ class _MapContentState extends State<MapContent> {
       ),
 
       floatingActionButton: FloatingActionButton(
+        heroTag: 'map_fab',
         onPressed: _getCurrentLocation,
         tooltip: 'Ma position',
         child: const Icon(Icons.my_location),

lib/services/notification_service.dart

@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:travel_mate/services/logger_service.dart';
@@ -58,7 +59,26 @@ class NotificationService {
 
   Future<String?> getFCMToken() async {
     try {
-      return await _firebaseMessaging.getToken();
+      if (Platform.isIOS) {
+        String? apnsToken = await _firebaseMessaging.getAPNSToken();
+        int retries = 0;
+        while (apnsToken == null && retries < 3) {
+          LoggerService.info(
+            'Waiting for APNS token... (Attempt ${retries + 1}/3)',
+          );
+          await Future.delayed(const Duration(seconds: 1));
+          apnsToken = await _firebaseMessaging.getAPNSToken();
+          retries++;
+        }
+        if (apnsToken == null) {
+          LoggerService.error('APNS token not available after retries');
+          return null;
+        }
+      }
+
+      final token = await _firebaseMessaging.getToken();
+      LoggerService.info('NotificationService - FCM Token: $token');
+      return token;
     } catch (e) {
       LoggerService.error('Error getting FCM token: $e');
       return null;