fix: improve ios bundleID regex to stop bundleIDs from throwing incor…

…rectly (#357) Co-authored-by: russellwheatley <[email protected]>
invertase · Jan 14, 2025 · b048aad · b048aad
1 parent 2a0f09a
commit b048aad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/packages/flutterfire_cli/lib/src/common/utils.dart b/packages/flutterfire_cli/lib/src/common/utils.dart
@@ -511,7 +511,7 @@ void validateAppBundleId(
   String platform,
 ) {
   final bundleIdRegex = RegExp(
-    r'^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)+$',
+  r'^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?|([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)+))$',
   );
 
   if (!bundleIdRegex.hasMatch(bundleId)) {

diff --git a/packages/flutterfire_cli/test/unit_test.dart b/packages/flutterfire_cli/test/unit_test.dart
@@ -42,6 +42,20 @@ void main() {
         ),
         returnsNormally,
       );
+      expect(
+        () => validateAppBundleId(
+          'example',
+          kIos,
+        ),
+        returnsNormally,
+      );
+      expect(
+        () => validateAppBundleId(
+          'exampleEN',
+          kIos,
+        ),
+        returnsNormally,
+      );
     });
 
     test('Invalid bundle IDs', () {
@@ -73,13 +87,6 @@ void main() {
         ),
         throwsA(isA<ValidationException>()),
       );
-      expect(
-        () => validateAppBundleId(
-          'example',
-          kIos,
-        ),
-        throwsA(isA<ValidationException>()),
-      );
     });
   });