Remove yourcompany.com from google_sign_in (#451)
diff --git a/packages/google_sign_in/example/android/app/google-services.json b/packages/google_sign_in/example/android/app/google-services.json index 0e5dd28..71b39ee 100755 --- a/packages/google_sign_in/example/android/app/google-services.json +++ b/packages/google_sign_in/example/android/app/google-services.json
@@ -1,189 +1,35 @@ { "project_info": { - "project_number": "861823949799", - "project_id": "tensile-market-126823" + "project_number": "159623150305", + "firebase_url": "https://flutter-firebase-plugins.firebaseio.com", + "project_id": "flutter-firebase-plugins", + "storage_bucket": "flutter-firebase-plugins.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:861823949799:android:ac633ff55751026b", - "android_client_info": { - "package_name": "com.google.google_sign_in.example" - } - }, - "oauth_client": [ - { - "client_id": "861823949799-b79ooadae3620tevk9fuevahrict0j83.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.google_sign_in.example", - "certificate_hash": "c3adef7e7773e40e777d5c236dbba7461cbea5f0" - } - }, - { - "client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 1 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:861823949799:android:267a23c68c23f34f", - "android_client_info": { - "package_name": "com.example.flutter.google_sign_in" - } - }, - "oauth_client": [ - { - "client_id": "861823949799-jgmubfm8604lngvm9lt8fil9f4nefp5t.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.example.flutter.google_sign_in", - "certificate_hash": "8a4e194f5bfc3fb1075e7daae8dcddd526fde207" - } - }, - { - "client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 1 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:861823949799:android:84a1951f08b82133", - "android_client_info": { - "package_name": "com.example.google_sign_in" - } - }, - "oauth_client": [ - { - "client_id": "861823949799-en18k5ut51ehp64chfifrlk52pojaqjo.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.example.google_sign_in", - "certificate_hash": "eda6413c3e3a95492114fe07cd953ad897e40d1a" - } - }, - { - "client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 1 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:861823949799:android:27717105cac89fff", - "android_client_info": { - "package_name": "com.yourcompany.googlesignin.example" - } - }, - "oauth_client": [ - { - "client_id": "861823949799-jo91u6af10qflkh9gtk61gbu9rekeqin.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.yourcompany.googlesignin.example", - "certificate_hash": "8a4e194f5bfc3fb1075e7daae8dcddd526fde207" - } - }, - { - "client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 1 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:861823949799:android:24b94c3718c846a6", + "mobilesdk_app_id": "1:159623150305:android:5e9f1f89e134dc86", "android_client_info": { "package_name": "io.flutter.plugins.googlesigninexample" } }, "oauth_client": [ { - "client_id": "861823949799-19gil347tgrk0l0k694196i1m1uef404.apps.googleusercontent.com", + "client_id": "159623150305-3suu3qq4vs3ki7uaigbtrh2aal1p9ram.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "io.flutter.plugins.googlesigninexample", - "certificate_hash": "c3adef7e7773e40e777d5c236dbba7461cbea5f0" + "certificate_hash": "f8323ac5fe6e7adc1ddc5612e16b5d04d7f1358b" } }, { - "client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com", + "client_id": "159623150305-q05bbbtsutr02abhips3suj7hujfk4bg.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M" + "current_key": "AIzaSyChk3KEG7QYrs4kQPLP1tjJNxBTbfCAdgg" } ], "services": {
diff --git a/packages/google_sign_in/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_sign_in/example/ios/Runner.xcodeproj/project.pbxproj index a751439..737ec06 100755 --- a/packages/google_sign_in/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_sign_in/example/ios/Runner.xcodeproj/project.pbxproj
@@ -189,7 +189,6 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 3GRKCVVJ22; }; }; }; @@ -251,9 +250,14 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", + "${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib", + "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -266,9 +270,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -295,13 +302,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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"; + 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; }; /* End PBXShellScriptBuildPhase section */ @@ -435,7 +445,6 @@ buildSettings = { ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 3GRKCVVJ22; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -447,7 +456,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.googlesignin.example; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.googleSignInExample; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -458,7 +467,6 @@ buildSettings = { ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 3GRKCVVJ22; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -470,7 +478,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.googlesignin.example; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.googleSignInExample; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release;
diff --git a/packages/google_sign_in/example/ios/Runner/GoogleService-Info.plist b/packages/google_sign_in/example/ios/Runner/GoogleService-Info.plist index 1fa6d38..cf6df7e 100755 --- a/packages/google_sign_in/example/ios/Runner/GoogleService-Info.plist +++ b/packages/google_sign_in/example/ios/Runner/GoogleService-Info.plist
@@ -2,27 +2,39 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>AD_UNIT_ID_FOR_BANNER_TEST</key> + <string>ca-app-pub-3940256099942544/2934735716</string> + <key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key> + <string>ca-app-pub-3940256099942544/4411468910</string> <key>CLIENT_ID</key> - <string>861823949799-vc35cprkp249096uujjn0vvnmcvjppkn.apps.googleusercontent.com</string> + <string>159623150305-kpfutmlf03mmgfbp50771s90mphu1uop.apps.googleusercontent.com</string> <key>REVERSED_CLIENT_ID</key> - <string>com.googleusercontent.apps.861823949799-vc35cprkp249096uujjn0vvnmcvjppkn</string> + <string>com.googleusercontent.apps.159623150305-kpfutmlf03mmgfbp50771s90mphu1uop</string> + <key>API_KEY</key> + <string>AIzaSyDyzecVw1zXTpBKwfFHxpl7QyYBhimNhUk</string> + <key>GCM_SENDER_ID</key> + <string>159623150305</string> <key>PLIST_VERSION</key> <string>1</string> <key>BUNDLE_ID</key> - <string>com.yourcompany.googlesignin.example</string> + <string>io.flutter.plugins.googleSignInExample</string> <key>PROJECT_ID</key> - <string>tensile-market-126823</string> + <string>flutter-firebase-plugins</string> + <key>STORAGE_BUCKET</key> + <string>flutter-firebase-plugins.appspot.com</string> <key>IS_ADS_ENABLED</key> - <false/> + <true></true> <key>IS_ANALYTICS_ENABLED</key> - <false/> + <false></false> <key>IS_APPINVITE_ENABLED</key> - <false/> + <false></false> <key>IS_GCM_ENABLED</key> - <false/> + <true></true> <key>IS_SIGNIN_ENABLED</key> - <true/> + <true></true> <key>GOOGLE_APP_ID</key> - <string>1:861823949799:ios:27717105cac89fff</string> + <string>1:159623150305:ios:2643f950e0a0da08</string> + <key>DATABASE_URL</key> + <string>https://flutter-firebase-plugins.firebaseio.com</string> </dict> </plist> \ No newline at end of file
diff --git a/packages/google_sign_in/example/ios/Runner/Info.plist b/packages/google_sign_in/example/ios/Runner/Info.plist index 9d6781f..12a3a09 100755 --- a/packages/google_sign_in/example/ios/Runner/Info.plist +++ b/packages/google_sign_in/example/ios/Runner/Info.plist
@@ -56,7 +56,7 @@ <key>CFBundleURLSchemes</key> <array> <!-- Copied from GoogleServices-Info.plist key REVERSE_CLIENT_ID --> - <string>com.googleusercontent.apps.861823949799-vc35cprkp249096uujjn0vvnmcvjppkn</string> + <string>com.googleusercontent.apps.159623150305-kpfutmlf03mmgfbp50771s90mphu1uop</string> </array> </dict> </array>
diff --git a/packages/google_sign_in/example/lib/main.dart b/packages/google_sign_in/example/lib/main.dart index b0751b0..d57f974 100755 --- a/packages/google_sign_in/example/lib/main.dart +++ b/packages/google_sign_in/example/lib/main.dart
@@ -77,14 +77,14 @@ } String _pickFirstNamedContact(Map<String, dynamic> data) { - final List<Map<String, dynamic>> connections = data['connections']; + final List<dynamic> connections = data['connections']; final Map<String, dynamic> contact = connections?.firstWhere( - (Map<String, dynamic> contact) => contact['names'] != null, + (dynamic contact) => contact['names'] != null, orElse: () => null, ); if (contact != null) { final Map<String, dynamic> name = contact['names'].firstWhere( - (Map<String, dynamic> name) => name['displayName'] != null, + (dynamic name) => name['displayName'] != null, orElse: () => null, ); if (name != null) {