Skip to content

Commit

Permalink
fix: fix error google login
Browse files Browse the repository at this point in the history
  • Loading branch information
boroboro01 committed Sep 29, 2024
1 parent 1bf97f4 commit 050f530
Show file tree
Hide file tree
Showing 54 changed files with 80 additions and 22 deletions.
23 changes: 11 additions & 12 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,28 @@
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:754445879555:android:a8dc2d555589872e04c136",
"mobilesdk_app_id": "1:754445879555:android:a6b348ed20bee7aa04c136",
"android_client_info": {
"package_name": "com.inq.saphy"
}
},
"oauth_client": [
{
"client_id": "754445879555-2cf68o04seos49f93a81tnu8mr49ev7k.apps.googleusercontent.com",
"client_id": "754445879555-95gt3epsg0eevl2rdt5rnaoquh5v635c.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.inq.saphy",
"certificate_hash": "de75bd90a439941e86d2d5df7b44b4450bc27233"
}
},
{
"client_id": "754445879555-msrjakrvhv016ltraa30o6qak37ajqoi.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.inq.saphy",
"certificate_hash": "c51808929095346237d2a1b2f70f998fab61643b"
}
},
{
"client_id": "754445879555-e2lt672vru7gia1kih23rpo3kq725m39.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDvgHWxTCbZ8jlDktwOtfAnacs5JN2ZI9o"
"current_key": "AIzaSyAXpfjBxnrqvdaH30upxsuHtuVFiA3JTFU"
}
],
"services": {
Expand All @@ -45,11 +37,18 @@
{
"client_id": "754445879555-e2lt672vru7gia1kih23rpo3kq725m39.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "754445879555-aim3102ob65o26m3vm5clj7hkspsr4jf.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.inq.saphy"
}
}
]
}
}
}
],
"configuration_version": "1"
}
}
15 changes: 12 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -559,13 +559,15 @@
baseConfigurationReference = 299F2FD69FC2D6A15493938F /* Pods-Runner.profile.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = YHJ3Z89MUG;
DEVELOPMENT_TEAM = VNA63RRH7K;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Saphy;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -586,6 +588,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = VNA63RRH7K;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.inq.saphy.RunnerTests;
Expand All @@ -605,6 +608,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = VNA63RRH7K;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.inq.saphy.RunnerTests;
Expand All @@ -622,6 +626,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = VNA63RRH7K;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.inq.saphy.RunnerTests;
Expand Down Expand Up @@ -751,13 +756,15 @@
baseConfigurationReference = 9AB6FD55F8B03AF53800968E /* Pods-Runner.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = YHJ3Z89MUG;
DEVELOPMENT_TEAM = VNA63RRH7K;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Saphy;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -777,13 +784,15 @@
baseConfigurationReference = 33DAE1C3A85C79DCF27F352F /* Pods-Runner.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = YHJ3Z89MUG;
DEVELOPMENT_TEAM = VNA63RRH7K;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Saphy;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
10 changes: 5 additions & 5 deletions ios/Runner/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>754445879555-r1fu6an4tqau05de9hc6vffif00r950b.apps.googleusercontent.com</string>
<string>754445879555-aim3102ob65o26m3vm5clj7hkspsr4jf.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.754445879555-r1fu6an4tqau05de9hc6vffif00r950b</string>
<string>com.googleusercontent.apps.754445879555-aim3102ob65o26m3vm5clj7hkspsr4jf</string>
<key>ANDROID_CLIENT_ID</key>
<string>754445879555-2cf68o04seos49f93a81tnu8mr49ev7k.apps.googleusercontent.com</string>
<key>API_KEY</key>
<string>AIzaSyCtHWeObFJDgM4Why074HeusteeltZxCbw</string>
<string>AIzaSyD5KcUUEsmJ4EUnEpYCtnsDUdlsIlaRvrY</string>
<key>GCM_SENDER_ID</key>
<string>754445879555</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.example.saphy</string>
<string>com.inq.saphy</string>
<key>PROJECT_ID</key>
<string>saphy-27f69</string>
<key>STORAGE_BUCKET</key>
Expand All @@ -31,6 +31,6 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:754445879555:ios:8ad3553c76c38b9104c136</string>
<string>1:754445879555:ios:32c64f4e933a9be504c136</string>
</dict>
</plist>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"buildConfigurations":[{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e98d2cb52fa6a8ac8814a5dccc5f36b252e","buildSettings":{"CODE_SIGNING_ALLOWED":"NO","CODE_SIGNING_IDENTITY":"-","CODE_SIGNING_REQUIRED":"NO","CONFIGURATION_BUILD_DIR":"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/GTMSessionFetcher","EXPANDED_CODE_SIGN_IDENTITY":"-","IBSC_MODULE":"GTMSessionFetcher","INFOPLIST_FILE":"Target Support Files/GTMSessionFetcher/ResourceBundle-GTMSessionFetcher_Full_Privacy-GTMSessionFetcher-Info.plist","IPHONEOS_DEPLOYMENT_TARGET":"10.0","ONLY_ACTIVE_ARCH":"NO","PRODUCT_NAME":"GTMSessionFetcher_Full_Privacy","SDKROOT":"iphoneos","SKIP_INSTALL":"YES","TARGETED_DEVICE_FAMILY":"1,2","WRAPPER_EXTENSION":"bundle"},"guid":"bfdfe7dc352907fc980b868725387e98845489dbccdf1e0545c5959228b8eed9","name":"Debug"},{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e98692e4a89acc39419a5ac3b4304c4ce75","buildSettings":{"CLANG_ENABLE_OBJC_WEAK":"NO","CODE_SIGNING_ALLOWED":"NO","CODE_SIGNING_IDENTITY":"-","CODE_SIGNING_REQUIRED":"NO","CONFIGURATION_BUILD_DIR":"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/GTMSessionFetcher","EXPANDED_CODE_SIGN_IDENTITY":"-","IBSC_MODULE":"GTMSessionFetcher","INFOPLIST_FILE":"Target Support Files/GTMSessionFetcher/ResourceBundle-GTMSessionFetcher_Full_Privacy-GTMSessionFetcher-Info.plist","IPHONEOS_DEPLOYMENT_TARGET":"10.0","PRODUCT_NAME":"GTMSessionFetcher_Full_Privacy","SDKROOT":"iphoneos","SKIP_INSTALL":"YES","TARGETED_DEVICE_FAMILY":"1,2","VALIDATE_PRODUCT":"YES","WRAPPER_EXTENSION":"bundle"},"guid":"bfdfe7dc352907fc980b868725387e986a6eb65e47a78423a9346e64c98a1a6b","name":"Profile"},{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e98692e4a89acc39419a5ac3b4304c4ce75","buildSettings":{"CODE_SIGNING_ALLOWED":"NO","CODE_SIGNING_IDENTITY":"-","CODE_SIGNING_REQUIRED":"NO","CONFIGURATION_BUILD_DIR":"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/GTMSessionFetcher","EXPANDED_CODE_SIGN_IDENTITY":"-","IBSC_MODULE":"GTMSessionFetcher","INFOPLIST_FILE":"Target Support Files/GTMSessionFetcher/ResourceBundle-GTMSessionFetcher_Full_Privacy-GTMSessionFetcher-Info.plist","IPHONEOS_DEPLOYMENT_TARGET":"10.0","PRODUCT_NAME":"GTMSessionFetcher_Full_Privacy","SDKROOT":"iphoneos","SKIP_INSTALL":"YES","TARGETED_DEVICE_FAMILY":"1,2","WRAPPER_EXTENSION":"bundle"},"guid":"bfdfe7dc352907fc980b868725387e98da53216f898bb5a109c552910044892e","name":"Release"}],"buildPhases":[{"buildFiles":[],"guid":"bfdfe7dc352907fc980b868725387e98332a67680549e6a3b6ef1915e7775b46","type":"com.apple.buildphase.sources"},{"buildFiles":[],"guid":"bfdfe7dc352907fc980b868725387e9830531ed2a7bf54a798395c799880053c","type":"com.apple.buildphase.frameworks"},{"buildFiles":[{"fileReference":"bfdfe7dc352907fc980b868725387e980fe6dd0ef8845b61c8e739596b2a6d1b","guid":"bfdfe7dc352907fc980b868725387e98a9ec5e3ed0bc757cd062923b2ab3b6a8"}],"guid":"bfdfe7dc352907fc980b868725387e983a1d29c0378e9831888abd0e1be7b7b6","type":"com.apple.buildphase.resources"}],"buildRules":[],"dependencies":[],"guid":"bfdfe7dc352907fc980b868725387e98d9a0c31ef553ffd1644ea2f5fc087d46","name":"GTMSessionFetcher-GTMSessionFetcher_Full_Privacy","productReference":{"guid":"bfdfe7dc352907fc980b868725387e989eab67172ffcb7faa039fae4c252dd63","name":"GTMSessionFetcher_Full_Privacy.bundle","type":"product"},"productTypeIdentifier":"com.apple.product-type.bundle","provisioningSourceData":[{"bundleIdentifierFromInfoPlist":"${PRODUCT_BUNDLE_IDENTIFIER}","configurationName":"Debug","provisioningStyle":0},{"bundleIdentifierFromInfoPlist":"${PRODUCT_BUNDLE_IDENTIFIER}","configurationName":"Profile","provisioningStyle":0},{"bundleIdentifierFromInfoPlist":"${PRODUCT_BUNDLE_IDENTIFIER}","configurationName":"Release","provisioningStyle":0}],"type":"standard"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"buildConfigurations":[{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e98179d9c28ab8e82c485807557619abbb2","buildSettings":{"CODE_SIGNING_ALLOWED":"NO","CODE_SIGNING_IDENTITY":"-","CODE_SIGNING_REQUIRED":"NO","CONFIGURATION_BUILD_DIR":"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/flutter_native_splash","EXPANDED_CODE_SIGN_IDENTITY":"-","IBSC_MODULE":"flutter_native_splash","INFOPLIST_FILE":"Target Support Files/flutter_native_splash/ResourceBundle-flutter_native_splash_privacy-flutter_native_splash-Info.plist","IPHONEOS_DEPLOYMENT_TARGET":"9.0","ONLY_ACTIVE_ARCH":"NO","PRODUCT_NAME":"flutter_native_splash_privacy","SDKROOT":"iphoneos","SKIP_INSTALL":"YES","TARGETED_DEVICE_FAMILY":"1,2","WRAPPER_EXTENSION":"bundle"},"guid":"bfdfe7dc352907fc980b868725387e98ae6bd2442656e63d298a0c921ea367af","name":"Debug"},{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e987287e9b7fd22ce6e4284a048605dc086","buildSettings":{"CLANG_ENABLE_OBJC_WEAK":"NO","CODE_SIGNING_ALLOWED":"NO","CODE_SIGNING_IDENTITY":"-","CODE_SIGNING_REQUIRED":"NO","CONFIGURATION_BUILD_DIR":"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/flutter_native_splash","EXPANDED_CODE_SIGN_IDENTITY":"-","IBSC_MODULE":"flutter_native_splash","INFOPLIST_FILE":"Target Support Files/flutter_native_splash/ResourceBundle-flutter_native_splash_privacy-flutter_native_splash-Info.plist","IPHONEOS_DEPLOYMENT_TARGET":"9.0","PRODUCT_NAME":"flutter_native_splash_privacy","SDKROOT":"iphoneos","SKIP_INSTALL":"YES","TARGETED_DEVICE_FAMILY":"1,2","VALIDATE_PRODUCT":"YES","WRAPPER_EXTENSION":"bundle"},"guid":"bfdfe7dc352907fc980b868725387e9863a44d473c76becd5a72e9233dfa0f8b","name":"Profile"},{"baseConfigurationFileReference":"bfdfe7dc352907fc980b868725387e987287e9b7fd22ce6e4284a048605dc086","buildSettings":{"CODE_SIGNING_ALLOWED":"NO","CODE_SIGNING_IDENTITY":"-","CODE_SIGNING_REQUIRED":"NO","CONFIGURATION_BUILD_DIR":"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/flutter_native_splash","EXPANDED_CODE_SIGN_IDENTITY":"-","IBSC_MODULE":"flutter_native_splash","INFOPLIST_FILE":"Target Support Files/flutter_native_splash/ResourceBundle-flutter_native_splash_privacy-flutter_native_splash-Info.plist","IPHONEOS_DEPLOYMENT_TARGET":"9.0","PRODUCT_NAME":"flutter_native_splash_privacy","SDKROOT":"iphoneos","SKIP_INSTALL":"YES","TARGETED_DEVICE_FAMILY":"1,2","WRAPPER_EXTENSION":"bundle"},"guid":"bfdfe7dc352907fc980b868725387e986bd4c4a809adc62afc23030a574bb536","name":"Release"}],"buildPhases":[{"buildFiles":[],"guid":"bfdfe7dc352907fc980b868725387e98e3d97c9b8cf7e850abf27b73860ebf0e","type":"com.apple.buildphase.sources"},{"buildFiles":[],"guid":"bfdfe7dc352907fc980b868725387e983e0867ec22b75e9becf1cce48860c510","type":"com.apple.buildphase.frameworks"},{"buildFiles":[{"fileReference":"bfdfe7dc352907fc980b868725387e9861aca3ade2821d4e4d25a7397a69b2ab","guid":"bfdfe7dc352907fc980b868725387e9864854f63623bfc9f18f4fa34cf942050"}],"guid":"bfdfe7dc352907fc980b868725387e98195ee1bd80699ea0a6af4393c8370a4f","type":"com.apple.buildphase.resources"}],"buildRules":[],"dependencies":[],"guid":"bfdfe7dc352907fc980b868725387e9861233620df33996cccf430ed75b4a999","name":"flutter_native_splash-flutter_native_splash_privacy","productReference":{"guid":"bfdfe7dc352907fc980b868725387e98640e376f8759837464f22e16bcf9542e","name":"flutter_native_splash_privacy.bundle","type":"product"},"productTypeIdentifier":"com.apple.product-type.bundle","provisioningSourceData":[{"bundleIdentifierFromInfoPlist":"${PRODUCT_BUNDLE_IDENTIFIER}","configurationName":"Debug","provisioningStyle":0},{"bundleIdentifierFromInfoPlist":"${PRODUCT_BUNDLE_IDENTIFIER}","configurationName":"Profile","provisioningStyle":0},{"bundleIdentifierFromInfoPlist":"${PRODUCT_BUNDLE_IDENTIFIER}","configurationName":"Release","provisioningStyle":0}],"type":"standard"}
Loading

0 comments on commit 050f530

Please sign in to comment.