Skip to content

Facebook support for email_in_user_when_upgrading #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 16, 2018
Merged

Facebook support for email_in_user_when_upgrading #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef5709
Facebook support for email_in_user_when_upgrading
protocol86 Feb 16, 2018
d84627f
Addresses comments
protocol86 Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions FirebaseAuthUI/FUIAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,22 +295,29 @@ - (void)signInWithEmailHint:(NSString *)emailHint

[self.auth fetchProvidersForEmail:emailHint completion:^(NSArray<NSString *> *_Nullable providers,
NSError *_Nullable error) {
NSString *federatedProviderID = [self federatedAuthProviderFromProviders:providers];
// Google case
if ([federatedProviderID isEqualToString:FIRGoogleAuthProviderID]) {
id<FUIAuthProvider> googleProviderUI;
if (error) {
completion(nil, error);
return;
}
NSString *existingFederatedProviderID = [self federatedAuthProviderFromProviders:providers];
// Set of providers which can be auto-linked
NSSet *supportedProviders =
[NSSet setWithObjects:FIRGoogleAuthProviderID, FIRFacebookAuthProviderID, nil];
if ([supportedProviders containsObject:existingFederatedProviderID]) {
id<FUIAuthProvider> authProviderUI;
// Retrieve the FUIAuthProvider instance from FUIAuth for the existing provider ID.
for (id<FUIAuthProvider> provider in self.providers) {
if ([provider.providerID isEqualToString:FIRGoogleAuthProviderID]) {
googleProviderUI = provider;
if ([provider.providerID isEqualToString:existingFederatedProviderID]) {
authProviderUI = provider;
break;
}
}
[googleProviderUI signOut];
[googleProviderUI signInWithDefaultValue:emailHint
presentingViewController:presentingViewController
completion:^(FIRAuthCredential *_Nullable credential,
NSError *_Nullable error,
FIRAuthResultCallback _Nullable result) {
[authProviderUI signOut];
[authProviderUI signInWithDefaultValue:emailHint
presentingViewController:presentingViewController
completion:^(FIRAuthCredential *_Nullable credential,
NSError *_Nullable error,
FIRAuthResultCallback _Nullable result) {
if (error) {
completion(nil, error);
return;
Expand Down
10 changes: 10 additions & 0 deletions FirebaseGoogleAuthUI/FUIGoogleAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ @implementation FUIGoogleAuth {
@brief The callback which should be invoked when the sign in flow completes (or is cancelled.)
*/
FIRAuthProviderSignInCompletionBlock _pendingSignInCallback;

/** @var _email
@brief The email address associated with this account.
*/
NSString *_email;
}

- (instancetype)init {
Expand Down Expand Up @@ -140,6 +145,10 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(NSString *)sourceApplicati
return [signIn handleURL:URL sourceApplication:sourceApplication annotation:nil];
}

- (NSString *)email {
return _email;
}

#pragma mark - GIDSignInDelegate methods

- (void)signIn:(GIDSignIn *)signIn
Expand All @@ -158,6 +167,7 @@ - (void)signIn:(GIDSignIn *)signIn
}
return;
}
_email = user.profile.email;
UIActivityIndicatorView *activityView =
[FUIAuthBaseViewController addActivityIndicator:_presentingViewController.view];
[activityView startAnimating];
Expand Down