Skip to content

Commit e34ac23

Browse files
mravn-googlemravn-google
authored
Remove yourcompany.com from cloud_firestore (flutter#447)
1 parent 11cab5c commit e34ac23

File tree

6 files changed

+38
-212
lines changed

6 files changed

+38
-212
lines changed

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

Lines changed: 9 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,27 @@
11
{
22
"project_info": {
3-
"project_number": "297855924061",
4-
"firebase_url": "https://flutterfire-cd2f7.firebaseio.com",
5-
"project_id": "flutterfire-cd2f7",
6-
"storage_bucket": "flutterfire-cd2f7.appspot.com"
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"
77
},
88
"client": [
99
{
1010
"client_info": {
11-
"mobilesdk_app_id": "1:297855924061:android:669871c998cc21bd",
11+
"mobilesdk_app_id": "1:159623150305:android:236f9daea101f77e",
1212
"android_client_info": {
13-
"package_name": "com.yourcompany.firebaseauth.example"
14-
}
15-
},
16-
"oauth_client": [
17-
{
18-
"client_id": "297855924061-r1u58cnh4p6l1ghpkteil46erlkfll62.apps.googleusercontent.com",
19-
"client_type": 1,
20-
"android_info": {
21-
"package_name": "com.yourcompany.firebaseauth.example",
22-
"certificate_hash": "c3adef7e7773e40e777d5c236dbba7461cbea5f0"
23-
}
24-
},
25-
{
26-
"client_id": "297855924061-col4in4uubarifm60nbq8id01ec3ss4c.apps.googleusercontent.com",
27-
"client_type": 1,
28-
"android_info": {
29-
"package_name": "com.yourcompany.firebaseauth.example",
30-
"certificate_hash": "8a4e194f5bfc3fb1075e7daae8dcddd526fde207"
31-
}
32-
},
33-
{
34-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
35-
"client_type": 3
36-
}
37-
],
38-
"api_key": [
39-
{
40-
"current_key": "AIzaSyD_shO5mfO9lhy2TVWhfo1VUmARKlG4suk"
41-
}
42-
],
43-
"services": {
44-
"analytics_service": {
45-
"status": 1
46-
},
47-
"appinvite_service": {
48-
"status": 2,
49-
"other_platform_oauth_client": [
50-
{
51-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
52-
"client_type": 3
53-
},
54-
{
55-
"client_id": "297855924061-1skfqv2sc9avlclefi3q2l229t98dpda.apps.googleusercontent.com",
56-
"client_type": 2,
57-
"ios_info": {
58-
"bundle_id": "com.yourcompany.firestoreExample"
59-
}
60-
}
61-
]
62-
},
63-
"ads_service": {
64-
"status": 2
65-
}
66-
}
67-
},
68-
{
69-
"client_info": {
70-
"mobilesdk_app_id": "1:297855924061:android:92efa9a0df6f077f",
71-
"android_client_info": {
72-
"package_name": "io.flutter.plugins.firebase_storage_example"
13+
"package_name": "io.flutter.plugins.firebase.firestoreexample"
7314
}
7415
},
7516
"oauth_client": [
7617
{
77-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
18+
"client_id": "159623150305-q05bbbtsutr02abhips3suj7hujfk4bg.apps.googleusercontent.com",
7819
"client_type": 3
7920
}
8021
],
8122
"api_key": [
8223
{
83-
"current_key": "AIzaSyD_shO5mfO9lhy2TVWhfo1VUmARKlG4suk"
24+
"current_key": "AIzaSyChk3KEG7QYrs4kQPLP1tjJNxBTbfCAdgg"
8425
}
8526
],
8627
"services": {
@@ -95,109 +36,7 @@
9536
"status": 2
9637
}
9738
}
98-
},
99-
{
100-
"client_info": {
101-
"mobilesdk_app_id": "1:297855924061:android:db912bec12847bd9",
102-
"android_client_info": {
103-
"package_name": "io.flutter.plugins.firebase_database_example"
104-
}
105-
},
106-
"oauth_client": [
107-
{
108-
"client_id": "297855924061-fbg7lp8bvtbibn2edns7d5fc3k0fhsa3.apps.googleusercontent.com",
109-
"client_type": 1,
110-
"android_info": {
111-
"package_name": "io.flutter.plugins.firebase_database_example",
112-
"certificate_hash": "c3adef7e7773e40e777d5c236dbba7461cbea5f0"
113-
}
114-
},
115-
{
116-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
117-
"client_type": 3
118-
}
119-
],
120-
"api_key": [
121-
{
122-
"current_key": "AIzaSyD_shO5mfO9lhy2TVWhfo1VUmARKlG4suk"
123-
}
124-
],
125-
"services": {
126-
"analytics_service": {
127-
"status": 1
128-
},
129-
"appinvite_service": {
130-
"status": 2,
131-
"other_platform_oauth_client": [
132-
{
133-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
134-
"client_type": 3
135-
},
136-
{
137-
"client_id": "297855924061-1skfqv2sc9avlclefi3q2l229t98dpda.apps.googleusercontent.com",
138-
"client_type": 2,
139-
"ios_info": {
140-
"bundle_id": "com.yourcompany.firestoreExample"
141-
}
142-
}
143-
]
144-
},
145-
"ads_service": {
146-
"status": 2
147-
}
148-
}
149-
},
150-
{
151-
"client_info": {
152-
"mobilesdk_app_id": "1:297855924061:android:236f9daea101f77e",
153-
"android_client_info": {
154-
"package_name": "io.flutter.plugins.firebase.firestoreexample"
155-
}
156-
},
157-
"oauth_client": [
158-
{
159-
"client_id": "297855924061-n8i063j2dib6goh5or4lrctg6sccpevi.apps.googleusercontent.com",
160-
"client_type": 1,
161-
"android_info": {
162-
"package_name": "io.flutter.plugins.firebase.firestoreexample",
163-
"certificate_hash": "a8fc78a37cd4f0471580936de67a2cb2ae4657c7"
164-
}
165-
},
166-
{
167-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
168-
"client_type": 3
169-
}
170-
],
171-
"api_key": [
172-
{
173-
"current_key": "AIzaSyD_shO5mfO9lhy2TVWhfo1VUmARKlG4suk"
174-
}
175-
],
176-
"services": {
177-
"analytics_service": {
178-
"status": 1
179-
},
180-
"appinvite_service": {
181-
"status": 2,
182-
"other_platform_oauth_client": [
183-
{
184-
"client_id": "297855924061-f68m5v860ms5faiotn5mv9f50cmpacdq.apps.googleusercontent.com",
185-
"client_type": 3
186-
},
187-
{
188-
"client_id": "297855924061-1skfqv2sc9avlclefi3q2l229t98dpda.apps.googleusercontent.com",
189-
"client_type": 2,
190-
"ios_info": {
191-
"bundle_id": "com.yourcompany.firestoreExample"
192-
}
193-
}
194-
]
195-
},
196-
"ads_service": {
197-
"status": 2
198-
}
199-
}
20039
}
20140
],
20241
"configuration_version": "1"
203-
}
42+
}

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1110
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
11+
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1212
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1313
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1414
5C6F5A711EC3CCCC008D64B5 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C6F5A701EC3CCCC008D64B5 /* GeneratedPluginRegistrant.m */; };
@@ -41,8 +41,8 @@
4141
/* End PBXCopyFilesBuildPhase section */
4242

4343
/* Begin PBXFileReference section */
44-
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4544
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
45+
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4646
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4747
5C6F5A6F1EC3CCCC008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4848
5C6F5A701EC3CCCC008D64B5 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@@ -186,7 +186,6 @@
186186
TargetAttributes = {
187187
97C146ED1CF9000F007C117D = {
188188
CreatedOnToolsVersion = 7.3.1;
189-
DevelopmentTeam = 3GRKCVVJ22;
190189
};
191190
};
192191
};
@@ -248,11 +247,11 @@
248247
);
249248
inputPaths = (
250249
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
251-
"$PODS_CONFIGURATION_BUILD_DIR/gRPC/gRPCCertificates.bundle",
250+
"${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle",
252251
);
253252
name = "[CP] Copy Pods Resources";
254253
outputPaths = (
255-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
254+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates.bundle",
256255
);
257256
runOnlyForDeploymentPostprocessing = 0;
258257
shellPath = /bin/sh;
@@ -266,7 +265,7 @@
266265
);
267266
inputPaths = (
268267
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
269-
"${PODS_ROOT}/../../../../../../flutter/bin/cache/artifacts/engine/ios/Flutter.framework",
268+
"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
270269
);
271270
name = "[CP] Embed Pods Frameworks";
272271
outputPaths = (
@@ -440,7 +439,6 @@
440439
buildSettings = {
441440
ARCHS = arm64;
442441
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
443-
DEVELOPMENT_TEAM = 3GRKCVVJ22;
444442
ENABLE_BITCODE = NO;
445443
FRAMEWORK_SEARCH_PATHS = (
446444
"$(inherited)",
@@ -452,7 +450,7 @@
452450
"$(inherited)",
453451
"$(PROJECT_DIR)/Flutter",
454452
);
455-
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.firestoreExample;
453+
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firestoreExample;
456454
PRODUCT_NAME = "$(TARGET_NAME)";
457455
};
458456
name = Debug;
@@ -463,7 +461,6 @@
463461
buildSettings = {
464462
ARCHS = arm64;
465463
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
466-
DEVELOPMENT_TEAM = 3GRKCVVJ22;
467464
ENABLE_BITCODE = NO;
468465
FRAMEWORK_SEARCH_PATHS = (
469466
"$(inherited)",
@@ -475,7 +472,7 @@
475472
"$(inherited)",
476473
"$(PROJECT_DIR)/Flutter",
477474
);
478-
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.firestoreExample;
475+
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firestoreExample;
479476
PRODUCT_NAME = "$(TARGET_NAME)";
480477
};
481478
name = Release;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
88
<string>ca-app-pub-3940256099942544/4411468910</string>
99
<key>CLIENT_ID</key>
10-
<string>297855924061-1skfqv2sc9avlclefi3q2l229t98dpda.apps.googleusercontent.com</string>
10+
<string>159623150305-1iiqqggbff817a8bpnalo64nuc3qobid.apps.googleusercontent.com</string>
1111
<key>REVERSED_CLIENT_ID</key>
12-
<string>com.googleusercontent.apps.297855924061-1skfqv2sc9avlclefi3q2l229t98dpda</string>
12+
<string>com.googleusercontent.apps.159623150305-1iiqqggbff817a8bpnalo64nuc3qobid</string>
1313
<key>API_KEY</key>
14-
<string>AIzaSyBq6mcufFXfyqr79uELCiqM_O_1-G72PVU</string>
14+
<string>AIzaSyDyzecVw1zXTpBKwfFHxpl7QyYBhimNhUk</string>
1515
<key>GCM_SENDER_ID</key>
16-
<string>297855924061</string>
16+
<string>159623150305</string>
1717
<key>PLIST_VERSION</key>
1818
<string>1</string>
1919
<key>BUNDLE_ID</key>
20-
<string>com.yourcompany.firestoreExample</string>
20+
<string>io.flutter.plugins.firestoreExample</string>
2121
<key>PROJECT_ID</key>
22-
<string>flutterfire-cd2f7</string>
22+
<string>flutter-firebase-plugins</string>
2323
<key>STORAGE_BUCKET</key>
24-
<string>flutterfire-cd2f7.appspot.com</string>
24+
<string>flutter-firebase-plugins.appspot.com</string>
2525
<key>IS_ADS_ENABLED</key>
2626
<true></true>
2727
<key>IS_ANALYTICS_ENABLED</key>
@@ -33,8 +33,8 @@
3333
<key>IS_SIGNIN_ENABLED</key>
3434
<true></true>
3535
<key>GOOGLE_APP_ID</key>
36-
<string>1:297855924061:ios:5f2bcc6ba8cecddd</string>
36+
<string>1:159623150305:ios:7e8aafdf0bd8d289</string>
3737
<key>DATABASE_URL</key>
38-
<string>https://flutterfire-cd2f7.firebaseio.com</string>
38+
<string>https://flutter-firebase-plugins.firebaseio.com</string>
3939
</dict>
40-
</plist>
40+
</plist>

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@
1818
<string>1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
21-
<key>CFBundleURLTypes</key>
22-
<array>
23-
<dict>
24-
<key>CFBundleTypeRole</key>
25-
<string>Editor</string>
26-
<key>CFBundleURLSchemes</key>
27-
<array>
28-
<string>com.googleusercontent.apps.297855924061-1skfqv2sc9avlclefi3q2l229t98dpda</string>
29-
<string>com.yourcompany.firestoreExample</string>
30-
</array>
31-
</dict>
32-
</array>
3321
<key>CFBundleVersion</key>
3422
<string>1</string>
3523
<key>LSRequiresIPhoneOS</key>

0 commit comments

Comments
 (0)