Skip to content
This repository was archived by the owner on Mar 26, 2023. It is now read-only.

Commit c2670fb

Browse files
Fix crash on iOS (#28)
1 parent c980e42 commit c2670fb

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

firebase_auth_oauth/example/ios/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ SPEC CHECKSUMS:
112112

113113
PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
114114

115-
COCOAPODS: 1.10.0.beta.2
115+
COCOAPODS: 1.10.0

firebase_auth_oauth/ios/Classes/FirebaseAuthOAuthViewController.swift

+14-7
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,17 @@ public class FirebaseAuthOAuthViewController: UIViewController, FlutterPlugin {
4848
func consumeCredentials(_ credential: AuthCredential) {
4949
if call?.method == FirebaseAuthOAuthViewController.CREATE_USER_METHOD {
5050
Auth.auth().signIn(with: credential) { authResult, error in
51+
guard let currentUser = Auth.auth().currentUser else {
52+
self.finalizeResult(.PluginError(error: "currentUser is nil. Make sure a user exists when \(FirebaseAuthOAuthViewController.CREATE_USER_METHOD) is used."))
53+
return
54+
}
5155
if let firebaseError = error {
5256
self.finalizeResult(
5357
FirebaseAuthOAuthPluginError
5458
.FirebaseAuthError(error: firebaseError)
5559
)
5660
}
57-
self.finalizeResult(Auth.auth().currentUser!)
61+
self.finalizeResult(currentUser)
5862
}
5963
}
6064
if call?.method == FirebaseAuthOAuthViewController.LINK_USER_METHOD {
@@ -63,12 +67,15 @@ public class FirebaseAuthOAuthViewController: UIViewController, FlutterPlugin {
6367
return
6468
}
6569
currentUser.link(with: credential) { (result, error) in
66-
if error != nil {
67-
self.finalizeResult(.FirebaseAuthError(error: error!))
68-
}
69-
if result != nil {
70-
self.finalizeResult(currentUser)
71-
}
70+
if let firebaseError = error {
71+
self.finalizeResult(
72+
FirebaseAuthOAuthPluginError
73+
.FirebaseAuthError(error: firebaseError)
74+
)
75+
}
76+
if result != nil {
77+
self.finalizeResult(currentUser)
78+
}
7279
}
7380
}
7481
}

0 commit comments

Comments
 (0)