Skip to content

Commit b14c4ea

Browse files
gildaswisegildaswise
committed
Updated to latest plugin versions, changed to linkWithCredential
1 parent 8086411 commit b14c4ea

File tree

7 files changed

+156
-117
lines changed

7 files changed

+156
-117
lines changed

‎ios/Podfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
platform :ios, '9.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -27,6 +27,8 @@ def parse_KV_file(file, separator='=')
2727
end
2828

2929
target 'Runner' do
30+
use_frameworks!
31+
3032
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
3133
# referring to absolute paths on developers' machines.
3234
system('rm -rf .symlinks')

‎ios/Podfile.lock

+84-54
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,88 @@
11
PODS:
2-
- Firebase/Auth (5.4.1):
2+
- Firebase/Auth (6.0.0):
33
- Firebase/CoreOnly
4-
- FirebaseAuth (= 5.0.2)
5-
- Firebase/Core (5.4.1):
4+
- FirebaseAuth (~> 6.0.0)
5+
- Firebase/Core (6.0.0):
66
- Firebase/CoreOnly
7-
- FirebaseAnalytics (= 5.0.1)
8-
- Firebase/CoreOnly (5.4.1):
9-
- FirebaseCore (= 5.0.6)
7+
- FirebaseAnalytics (= 6.0.0)
8+
- Firebase/CoreOnly (6.0.0):
9+
- FirebaseCore (= 6.0.0)
1010
- firebase_auth (0.0.1):
11-
- Firebase/Auth
11+
- Firebase/Auth (~> 6.0)
1212
- Firebase/Core
1313
- Flutter
1414
- firebase_core (0.0.1):
1515
- Firebase/Core
1616
- Flutter
17-
- FirebaseAnalytics (5.0.1):
18-
- FirebaseCore (~> 5.0)
19-
- FirebaseInstanceID (~> 3.0)
20-
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
17+
- FirebaseAnalytics (6.0.0):
18+
- FirebaseCore (~> 6.0)
19+
- FirebaseInstanceID (~> 4.0)
20+
- GoogleAppMeasurement (= 6.0.0)
21+
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
22+
- GoogleUtilities/MethodSwizzler (~> 6.0)
23+
- GoogleUtilities/Network (~> 6.0)
24+
- "GoogleUtilities/NSData+zlib (~> 6.0)"
2125
- nanopb (~> 0.3)
22-
- FirebaseAuth (5.0.2):
23-
- FirebaseCore (~> 5.0)
26+
- FirebaseAuth (6.0.0):
27+
- FirebaseAuthInterop (~> 1.0)
28+
- FirebaseCore (~> 6.0)
29+
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
30+
- GoogleUtilities/Environment (~> 6.0)
2431
- GTMSessionFetcher/Core (~> 1.1)
25-
- FirebaseCore (5.0.6):
26-
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
27-
- FirebaseInstanceID (3.1.1):
28-
- FirebaseCore (~> 5.0)
32+
- FirebaseAuthInterop (1.0.0)
33+
- FirebaseCore (6.0.0):
34+
- GoogleUtilities/Environment (~> 6.0)
35+
- GoogleUtilities/Logger (~> 6.0)
36+
- FirebaseInstanceID (4.0.0):
37+
- FirebaseCore (~> 6.0)
38+
- GoogleUtilities/Environment (~> 6.0)
39+
- GoogleUtilities/UserDefaults (~> 6.0)
2940
- Flutter (1.0.0)
3041
- google_sign_in (0.0.1):
3142
- Flutter
3243
- GoogleSignIn (~> 4.0)
33-
- GoogleSignIn (4.1.2):
44+
- GoogleAppMeasurement (6.0.0):
45+
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
46+
- GoogleUtilities/MethodSwizzler (~> 6.0)
47+
- GoogleUtilities/Network (~> 6.0)
48+
- "GoogleUtilities/NSData+zlib (~> 6.0)"
49+
- nanopb (~> 0.3)
50+
- GoogleSignIn (4.4.0):
3451
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
3552
- "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
36-
- GTMOAuth2 (~> 1.0)
3753
- GTMSessionFetcher/Core (~> 1.1)
38-
- GoogleToolboxForMac/DebugUtils (2.1.4):
39-
- GoogleToolboxForMac/Defines (= 2.1.4)
40-
- GoogleToolboxForMac/Defines (2.1.4)
41-
- "GoogleToolboxForMac/NSData+zlib (2.1.4)":
42-
- GoogleToolboxForMac/Defines (= 2.1.4)
43-
- "GoogleToolboxForMac/NSDictionary+URLArguments (2.1.4)":
44-
- GoogleToolboxForMac/DebugUtils (= 2.1.4)
45-
- GoogleToolboxForMac/Defines (= 2.1.4)
46-
- "GoogleToolboxForMac/NSString+URLArguments (= 2.1.4)"
47-
- "GoogleToolboxForMac/NSString+URLArguments (2.1.4)"
48-
- GTMOAuth2 (1.1.6):
49-
- GTMSessionFetcher (~> 1.1)
50-
- GTMSessionFetcher (1.2.0):
51-
- GTMSessionFetcher/Full (= 1.2.0)
52-
- GTMSessionFetcher/Core (1.2.0)
53-
- GTMSessionFetcher/Full (1.2.0):
54-
- GTMSessionFetcher/Core (= 1.2.0)
55-
- nanopb (0.3.8):
56-
- nanopb/decode (= 0.3.8)
57-
- nanopb/encode (= 0.3.8)
58-
- nanopb/decode (0.3.8)
59-
- nanopb/encode (0.3.8)
54+
- GoogleToolboxForMac/DebugUtils (2.2.0):
55+
- GoogleToolboxForMac/Defines (= 2.2.0)
56+
- GoogleToolboxForMac/Defines (2.2.0)
57+
- "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.0)":
58+
- GoogleToolboxForMac/DebugUtils (= 2.2.0)
59+
- GoogleToolboxForMac/Defines (= 2.2.0)
60+
- "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)"
61+
- "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
62+
- GoogleUtilities/AppDelegateSwizzler (6.1.0):
63+
- GoogleUtilities/Environment
64+
- GoogleUtilities/Logger
65+
- GoogleUtilities/Network
66+
- GoogleUtilities/Environment (6.1.0)
67+
- GoogleUtilities/Logger (6.1.0):
68+
- GoogleUtilities/Environment
69+
- GoogleUtilities/MethodSwizzler (6.1.0):
70+
- GoogleUtilities/Logger
71+
- GoogleUtilities/Network (6.1.0):
72+
- GoogleUtilities/Logger
73+
- "GoogleUtilities/NSData+zlib"
74+
- GoogleUtilities/Reachability
75+
- "GoogleUtilities/NSData+zlib (6.1.0)"
76+
- GoogleUtilities/Reachability (6.1.0):
77+
- GoogleUtilities/Logger
78+
- GoogleUtilities/UserDefaults (6.1.0):
79+
- GoogleUtilities/Logger
80+
- GTMSessionFetcher/Core (1.2.1)
81+
- nanopb (0.3.901):
82+
- nanopb/decode (= 0.3.901)
83+
- nanopb/encode (= 0.3.901)
84+
- nanopb/decode (0.3.901)
85+
- nanopb/encode (0.3.901)
6086

6187
DEPENDENCIES:
6288
- firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
@@ -69,11 +95,13 @@ SPEC REPOS:
6995
- Firebase
7096
- FirebaseAnalytics
7197
- FirebaseAuth
98+
- FirebaseAuthInterop
7299
- FirebaseCore
73100
- FirebaseInstanceID
101+
- GoogleAppMeasurement
74102
- GoogleSignIn
75103
- GoogleToolboxForMac
76-
- GTMOAuth2
104+
- GoogleUtilities
77105
- GTMSessionFetcher
78106
- nanopb
79107

@@ -88,21 +116,23 @@ EXTERNAL SOURCES:
88116
:path: ".symlinks/plugins/google_sign_in/ios"
89117

90118
SPEC CHECKSUMS:
91-
Firebase: 355bd535bfdacaa82a7fe8d9784115edefd6fc03
92-
firebase_auth: a5b249720380ab4ee1c633368cbb84aac9959359
119+
Firebase: fa80b9d987ca014a1ba9357496ef2a0178b28b12
120+
firebase_auth: b08c4f3eb6dcaa66d71882e8e17db5cc65f00080
93121
firebase_core: c96aa8b2fcf7f5167d32f22034f502f9304952b8
94-
FirebaseAnalytics: b3628aea54c50464c32c393fb2ea032566e7ecc2
95-
FirebaseAuth: 096e457cdd4274412a66c4a35874787e411f5a03
96-
FirebaseCore: 4c28e3b9708ba48a765e76515f913a71596eb5dd
97-
FirebaseInstanceID: f3f0657372592ecdfdfe2cac604a5a75758376a6
122+
FirebaseAnalytics: 1743c5f4de3687d0745709dfdc4b1dea1484f44c
123+
FirebaseAuth: efc72b0f6fe075d2a6de8d81a6d9de83ef2b47eb
124+
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
125+
FirebaseCore: e38f025287b413255a53acc1945d048a112047f7
126+
FirebaseInstanceID: 0e0348a3c00a734fa376a070f5ad4533ad975cb5
98127
Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
99128
google_sign_in: cbeb57b96679823d14df6b2240b629b983a42d79
100-
GoogleSignIn: d9ef55b10f0aa401a5de2747f59b725e4b9732ac
101-
GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
102-
GTMOAuth2: e8b6512c896235149df975c41d9a36c868ab7fba
103-
GTMSessionFetcher: 0c4baf0a73acd0041bf9f71ea018deedab5ea84e
104-
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
129+
GoogleAppMeasurement: 7f028ea162b72c8f326daec74afc95d94f7a47d6
130+
GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
131+
GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
132+
GoogleUtilities: 84df567c76ca84f67b7bb40e769fdd4acc746a10
133+
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
134+
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
105135

106-
PODFILE CHECKSUM: 1e5af4103afd21ca5ead147d7b81d06f494f51a2
136+
PODFILE CHECKSUM: 392a695225479ec66ab171f471d944e1b705a3e8
107137

108138
COCOAPODS: 1.5.3

‎ios/Runner.xcodeproj/project.pbxproj

+12-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
025FBA1E55821C0CDBBFD51C /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4AD5769DA9AC3786573341F /* libPods-Runner.a */; };
1110
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14+
57E3A3ED01EA41D88ECAAC75 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4E929611BE40637899157EC /* Pods_Runner.framework */; };
1515
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1616
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1717
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
@@ -56,7 +56,7 @@
5656
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5757
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5858
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
59-
D4AD5769DA9AC3786573341F /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
59+
C4E929611BE40637899157EC /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6060
D9E023F720EE645500802C68 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
6161
/* End PBXFileReference section */
6262

@@ -67,7 +67,7 @@
6767
files = (
6868
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
6969
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
70-
025FBA1E55821C0CDBBFD51C /* libPods-Runner.a in Frameworks */,
70+
57E3A3ED01EA41D88ECAAC75 /* Pods_Runner.framework in Frameworks */,
7171
);
7272
runOnlyForDeploymentPostprocessing = 0;
7373
};
@@ -77,7 +77,7 @@
7777
1391A2DFA08EDF0E2D8FF3A9 /* Frameworks */ = {
7878
isa = PBXGroup;
7979
children = (
80-
D4AD5769DA9AC3786573341F /* libPods-Runner.a */,
80+
C4E929611BE40637899157EC /* Pods_Runner.framework */,
8181
);
8282
name = Frameworks;
8383
sourceTree = "<group>";
@@ -248,12 +248,10 @@
248248
);
249249
inputPaths = (
250250
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
251-
"${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib",
252251
"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
253252
);
254253
name = "[CP] Copy Pods Resources";
255254
outputPaths = (
256-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib",
257255
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
258256
);
259257
runOnlyForDeploymentPostprocessing = 0;
@@ -283,10 +281,18 @@
283281
inputPaths = (
284282
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
285283
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
284+
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
285+
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
286+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
287+
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
286288
);
287289
name = "[CP] Embed Pods Frameworks";
288290
outputPaths = (
289291
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
292+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
293+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
294+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
295+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
290296
);
291297
runOnlyForDeploymentPostprocessing = 0;
292298
shellPath = /bin/sh;

‎lib/routes/auth.dart

+27-40
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,7 @@ class _AuthScreenState extends State<AuthScreen> {
4646
final GoogleSignIn _googleSignIn = GoogleSignIn();
4747

4848
GoogleSignInAccount _googleUser;
49-
50-
// PhoneVerificationCompleted
51-
verificationCompleted(FirebaseUser user) async {
52-
Logger.log(TAG, message: "onVerificationCompleted, user: $user");
53-
if (await _onCodeVerified(user)) {
54-
await _finishSignIn(user);
55-
} else {
56-
setState(() {
57-
this.status = AuthStatus.SMS_AUTH;
58-
Logger.log(TAG, message: "Changed status to $status");
59-
});
60-
}
61-
}
49+
FirebaseUser _firebaseUser;
6250

6351
// PhoneVerificationFailed
6452
verificationFailed(AuthException authException) {
@@ -148,7 +136,7 @@ class _AuthScreenState extends State<AuthScreen> {
148136
Logger.log(TAG, message: "Received $user");
149137
final GoogleSignInAuthentication googleAuth = await user.authentication;
150138
Logger.log(TAG, message: "Added googleAuth: $googleAuth");
151-
await _auth
139+
_firebaseUser = await _auth
152140
.signInWithCredential(GoogleAuthProvider.getCredential(
153141
accessToken: googleAuth.accessToken,
154142
idToken: googleAuth.idToken,
@@ -158,7 +146,7 @@ class _AuthScreenState extends State<AuthScreen> {
158146

159147
if (user != null) {
160148
_updateRefreshing(false);
161-
this._googleUser = user;
149+
_googleUser = user;
162150
setState(() {
163151
this.status = AuthStatus.PHONE_AUTH;
164152
Logger.log(TAG, message: "Changed status to $status");
@@ -205,7 +193,7 @@ class _AuthScreenState extends State<AuthScreen> {
205193
timeout: _timeOut,
206194
codeSent: codeSent,
207195
codeAutoRetrievalTimeout: codeAutoRetrievalTimeout,
208-
verificationCompleted: verificationCompleted,
196+
verificationCompleted: _linkWithPhoneNumber,
209197
verificationFailed: verificationFailed);
210198
Logger.log(TAG, message: "Returning null from _verifyPhoneNumber");
211199
return null;
@@ -221,40 +209,39 @@ class _AuthScreenState extends State<AuthScreen> {
221209
if (this._codeVerified) {
222210
await _finishSignIn(await _auth.currentUser());
223211
} else {
224-
Logger.log(TAG, message: "_signInWithPhoneNumber called");
225-
await _signInWithPhoneNumber();
212+
Logger.log(TAG, message: "_linkWithPhoneNumber called");
213+
await _linkWithPhoneNumber(
214+
PhoneAuthProvider.getCredential(
215+
smsCode: smsCodeController.text,
216+
verificationId: _verificationId,
217+
),
218+
);
226219
}
227220
return null;
228221
}
229222
}
230223

231-
Future<void> _signInWithPhoneNumber() async {
224+
Future<void> _linkWithPhoneNumber(AuthCredential credential) async {
232225
final errorMessage = "We couldn't verify your code, please try again!";
233226

234-
await _auth
235-
.linkWithCredential(
236-
PhoneAuthProvider.getCredential(
237-
verificationId: _verificationId,
238-
smsCode: smsCodeController.text,
239-
),
240-
)
241-
.then((user) async {
242-
await _onCodeVerified(user).then((codeVerified) async {
243-
this._codeVerified = codeVerified;
244-
Logger.log(
245-
TAG,
246-
message: "Returning ${this._codeVerified} from _onCodeVerified",
247-
);
248-
if (this._codeVerified) {
249-
await _finishSignIn(user);
250-
} else {
251-
_showErrorSnackbar(errorMessage);
252-
}
253-
});
254-
}, onError: (error) {
227+
_firebaseUser =
228+
await _firebaseUser.linkWithCredential(credential).catchError((error) {
255229
print("Failed to verify SMS code: $error");
256230
_showErrorSnackbar(errorMessage);
257231
});
232+
233+
await _onCodeVerified(_firebaseUser).then((codeVerified) async {
234+
this._codeVerified = codeVerified;
235+
Logger.log(
236+
TAG,
237+
message: "Returning ${this._codeVerified} from _onCodeVerified",
238+
);
239+
if (this._codeVerified) {
240+
await _finishSignIn(_firebaseUser);
241+
} else {
242+
_showErrorSnackbar(errorMessage);
243+
}
244+
});
258245
}
259246

260247
Future<bool> _onCodeVerified(FirebaseUser user) async {

0 commit comments

Comments
 (0)