Merge branch 'main' into fix/auto-dropdown

Author: sharjeelyunus

CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2025-02-07
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`ensemble` - `v1.1.21`](#ensemble---v1121)
+ - [`ensemble_chat` - `v0.0.1+1`](#ensemble_chat---v0011)
+ - [`ensemble_location` - `v0.0.1+1`](#ensemble_location---v0011)
+ - [`ensemble_contacts` - `v0.0.1+1`](#ensemble_contacts---v0011)
+ - [`ensemble_auth` - `v1.0.1`](#ensemble_auth---v101)
+ - [`ensemble_camera` - `v0.0.1+1`](#ensemble_camera---v0011)
+ - [`ensemble_file_manager` - `v0.0.1+1`](#ensemble_file_manager---v0011)
+ - [`ensemble_bluetooth` - `v0.0.1+1`](#ensemble_bluetooth---v0011)
+ - [`ensemble_connect` - `v0.0.1+1`](#ensemble_connect---v0011)
+ - [`ensemble_deeplink` - `v0.0.1+1`](#ensemble_deeplink---v0011)
+ - [`ensemble_network_info` - `v0.0.1+1`](#ensemble_network_info---v0011)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `ensemble_chat` - `v0.0.1+1`
+ - `ensemble_location` - `v0.0.1+1`
+ - `ensemble_contacts` - `v0.0.1+1`
+ - `ensemble_auth` - `v1.0.1`
+ - `ensemble_camera` - `v0.0.1+1`
+ - `ensemble_file_manager` - `v0.0.1+1`
+ - `ensemble_bluetooth` - `v0.0.1+1`
+ - `ensemble_connect` - `v0.0.1+1`
+ - `ensemble_deeplink` - `v0.0.1+1`
+ - `ensemble_network_info` - `v0.0.1+1`
+
+---
+
+#### `ensemble` - `v1.1.21`
+
+
 ## 2025-02-07
 
 ### Changes

modules/auth/lib/signin/auth_manager.dart

@@ -1,5 +1,6 @@
 import 'dart:developer';
 import 'dart:io';
+import 'package:collection/collection.dart';
 
 import 'package:ensemble/action/invoke_api_action.dart';
 import 'package:ensemble/ensemble.dart';
@@ -22,6 +23,7 @@ import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:sign_in_with_apple/sign_in_with_apple.dart';
 
@@ -183,19 +185,28 @@ class AuthManager with UserAuthentication {
   }
 
   Future<FirebaseApp> _initializeFirebaseSignIn() async {
+    String? appId = await SignInUtils.getAppIdFromYaml();
+
     FirebaseOptions? options;
+
     if (kIsWeb) {
       options = Ensemble().getAccount()?.firebaseConfig?.webConfig;
     } else if (Platform.isIOS) {
       options = Ensemble().getAccount()?.firebaseConfig?.iOSConfig;
     } else if (Platform.isAndroid) {
       options = Ensemble().getAccount()?.firebaseConfig?.androidConfig;
     }
-    if (options == null) {
+    if (options == null || appId == null) {
       throw ConfigError('Firebase is not configured for this platform.');
     }
-    return await Firebase.initializeApp(
-        name: 'customFirebase', options: options);
+
+    // if the Firebase app is already initialized by other modules with same options, return it
+    FirebaseApp? existingApp = Firebase.apps.firstWhereOrNull(
+      (app) => SignInUtils.areFirebaseOptionsEqual(app.options, options!),
+    );
+
+    return existingApp ??
+        await Firebase.initializeApp(name: appId, options: options);
   }
 
   /// enrich the passed in User with information from Firebase

modules/auth/lib/signin/signin_utils.dart

@@ -1,5 +1,8 @@
 import 'package:ensemble/framework/stub/auth_context_manager.dart';
+import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/services.dart';
 import 'package:google_sign_in/google_sign_in.dart';
+import 'package:yaml/yaml.dart';
 
 class SignInUtils {
   /// convert a Google user account to our User
@@ -12,4 +15,17 @@ class SignInUtils {
           name: account.displayName,
           email: account.email,
           photo: account.photoUrl);
+
+  static Future<String?> getAppIdFromYaml() async {
+    final yamlString = await rootBundle.loadString('ensemble/ensemble-config.yaml');
+    final YamlMap yamlMap = loadYaml(yamlString);
+    return yamlMap['definitions']?['ensemble']?['appId'];
+  }
+
+  static bool areFirebaseOptionsEqual(FirebaseOptions a, FirebaseOptions b) {
+    return a.apiKey == b.apiKey &&
+      a.appId == b.appId && 
+      a.messagingSenderId == b.messagingSenderId &&
+      a.projectId == b.projectId;
+  }
 }

modules/auth/pubspec.yaml

@@ -28,7 +28,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
 
   ensemble_ts_interpreter:

modules/bracket/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
 
 dev_dependencies:

modules/camera/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:

modules/chat/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
 
   ensemble_ts_interpreter:

modules/connect/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
 
   plaid_flutter: ^3.1.2

modules/contacts/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
 
   flutter_contacts: ^1.1.7+1

modules/deeplink/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.20
+      ref: ensemble-v1.1.21
       path: modules/ensemble
 
   flutter_branch_sdk: ^7.0.1