Skip to content

Commit 86d6299

Browse files
committed
Updated dependencies
1 parent b14c4ea commit 86d6299

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

lib/routes/auth.dart

+8-5
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,14 @@ class _AuthScreenState extends State<AuthScreen> {
136136
Logger.log(TAG, message: "Received $user");
137137
final GoogleSignInAuthentication googleAuth = await user.authentication;
138138
Logger.log(TAG, message: "Added googleAuth: $googleAuth");
139-
_firebaseUser = await _auth
139+
140+
final result = await _auth
140141
.signInWithCredential(GoogleAuthProvider.getCredential(
141142
accessToken: googleAuth.accessToken,
142143
idToken: googleAuth.idToken,
143144
))
144145
.catchError(onError);
146+
_firebaseUser = result.user;
145147
}
146148

147149
if (user != null) {
@@ -224,11 +226,12 @@ class _AuthScreenState extends State<AuthScreen> {
224226
Future<void> _linkWithPhoneNumber(AuthCredential credential) async {
225227
final errorMessage = "We couldn't verify your code, please try again!";
226228

227-
_firebaseUser =
229+
final result =
228230
await _firebaseUser.linkWithCredential(credential).catchError((error) {
229231
print("Failed to verify SMS code: $error");
230232
_showErrorSnackbar(errorMessage);
231233
});
234+
_firebaseUser = result.user;
232235

233236
await _onCodeVerified(_firebaseUser).then((codeVerified) async {
234237
this._codeVerified = codeVerified;
@@ -272,9 +275,9 @@ class _AuthScreenState extends State<AuthScreen> {
272275

273276
Navigator.of(context).pushReplacement(CupertinoPageRoute(
274277
builder: (context) => MainScreen(
275-
googleUser: _googleUser,
276-
firebaseUser: user,
277-
),
278+
googleUser: _googleUser,
279+
firebaseUser: user,
280+
),
278281
));
279282
} else {
280283
setState(() {

pubspec.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
44
async:
55
dependency: transitive
66
description:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.1.0"
10+
version: "2.2.0"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
@@ -35,7 +35,7 @@ packages:
3535
name: firebase_auth
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "0.11.1"
38+
version: "0.14.0"
3939
firebase_core:
4040
dependency: transitive
4141
description:
@@ -59,7 +59,7 @@ packages:
5959
name: google_sign_in
6060
url: "https://pub.dartlang.org"
6161
source: hosted
62-
version: "4.0.1+3"
62+
version: "4.0.6"
6363
matcher:
6464
dependency: transitive
6565
description:
@@ -87,14 +87,14 @@ packages:
8787
name: pedantic
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "1.5.0"
90+
version: "1.7.0"
9191
quiver:
9292
dependency: transitive
9393
description:
9494
name: quiver
9595
url: "https://pub.dartlang.org"
9696
source: hosted
97-
version: "2.0.2"
97+
version: "2.0.3"
9898
sky_engine:
9999
dependency: transitive
100100
description: flutter
@@ -141,7 +141,7 @@ packages:
141141
name: test_api
142142
url: "https://pub.dartlang.org"
143143
source: hosted
144-
version: "0.2.4"
144+
version: "0.2.5"
145145
typed_data:
146146
dependency: transitive
147147
description:
@@ -157,5 +157,5 @@ packages:
157157
source: hosted
158158
version: "2.0.8"
159159
sdks:
160-
dart: ">=2.2.0 <3.0.0"
161-
flutter: ">=0.1.4 <2.0.0"
160+
dart: ">=2.2.2 <3.0.0"
161+
flutter: ">=1.5.0 <2.0.0"

pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ version: 1.5.0+6
66
dependencies:
77
flutter:
88
sdk: flutter
9-
google_sign_in: ^4.0.1+3
10-
firebase_auth: ^0.11.1
9+
google_sign_in: ^4.0.6
10+
firebase_auth: ^0.14.0
1111

1212
dev_dependencies:
1313
flutter_test:
@@ -16,4 +16,4 @@ dev_dependencies:
1616
flutter:
1717
uses-material-design: true
1818
assets:
19-
- assets/images/glogo.png
19+
- assets/images/glogo.png

0 commit comments

Comments
 (0)