Skip to content

Commit 11cab5c

Browse files
mravn-googlemravn-google
authored
Remove yourcompany.com from google_sign_in (flutter#451)
1 parent 6f2f2e0 commit 11cab5c

File tree

5 files changed

+49
-183
lines changed

5 files changed

+49
-183
lines changed

‎packages/google_sign_in/example/android/app/google-services.json

Lines changed: 9 additions & 163 deletions
Original file line numberDiff line numberDiff line change
@@ -1,189 +1,35 @@
11
{
22
"project_info": {
3-
"project_number": "861823949799",
4-
"project_id": "tensile-market-126823"
3+
"project_number": "159623150305",
4+
"firebase_url": "https://flutter-firebase-plugins.firebaseio.com",
5+
"project_id": "flutter-firebase-plugins",
6+
"storage_bucket": "flutter-firebase-plugins.appspot.com"
57
},
68
"client": [
79
{
810
"client_info": {
9-
"mobilesdk_app_id": "1:861823949799:android:ac633ff55751026b",
10-
"android_client_info": {
11-
"package_name": "com.google.google_sign_in.example"
12-
}
13-
},
14-
"oauth_client": [
15-
{
16-
"client_id": "861823949799-b79ooadae3620tevk9fuevahrict0j83.apps.googleusercontent.com",
17-
"client_type": 1,
18-
"android_info": {
19-
"package_name": "com.google.google_sign_in.example",
20-
"certificate_hash": "c3adef7e7773e40e777d5c236dbba7461cbea5f0"
21-
}
22-
},
23-
{
24-
"client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com",
25-
"client_type": 3
26-
}
27-
],
28-
"api_key": [
29-
{
30-
"current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M"
31-
}
32-
],
33-
"services": {
34-
"analytics_service": {
35-
"status": 1
36-
},
37-
"appinvite_service": {
38-
"status": 1,
39-
"other_platform_oauth_client": []
40-
},
41-
"ads_service": {
42-
"status": 1
43-
}
44-
}
45-
},
46-
{
47-
"client_info": {
48-
"mobilesdk_app_id": "1:861823949799:android:267a23c68c23f34f",
49-
"android_client_info": {
50-
"package_name": "com.example.flutter.google_sign_in"
51-
}
52-
},
53-
"oauth_client": [
54-
{
55-
"client_id": "861823949799-jgmubfm8604lngvm9lt8fil9f4nefp5t.apps.googleusercontent.com",
56-
"client_type": 1,
57-
"android_info": {
58-
"package_name": "com.example.flutter.google_sign_in",
59-
"certificate_hash": "8a4e194f5bfc3fb1075e7daae8dcddd526fde207"
60-
}
61-
},
62-
{
63-
"client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com",
64-
"client_type": 3
65-
}
66-
],
67-
"api_key": [
68-
{
69-
"current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M"
70-
}
71-
],
72-
"services": {
73-
"analytics_service": {
74-
"status": 1
75-
},
76-
"appinvite_service": {
77-
"status": 1,
78-
"other_platform_oauth_client": []
79-
},
80-
"ads_service": {
81-
"status": 1
82-
}
83-
}
84-
},
85-
{
86-
"client_info": {
87-
"mobilesdk_app_id": "1:861823949799:android:84a1951f08b82133",
88-
"android_client_info": {
89-
"package_name": "com.example.google_sign_in"
90-
}
91-
},
92-
"oauth_client": [
93-
{
94-
"client_id": "861823949799-en18k5ut51ehp64chfifrlk52pojaqjo.apps.googleusercontent.com",
95-
"client_type": 1,
96-
"android_info": {
97-
"package_name": "com.example.google_sign_in",
98-
"certificate_hash": "eda6413c3e3a95492114fe07cd953ad897e40d1a"
99-
}
100-
},
101-
{
102-
"client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com",
103-
"client_type": 3
104-
}
105-
],
106-
"api_key": [
107-
{
108-
"current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M"
109-
}
110-
],
111-
"services": {
112-
"analytics_service": {
113-
"status": 1
114-
},
115-
"appinvite_service": {
116-
"status": 1,
117-
"other_platform_oauth_client": []
118-
},
119-
"ads_service": {
120-
"status": 1
121-
}
122-
}
123-
},
124-
{
125-
"client_info": {
126-
"mobilesdk_app_id": "1:861823949799:android:27717105cac89fff",
127-
"android_client_info": {
128-
"package_name": "com.yourcompany.googlesignin.example"
129-
}
130-
},
131-
"oauth_client": [
132-
{
133-
"client_id": "861823949799-jo91u6af10qflkh9gtk61gbu9rekeqin.apps.googleusercontent.com",
134-
"client_type": 1,
135-
"android_info": {
136-
"package_name": "com.yourcompany.googlesignin.example",
137-
"certificate_hash": "8a4e194f5bfc3fb1075e7daae8dcddd526fde207"
138-
}
139-
},
140-
{
141-
"client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com",
142-
"client_type": 3
143-
}
144-
],
145-
"api_key": [
146-
{
147-
"current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M"
148-
}
149-
],
150-
"services": {
151-
"analytics_service": {
152-
"status": 1
153-
},
154-
"appinvite_service": {
155-
"status": 1,
156-
"other_platform_oauth_client": []
157-
},
158-
"ads_service": {
159-
"status": 1
160-
}
161-
}
162-
},
163-
{
164-
"client_info": {
165-
"mobilesdk_app_id": "1:861823949799:android:24b94c3718c846a6",
11+
"mobilesdk_app_id": "1:159623150305:android:5e9f1f89e134dc86",
16612
"android_client_info": {
16713
"package_name": "io.flutter.plugins.googlesigninexample"
16814
}
16915
},
17016
"oauth_client": [
17117
{
172-
"client_id": "861823949799-19gil347tgrk0l0k694196i1m1uef404.apps.googleusercontent.com",
18+
"client_id": "159623150305-3suu3qq4vs3ki7uaigbtrh2aal1p9ram.apps.googleusercontent.com",
17319
"client_type": 1,
17420
"android_info": {
17521
"package_name": "io.flutter.plugins.googlesigninexample",
176-
"certificate_hash": "c3adef7e7773e40e777d5c236dbba7461cbea5f0"
22+
"certificate_hash": "f8323ac5fe6e7adc1ddc5612e16b5d04d7f1358b"
17723
}
17824
},
17925
{
180-
"client_id": "861823949799-ib268r6ni4s6hief8bmh78sfnr63t8ja.apps.googleusercontent.com",
26+
"client_id": "159623150305-q05bbbtsutr02abhips3suj7hujfk4bg.apps.googleusercontent.com",
18127
"client_type": 3
18228
}
18329
],
18430
"api_key": [
18531
{
186-
"current_key": "AIzaSyBeNYObyAbBwc6EIfVwUKRihZTRSbxgS9M"
32+
"current_key": "AIzaSyChk3KEG7QYrs4kQPLP1tjJNxBTbfCAdgg"
18733
}
18834
],
18935
"services": {

‎packages/google_sign_in/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@
189189
TargetAttributes = {
190190
97C146ED1CF9000F007C117D = {
191191
CreatedOnToolsVersion = 7.3.1;
192-
DevelopmentTeam = 3GRKCVVJ22;
193192
};
194193
};
195194
};
@@ -251,9 +250,14 @@
251250
files = (
252251
);
253252
inputPaths = (
253+
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
254+
"${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib",
255+
"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
254256
);
255257
name = "[CP] Copy Pods Resources";
256258
outputPaths = (
259+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib",
260+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
257261
);
258262
runOnlyForDeploymentPostprocessing = 0;
259263
shellPath = /bin/sh;
@@ -266,9 +270,12 @@
266270
files = (
267271
);
268272
inputPaths = (
273+
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
274+
"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
269275
);
270276
name = "[CP] Embed Pods Frameworks";
271277
outputPaths = (
278+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
272279
);
273280
runOnlyForDeploymentPostprocessing = 0;
274281
shellPath = /bin/sh;
@@ -295,13 +302,16 @@
295302
files = (
296303
);
297304
inputPaths = (
305+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
306+
"${PODS_ROOT}/Manifest.lock",
298307
);
299308
name = "[CP] Check Pods Manifest.lock";
300309
outputPaths = (
310+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
301311
);
302312
runOnlyForDeploymentPostprocessing = 0;
303313
shellPath = /bin/sh;
304-
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";
314+
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";
305315
showEnvVarsInLog = 0;
306316
};
307317
/* End PBXShellScriptBuildPhase section */
@@ -435,7 +445,6 @@
435445
buildSettings = {
436446
ARCHS = arm64;
437447
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
438-
DEVELOPMENT_TEAM = 3GRKCVVJ22;
439448
ENABLE_BITCODE = NO;
440449
FRAMEWORK_SEARCH_PATHS = (
441450
"$(inherited)",
@@ -447,7 +456,7 @@
447456
"$(inherited)",
448457
"$(PROJECT_DIR)/Flutter",
449458
);
450-
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.googlesignin.example;
459+
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.googleSignInExample;
451460
PRODUCT_NAME = "$(TARGET_NAME)";
452461
};
453462
name = Debug;
@@ -458,7 +467,6 @@
458467
buildSettings = {
459468
ARCHS = arm64;
460469
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
461-
DEVELOPMENT_TEAM = 3GRKCVVJ22;
462470
ENABLE_BITCODE = NO;
463471
FRAMEWORK_SEARCH_PATHS = (
464472
"$(inherited)",
@@ -470,7 +478,7 @@
470478
"$(inherited)",
471479
"$(PROJECT_DIR)/Flutter",
472480
);
473-
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.googlesignin.example;
481+
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.googleSignInExample;
474482
PRODUCT_NAME = "$(TARGET_NAME)";
475483
};
476484
name = Release;

‎packages/google_sign_in/example/ios/Runner/GoogleService-Info.plist

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,39 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
6+
<string>ca-app-pub-3940256099942544/2934735716</string>
7+
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
8+
<string>ca-app-pub-3940256099942544/4411468910</string>
59
<key>CLIENT_ID</key>
6-
<string>861823949799-vc35cprkp249096uujjn0vvnmcvjppkn.apps.googleusercontent.com</string>
10+
<string>159623150305-kpfutmlf03mmgfbp50771s90mphu1uop.apps.googleusercontent.com</string>
711
<key>REVERSED_CLIENT_ID</key>
8-
<string>com.googleusercontent.apps.861823949799-vc35cprkp249096uujjn0vvnmcvjppkn</string>
12+
<string>com.googleusercontent.apps.159623150305-kpfutmlf03mmgfbp50771s90mphu1uop</string>
13+
<key>API_KEY</key>
14+
<string>AIzaSyDyzecVw1zXTpBKwfFHxpl7QyYBhimNhUk</string>
15+
<key>GCM_SENDER_ID</key>
16+
<string>159623150305</string>
917
<key>PLIST_VERSION</key>
1018
<string>1</string>
1119
<key>BUNDLE_ID</key>
12-
<string>com.yourcompany.googlesignin.example</string>
20+
<string>io.flutter.plugins.googleSignInExample</string>
1321
<key>PROJECT_ID</key>
14-
<string>tensile-market-126823</string>
22+
<string>flutter-firebase-plugins</string>
23+
<key>STORAGE_BUCKET</key>
24+
<string>flutter-firebase-plugins.appspot.com</string>
1525
<key>IS_ADS_ENABLED</key>
16-
<false/>
26+
<true></true>
1727
<key>IS_ANALYTICS_ENABLED</key>
18-
<false/>
28+
<false></false>
1929
<key>IS_APPINVITE_ENABLED</key>
20-
<false/>
30+
<false></false>
2131
<key>IS_GCM_ENABLED</key>
22-
<false/>
32+
<true></true>
2333
<key>IS_SIGNIN_ENABLED</key>
24-
<true/>
34+
<true></true>
2535
<key>GOOGLE_APP_ID</key>
26-
<string>1:861823949799:ios:27717105cac89fff</string>
36+
<string>1:159623150305:ios:2643f950e0a0da08</string>
37+
<key>DATABASE_URL</key>
38+
<string>https://flutter-firebase-plugins.firebaseio.com</string>
2739
</dict>
2840
</plist>

‎packages/google_sign_in/example/ios/Runner/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<key>CFBundleURLSchemes</key>
5757
<array>
5858
<!-- Copied from GoogleServices-Info.plist key REVERSE_CLIENT_ID -->
59-
<string>com.googleusercontent.apps.861823949799-vc35cprkp249096uujjn0vvnmcvjppkn</string>
59+
<string>com.googleusercontent.apps.159623150305-kpfutmlf03mmgfbp50771s90mphu1uop</string>
6060
</array>
6161
</dict>
6262
</array>

‎packages/google_sign_in/example/lib/main.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ class SignInDemoState extends State<SignInDemo> {
7777
}
7878

7979
String _pickFirstNamedContact(Map<String, dynamic> data) {
80-
final List<Map<String, dynamic>> connections = data['connections'];
80+
final List<dynamic> connections = data['connections'];
8181
final Map<String, dynamic> contact = connections?.firstWhere(
82-
(Map<String, dynamic> contact) => contact['names'] != null,
82+
(dynamic contact) => contact['names'] != null,
8383
orElse: () => null,
8484
);
8585
if (contact != null) {
8686
final Map<String, dynamic> name = contact['names'].firstWhere(
87-
(Map<String, dynamic> name) => name['displayName'] != null,
87+
(dynamic name) => name['displayName'] != null,
8888
orElse: () => null,
8989
);
9090
if (name != null) {

0 commit comments

Comments
 (0)