6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit ec349771
Changed files
.../android/app/src/test/google-services.json | 29 +++++++++ comwell_key_app/firebase.json | 2 +- comwell_key_app/flutterfire-config.sh | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 38 +++++------ .../ios/flavors/test/GoogleService-Info.plist | 30 +++++++++ comwell_key_app/lib/firebase_options_test.dart | 74 ++++++++++++++++++++++ comwell_key_app/lib/utils/firebase.dart | 3 +- 7 files changed, 156 insertions(+), 22 deletions(-)
Diff
diff --git a/comwell_key_app/android/app/src/test/google-services.json b/comwell_key_app/android/app/src/test/google-services.json
new file mode 100644
index 00000000..3a7af9e7
--- /dev/null
+++ b/comwell_key_app/android/app/src/test/google-services.json
@@ -0,0 +1,29 @@
+{
+ "project_info": {
+ "project_number": "454092419952",
+ "project_id": "comwell-phoenix-test",
+ "storage_bucket": "comwell-phoenix-test.firebasestorage.app"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:454092419952:android:060b8e4744be03cca995b5",
+ "android_client_info": {
+ "package_name": "com.comwell.phoenix.test"
+ }
+ },
+ "oauth_client": [],
+ "api_key": [
+ {
+ "current_key": "AIzaSyAFiPr2EhmahyiQ1u9Ka3-yaByAFMXNkss"
+ }
+ ],
+ "services": {
+ "appinvite_service": {
+ "other_platform_oauth_client": []
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/comwell_key_app/firebase.json b/comwell_key_app/firebase.json
index 0a7dfa45..45bd8d21 100644
--- a/comwell_key_app/firebase.json
+++ b/comwell_key_app/firebase.json
@@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"comwell-phoenix","appId":"1:1031550326508:android:04a896341af4f448cdf7c9","fileOutput":"android/app/google-services.json"},"buildConfigurations":{"src/dev":{"projectId":"comwell-phoenix-dev","appId":"1:735004599167:android:3581fdbebd07fd5982f04a","fileOutput":"android/app/src/dev/google-services.json"},"src/stage":{"projectId":"comwell-phoenix-stage","appId":"1:243753787895:android:17b0c823d8c936c6b98ef2","fileOutput":"android/app/src/stage/google-services.json"}}},"ios":{"default":{"projectId":"comwell-phoenix","appId":"1:1031550326508:ios:05ac9b069efbbac9cdf7c9","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"},"buildConfigurations":{"Debug-develop":{"projectId":"comwell-phoenix-dev","appId":"1:735004599167:ios:276b6bc3fc059e9b82f04a","uploadDebugSymbols":false,"fileOutput":"ios/flavors/dev/GoogleService-Info.plist"},"Release-Stage":{"projectId":"comwell-phoenix-stage","appId":"1:243753787895:ios:24f02e213657204db98ef2","uploadDebugSymbols":false,"fileOutput":"ios/flavors/stage/GoogleService-Info.plist"}}},"macos":{"default":{"projectId":"comwell-phoenix-dev","appId":"1:735004599167:ios:33eaf052498b528b82f04a","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"comwell-phoenix","configurations":{"android":"1:1031550326508:android:04a896341af4f448cdf7c9","ios":"1:1031550326508:ios:05ac9b069efbbac9cdf7c9","macos":"1:1031550326508:ios:045894b7b1978c36cdf7c9","web":"1:1031550326508:web:ac21b20cf60305e9cdf7c9","windows":"1:1031550326508:web:fc58da0d89a34cdecdf7c9"}},"lib/firebase_options_dev.dart":{"projectId":"comwell-phoenix-dev","configurations":{"android":"1:735004599167:android:3581fdbebd07fd5982f04a","ios":"1:735004599167:ios:276b6bc3fc059e9b82f04a","macos":"1:735004599167:ios:33eaf052498b528b82f04a","web":"1:735004599167:web:8411274579b222eb82f04a","windows":"1:735004599167:web:97277ae7b23ea63b82f04a"}},"lib/firebase_options_stage.dart":{"projectId":"comwell-phoenix-stage","configurations":{"android":"1:243753787895:android:17b0c823d8c936c6b98ef2","ios":"1:243753787895:ios:24f02e213657204db98ef2","web":"1:243753787895:web:2da67a12aa776b17b98ef2"}}}}}}
\ No newline at end of file
+{"flutter":{"platforms":{"android":{"default":{"projectId":"comwell-phoenix","appId":"1:1031550326508:android:04a896341af4f448cdf7c9","fileOutput":"android/app/google-services.json"},"buildConfigurations":{"src/dev":{"projectId":"comwell-phoenix-dev","appId":"1:735004599167:android:3581fdbebd07fd5982f04a","fileOutput":"android/app/src/dev/google-services.json"},"src/stage":{"projectId":"comwell-phoenix-stage","appId":"1:243753787895:android:17b0c823d8c936c6b98ef2","fileOutput":"android/app/src/stage/google-services.json"},"src/test":{"projectId":"comwell-phoenix-test","appId":"1:454092419952:android:060b8e4744be03cca995b5","fileOutput":"android/app/src/test/google-services.json"}}},"ios":{"default":{"projectId":"comwell-phoenix","appId":"1:1031550326508:ios:05ac9b069efbbac9cdf7c9","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"},"buildConfigurations":{"Debug-develop":{"projectId":"comwell-phoenix-dev","appId":"1:735004599167:ios:276b6bc3fc059e9b82f04a","uploadDebugSymbols":false,"fileOutput":"ios/flavors/dev/GoogleService-Info.plist"},"Release-Stage":{"projectId":"comwell-phoenix-stage","appId":"1:243753787895:ios:24f02e213657204db98ef2","uploadDebugSymbols":false,"fileOutput":"ios/flavors/stage/GoogleService-Info.plist"},"Release-releasetest":{"projectId":"comwell-phoenix-test","appId":"1:454092419952:ios:4ebb640eb03646e8a995b5","uploadDebugSymbols":false,"fileOutput":"ios/flavors/test/GoogleService-Info.plist"}}},"macos":{"default":{"projectId":"comwell-phoenix-dev","appId":"1:735004599167:ios:33eaf052498b528b82f04a","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"comwell-phoenix","configurations":{"android":"1:1031550326508:android:04a896341af4f448cdf7c9","ios":"1:1031550326508:ios:05ac9b069efbbac9cdf7c9","macos":"1:1031550326508:ios:045894b7b1978c36cdf7c9","web":"1:1031550326508:web:ac21b20cf60305e9cdf7c9","windows":"1:1031550326508:web:fc58da0d89a34cdecdf7c9"}},"lib/firebase_options_dev.dart":{"projectId":"comwell-phoenix-dev","configurations":{"android":"1:735004599167:android:3581fdbebd07fd5982f04a","ios":"1:735004599167:ios:276b6bc3fc059e9b82f04a","macos":"1:735004599167:ios:33eaf052498b528b82f04a","web":"1:735004599167:web:8411274579b222eb82f04a","windows":"1:735004599167:web:97277ae7b23ea63b82f04a"}},"lib/firebase_options_stage.dart":{"projectId":"comwell-phoenix-stage","configurations":{"android":"1:243753787895:android:17b0c823d8c936c6b98ef2","ios":"1:243753787895:ios:24f02e213657204db98ef2","web":"1:243753787895:web:2da67a12aa776b17b98ef2"}},"lib/firebase_options_test.dart":{"projectId":"comwell-phoenix-test","configurations":{"android":"1:454092419952:android:060b8e4744be03cca995b5","ios":"1:454092419952:ios:4ebb640eb03646e8a995b5","web":"1:454092419952:web:0a2aa7c1a9af8fd9a995b5"}}}}}}
\ No newline at end of file
diff --git a/comwell_key_app/flutterfire-config.sh b/comwell_key_app/flutterfire-config.sh
index 9d6e43a9..0a8e9921 100644
--- a/comwell_key_app/flutterfire-config.sh
+++ b/comwell_key_app/flutterfire-config.sh
@@ -17,7 +17,7 @@ case $1 in
--android-package-name=com.comwell.phoenix.dev \
--android-out=android/app/src/dev/google-services.json
;;
- releasetest)
+ test)
flutterfire config \
--project=comwell-phoenix-test \
--out=lib/firebase_options_test.dart \
diff --git a/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj b/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
index 5fe0e671..5693d486 100644
--- a/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/comwell_key_app/ios/Runner.xcodeproj/project.pbxproj
@@ -181,7 +181,7 @@
89BF24564EDAAAD5D0F72D1E /* [CP] Copy Pods Resources */,
60A3A0652C6E297E0034E2D1 /* ShellScript */,
FA6E6FAC2B9ED1B9005DB4C1 /* Remove Duplicate Signature */,
- 7026AC593B6CC0F0960CFF23 /* FlutterFire: "flutterfire bundle-service-file" */,
+ 9A3FBC5E431A49418FB0B44A /* FlutterFire: "flutterfire bundle-service-file" */,
);
buildRules = (
);
@@ -313,24 +313,6 @@
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ \"$XCODE_VERSION_MAJOR\" = \"1500\" ]; then\n echo \"Remove signature files (Xcode 15 workaround)\"\n\n rm -rf \"$BUILD_DIR/Release-TestRelease-iphoneos/seos_mobile_keys_plugin/SeosMobileKeysSDK.xcframework-ios.signature\"\n find \"$BUILD_DIR/${CONFIGURATION}-iphoneos\" -name \"*.signature\" -type f | xargs -r rm\nfi\n";
};
- 7026AC593B6CC0F0960CFF23 /* FlutterFire: "flutterfire bundle-service-file" */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- name = "FlutterFire: \"flutterfire bundle-service-file\"";
- outputFileListPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire bundle-service-file --plist-destination=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app --build-configuration=${CONFIGURATION} --platform=ios --apple-project-path=${SRCROOT}\n";
- };
89BF24564EDAAAD5D0F72D1E /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -363,6 +345,24 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
};
+ 9A3FBC5E431A49418FB0B44A /* FlutterFire: "flutterfire bundle-service-file" */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "FlutterFire: \"flutterfire bundle-service-file\"";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire bundle-service-file --plist-destination=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app --build-configuration=${CONFIGURATION} --platform=ios --apple-project-path=${SRCROOT}\n";
+ };
FA6E6FAC2B9ED1B9005DB4C1 /* Remove Duplicate Signature */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
diff --git a/comwell_key_app/ios/flavors/test/GoogleService-Info.plist b/comwell_key_app/ios/flavors/test/GoogleService-Info.plist
new file mode 100644
index 00000000..101a8a0a
--- /dev/null
+++ b/comwell_key_app/ios/flavors/test/GoogleService-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>API_KEY</key>
+ <string>AIzaSyBxrRSPwlP8zRk5afgGX4jiOu9l3M5F-60</string>
+ <key>GCM_SENDER_ID</key>
+ <string>454092419952</string>
+ <key>PLIST_VERSION</key>
+ <string>1</string>
+ <key>BUNDLE_ID</key>
+ <string>com.comwell.phoenix.test</string>
+ <key>PROJECT_ID</key>
+ <string>comwell-phoenix-test</string>
+ <key>STORAGE_BUCKET</key>
+ <string>comwell-phoenix-test.firebasestorage.app</string>
+ <key>IS_ADS_ENABLED</key>
+ <false></false>
+ <key>IS_ANALYTICS_ENABLED</key>
+ <false></false>
+ <key>IS_APPINVITE_ENABLED</key>
+ <true></true>
+ <key>IS_GCM_ENABLED</key>
+ <true></true>
+ <key>IS_SIGNIN_ENABLED</key>
+ <true></true>
+ <key>GOOGLE_APP_ID</key>
+ <string>1:454092419952:ios:4ebb640eb03646e8a995b5</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/comwell_key_app/lib/firebase_options_test.dart b/comwell_key_app/lib/firebase_options_test.dart
new file mode 100644
index 00000000..913cf82a
--- /dev/null
+++ b/comwell_key_app/lib/firebase_options_test.dart
@@ -0,0 +1,74 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+ show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options_test.dart';
+/// // ...
+/// await Firebase.initializeApp(
+/// options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptions {
+ static FirebaseOptions get currentPlatform {
+ if (kIsWeb) {
+ return web;
+ }
+ switch (defaultTargetPlatform) {
+ case TargetPlatform.android:
+ return android;
+ case TargetPlatform.iOS:
+ return ios;
+ case TargetPlatform.macOS:
+ throw UnsupportedError(
+ 'DefaultFirebaseOptions have not been configured for macos - '
+ 'you can reconfigure this by running the FlutterFire CLI again.',
+ );
+ case TargetPlatform.windows:
+ throw UnsupportedError(
+ 'DefaultFirebaseOptions have not been configured for windows - '
+ 'you can reconfigure this by running the FlutterFire CLI again.',
+ );
+ case TargetPlatform.linux:
+ throw UnsupportedError(
+ 'DefaultFirebaseOptions have not been configured for linux - '
+ 'you can reconfigure this by running the FlutterFire CLI again.',
+ );
+ default:
+ throw UnsupportedError(
+ 'DefaultFirebaseOptions are not supported for this platform.',
+ );
+ }
+ }
+
+ static const FirebaseOptions web = FirebaseOptions(
+ apiKey: 'AIzaSyDAbKlWqeu-fDqSBe3L_7Q1wI0vTLZ9UFc',
+ appId: '1:454092419952:web:0a2aa7c1a9af8fd9a995b5',
+ messagingSenderId: '454092419952',
+ projectId: 'comwell-phoenix-test',
+ authDomain: 'comwell-phoenix-test.firebaseapp.com',
+ storageBucket: 'comwell-phoenix-test.firebasestorage.app',
+ );
+
+ static const FirebaseOptions android = FirebaseOptions(
+ apiKey: 'AIzaSyAFiPr2EhmahyiQ1u9Ka3-yaByAFMXNkss',
+ appId: '1:454092419952:android:060b8e4744be03cca995b5',
+ messagingSenderId: '454092419952',
+ projectId: 'comwell-phoenix-test',
+ storageBucket: 'comwell-phoenix-test.firebasestorage.app',
+ );
+
+ static const FirebaseOptions ios = FirebaseOptions(
+ apiKey: 'AIzaSyBxrRSPwlP8zRk5afgGX4jiOu9l3M5F-60',
+ appId: '1:454092419952:ios:4ebb640eb03646e8a995b5',
+ messagingSenderId: '454092419952',
+ projectId: 'comwell-phoenix-test',
+ storageBucket: 'comwell-phoenix-test.firebasestorage.app',
+ iosBundleId: 'com.comwell.phoenix.test',
+ );
+}
diff --git a/comwell_key_app/lib/utils/firebase.dart b/comwell_key_app/lib/utils/firebase.dart
index eb6580be..179ec061 100644
--- a/comwell_key_app/lib/utils/firebase.dart
+++ b/comwell_key_app/lib/utils/firebase.dart
@@ -4,13 +4,14 @@ import 'package:flutter/services.dart';
import '../firebase_options.dart' as prod;
import '../firebase_options_stage.dart' as stage;
+import '../firebase_options_test.dart' as test;
import '../firebase_options_dev.dart' as dev;
Future<void> configureFirebase() async {
final firebaseOptions = switch (appFlavor) {
'prod' => prod.DefaultFirebaseOptions.currentPlatform,
'stage' => stage.DefaultFirebaseOptions.currentPlatform,
- //'test' => test.DefaultFirebaseOptions.currentPlatform,
+ 'test' => test.DefaultFirebaseOptions.currentPlatform,
'dev' => dev.DefaultFirebaseOptions.currentPlatform,
_ => throw UnsupportedError('Invalid flavor: $appFlavor'),
};