Skip to content

Commit 3feb081

Browse files
Tweak ios
1 parent 988fa68 commit 3feb081

1 file changed

Lines changed: 14 additions & 8 deletions

File tree

src/ios/FirebaseUIAuthPlugin.m

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,20 @@ - (void)createProviderList:(NSDictionary *)options {
5353
if (providers != nil) {
5454

5555
for (NSString *provider in providers) {
56+
57+
Boolean google = [iOSDisable isEqualToNumber:[NSNumber numberWithBool:YES]];
58+
5659
if (@available(iOS 11.0, *)) {
57-
if (![iOSDisable isEqualToNumber:[NSNumber numberWithBool:YES]]) {
58-
if ([provider isEqualToString:@"GOOGLE"]) {
59-
[self.providers addObject:[[FUIGoogleAuth alloc] init]];
60-
}
60+
google = true;
61+
}
62+
63+
if (google) {
64+
if ([provider isEqualToString:@"GOOGLE"]) {
65+
[self.providers addObject:[[FUIGoogleAuth alloc] init]];
66+
}
6167

62-
if ([provider isEqualToString:@"FACEBOOK"]) {
63-
[self.providers addObject:[[FUIFacebookAuth alloc] init]];
64-
}
68+
if ([provider isEqualToString:@"FACEBOOK"]) {
69+
[self.providers addObject:[[FUIFacebookAuth alloc] init]];
6570
}
6671
}
6772

@@ -204,7 +209,7 @@ - (void)authUI:(FUIAuth *)authUI didSignInWithAuthDataResult:(nullable FIRAuthDa
204209
FIRAuthCredential *authCredential = [error.userInfo valueForKey:FUIAuthCredentialKey];
205210

206211
if (authCredential != nil) {
207-
[[FIRAuth auth] signInAndRetrieveDataWithCredential:authCredential completion:^(FIRAuthDataResult * _Nullable authResult, NSError * _Nullable error) {
212+
[[FIRAuth auth] signInWithCredential:authCredential completion:^(FIRAuthDataResult * _Nullable authResult, NSError * _Nullable error) {
208213
if ([authResult user] != nil) {
209214
[self raiseEventForUser:[authResult user]];
210215
} else if (error != nil) {
@@ -226,6 +231,7 @@ - (void)authUI:(FUIAuth *)authUI didSignInWithAuthDataResult:(nullable FIRAuthDa
226231
[self raiseEvent:@"signinfailure" withData:data];
227232
}
228233
}];
234+
229235
}
230236
} else {
231237
if (error.localizedFailureReason != nil && error.localizedDescription != nil) {

0 commit comments

Comments
 (0)