diff --git a/mobile-apps/client-app/android/app/src/dev/google-services.json b/mobile-apps/client-app/android/app/src/dev/google-services.json index a11bbd27..1e592d44 100644 --- a/mobile-apps/client-app/android/app/src/dev/google-services.json +++ b/mobile-apps/client-app/android/app/src/dev/google-services.json @@ -31,10 +31,10 @@ "client_type": 3 }, { - "client_id": "933560802882-qgbq6m04moicvkff2b3i6p9agu7i4gou.apps.googleusercontent.com", + "client_id": "933560802882-dppsapp5i3lsfrlm1mhob2s21peofg1t.apps.googleusercontent.com", "client_type": 2, "ios_info": { - "bundle_id": "com.krow.app.dev" + "bundle_id": "com.krow.app.staff.dev" } } ] @@ -43,9 +43,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:933560802882:android:f4587798877cbb917757db", + "mobilesdk_app_id": "1:933560802882:android:d49b8c0f4d19e95e7757db", "android_client_info": { - "package_name": "com.krow.app.dev" + "package_name": "com.krow.app.staff.dev" } }, "oauth_client": [ @@ -67,10 +67,10 @@ "client_type": 3 }, { - "client_id": "933560802882-qgbq6m04moicvkff2b3i6p9agu7i4gou.apps.googleusercontent.com", + "client_id": "933560802882-dppsapp5i3lsfrlm1mhob2s21peofg1t.apps.googleusercontent.com", "client_type": 2, "ios_info": { - "bundle_id": "com.krow.app.dev" + "bundle_id": "com.krow.app.staff.dev" } } ] diff --git a/mobile-apps/client-app/android/app/src/staging/google-services.json b/mobile-apps/client-app/android/app/src/staging/google-services.json index fce47d44..e8a70f5f 100644 --- a/mobile-apps/client-app/android/app/src/staging/google-services.json +++ b/mobile-apps/client-app/android/app/src/staging/google-services.json @@ -26,9 +26,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:1032971403708:android:87edb39679f806ab356bb9", + "mobilesdk_app_id": "1:1032971403708:android:6e5031c203f01cc2356bb9", "android_client_info": { - "package_name": "com.krow.app.staging" + "package_name": "com.krow.app.staff.staging" } }, "oauth_client": [], diff --git a/mobile-apps/client-app/firebase.json b/mobile-apps/client-app/firebase.json index 483a5629..2b43948c 100644 --- a/mobile-apps/client-app/firebase.json +++ b/mobile-apps/client-app/firebase.json @@ -3,9 +3,9 @@ "platforms": { "android": { "default": { - "projectId": "krow-staging", - "appId": "1:14482748607:android:85b147490ff76b6924820a", - "fileOutput": "android/app/google-services.json" + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:android:edcddb83ea4bbb517757db", + "fileOutput": "android/app/src/dev/google-services.json" }, "buildConfigurations": { "src/dev": { @@ -22,13 +22,43 @@ }, "ios": { "default": { - "projectId": "krow-staging", - "appId": "1:14482748607:ios:229a7ce2d64cb09f24820a", + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", "uploadDebugSymbols": false, - "fileOutput": "ios/Runner/GoogleService-Info.plist" + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" }, - "targets": { - "Runner": { + "buildConfigurations": { + "Debug-dev": { + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" + }, + "Profile-dev": { + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" + }, + "Release-dev": { + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" + }, + "Debug-staging": { + "projectId": "krow-workforce-staging", + "appId": "1:1032971403708:ios:b1a21a7337a268b3356bb9", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/staging/GoogleService-Info.plist" + }, + "Profile-staging": { + "projectId": "krow-workforce-staging", + "appId": "1:1032971403708:ios:b1a21a7337a268b3356bb9", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/staging/GoogleService-Info.plist" + }, + "Release-staging": { "projectId": "krow-workforce-staging", "appId": "1:1032971403708:ios:b1a21a7337a268b3356bb9", "uploadDebugSymbols": false, diff --git a/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj b/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj index 167d0898..432e1485 100644 --- a/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj +++ b/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj @@ -293,6 +293,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, E648481602389E2D8F8AC745 /* [CP] Embed Pods Frameworks */, + 813D81FA3CE3C2588A3A04E8 /* FlutterFire: "flutterfire bundle-service-file" */, ); buildRules = ( ); @@ -404,6 +405,24 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 813D81FA3CE3C2588A3A04E8 /* 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:${PUB_CACHE}/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"; + }; 8BBA6BE72D3FC8D400FDA749 /* copy googleservices */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/mobile-apps/client-app/lib/firebase_options_dev.dart b/mobile-apps/client-app/lib/firebase_options_dev.dart index 5a991808..0aaff462 100644 --- a/mobile-apps/client-app/lib/firebase_options_dev.dart +++ b/mobile-apps/client-app/lib/firebase_options_dev.dart @@ -66,4 +66,5 @@ class DefaultFirebaseOptions { iosClientId: '933560802882-ml2526jqnnsteent4i9li50c00hisoge.apps.googleusercontent.com', iosBundleId: 'com.krow.app.business.dev', ); -} + +} \ No newline at end of file diff --git a/mobile-apps/client-app/lib/firebase_options_staging.dart b/mobile-apps/client-app/lib/firebase_options_staging.dart index b95107f7..d913e995 100644 --- a/mobile-apps/client-app/lib/firebase_options_staging.dart +++ b/mobile-apps/client-app/lib/firebase_options_staging.dart @@ -65,4 +65,5 @@ class DefaultFirebaseOptions { storageBucket: 'krow-workforce-staging.firebasestorage.app', iosBundleId: 'com.krow.app.business.staging', ); -} + +} \ No newline at end of file