Skip to content

Handles email mismatch case #414

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 3 commits into from
Mar 5, 2018
Merged

Handles email mismatch case #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3f484a
Handles the email mismatch case
protocol86 Mar 2, 2018
454698e
Improvements
protocol86 Mar 2, 2018
37bf7d2
fixes typo
protocol86 Mar 5, 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
79 changes: 71 additions & 8 deletions FirebaseAuthUI/FUIAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@
#import "FUIPasswordSignInViewController_Internal.h"
#import "FUIPasswordVerificationViewController.h"

/** @typedef EmailHintSignInCallback
@brief The type of block invoked when an emailHint sign-in event completes.

@param authResult Optionally; Result of sign-in request containing both the user and
the additional user info associated with the user.
@param error Optionally; the error which occurred - or nil if the request was successful.
@param credential Optionally; The credential used to sign-in.
*/
typedef void (^EmailHintSignInCallback)(FIRAuthDataResult *_Nullable authResult,
NSError *_Nullable error,
FIRAuthCredential *_Nullable credential);

/** @var kAppNameCodingKey
@brief The key used to encode the app Name for NSCoding.
*/
Expand Down Expand Up @@ -222,11 +234,25 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
presentingViewController:presentingViewController
originalError:error
completion:^(FIRAuthDataResult *_Nullable authResult,
NSError *_Nullable error) {
NSError *_Nullable error,
FIRAuthCredential *_Nullable credential) {
if (error) {
completeSignInBlock(nil, error);
return;
}

if (![authResult.user.email isEqualToString:[providerUI email]]
&& credential) {
NSDictionary *userInfo = @{
FUIAuthCredentialKey : credential,
};
NSError *mergeError = [NSError errorWithDomain:FUIAuthErrorDomain
code:FUIAuthErrorCodeMergeConflict
userInfo:userInfo];
completeSignInBlock(nil, mergeError);
return;
}

[authResult.user linkAndRetrieveDataWithCredential:credential
completion:^(FIRAuthDataResult
*_Nullable authResult,
Expand Down Expand Up @@ -284,7 +310,7 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
- (void)signInWithEmailHint:(NSString *)emailHint
presentingViewController:(FUIAuthBaseViewController *)presentingViewController
originalError:(NSError *)originalError
completion:(FIRAuthDataResultCallback)completion {
completion:(EmailHintSignInCallback)completion {
NSString *kTempApp = @"tempApp";
FIROptions *options = [FIROptions defaultOptions];
// Create an new app instance in order to create a new auth instance.
Expand All @@ -299,7 +325,7 @@ - (void)signInWithEmailHint:(NSString *)emailHint
[self.auth fetchProvidersForEmail:emailHint completion:^(NSArray<NSString *> *_Nullable providers,
NSError *_Nullable error) {
if (error) {
completion(nil, error);
completion(nil, error, nil);
return;
}
NSString *existingFederatedProviderID = [self authProviderFromProviders:providers];
Expand All @@ -321,12 +347,16 @@ - (void)signInWithEmailHint:(NSString *)emailHint
// Email password sign-in
FUIPasswordSignInViewController *controller =
[[FUIPasswordSignInViewController alloc] initWithAuthUI:authUI email:emailHint];
controller.onDismissCallback = completion;
controller.onDismissCallback = ^(FIRAuthDataResult *result, NSError *error) {
if (completion) {
completion(result, error, nil);
}
};
[presentingViewController pushViewController:controller];
}
cancelHandler:^{
if (completion) {
completion(nil, originalError);
completion(nil, originalError, nil);
}
}];
} else {
Expand All @@ -351,16 +381,49 @@ - (void)signInWithEmailHint:(NSString *)emailHint
FIRAuthResultCallback _Nullable result) {
if (error) {
if (completion) {
completion(nil, error);
completion(nil, error, nil);
}
return;
}
[tempAuth signInAndRetrieveDataWithCredential:credential completion:completion];

[tempAuth signInAndRetrieveDataWithCredential:credential
completion:^(FIRAuthDataResult *_Nullable authResult,
NSError *_Nullable error) {
if (error) {
if (completion) {
completion(nil, error, nil);
}
}

// Handle potential email mismatch.
if (![emailHint isEqualToString:authResult.user.email]) {
NSString *signedInEmail = authResult.user.email;
NSString *title =
[NSString stringWithFormat:@"Continue sign in with %@?", signedInEmail];
NSString *message =
[NSString stringWithFormat:@"You originally wanted to sign in with %@",
emailHint];
[FUIAuthBaseViewController showAlertWithTitle:title
message:message
actionTitle:@"Continue"
presentingViewController:presentingViewController
actionHandler:^{
if (completion) {
completion(authResult, nil, credential);
}
}
cancelHandler:^{
if (completion) {
completion(nil, error, credential);
}
}];
}
}];
}];
}
cancelHandler:^{
if (completion) {
completion(nil, originalError);
completion(nil, originalError, nil);
}
}];
}
Expand Down
27 changes: 27 additions & 0 deletions FirebaseAuthUI/FUIAuthBaseViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,33 @@ + (void)showAlertWithTitle:(nullable NSString *)title
[presentingViewController presentViewController:alertController animated:YES completion:nil];
}

+ (void)showAlertWithTitle:(nullable NSString *)title
message:(NSString *)message
actionTitle:(NSString *)actionTitle
presentingViewController:(UIViewController *)presentingViewController
actionHandler:(FUIAuthAlertActionHandler)actionHandler
cancelHandler:(FUIAuthAlertActionHandler)cancelHandler {
UIAlertController *alertController =
[UIAlertController alertControllerWithTitle:title
message:message
preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *okAction =
[UIAlertAction actionWithTitle:actionTitle
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) {
actionHandler();
}];
[alertController addAction:okAction];
UIAlertAction *cancelAction =
[UIAlertAction actionWithTitle:FUILocalizedString(kStr_Cancel)
style:UIAlertActionStyleCancel
handler:^(UIAlertAction * _Nonnull action) {
cancelHandler();
}];
[alertController addAction:cancelAction];
[presentingViewController presentViewController:alertController animated:YES completion:nil];
}

+ (void)showSignInAlertWithEmail:(NSString *)email
provider:(id<FUIAuthProvider>)provider
presentingViewController:(UIViewController *)presentingViewController
Expand Down
17 changes: 17 additions & 0 deletions FirebaseAuthUI/FUIAuthBaseViewController_Internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,23 @@ typedef void (^FUIAuthAlertActionHandler)(void);
actionTitle:(NSString *)actionTitle
presentingViewController:(UIViewController *)presentingViewController;

/** @fn showAlertWithTitle:message:actionTitle:presentingViewController:
@brief Displays an alert view with given title, message and action title on top of the
specified view controller.
@param title The title of the alert.
@param message The message of the alert.
@param actionTitle The title of the action button.
@param actionHandler The block to execute if the action button is tapped.
@param cancelHandler The block to execute if the cancel button is tapped.
@param presentingViewController The controller which shows alert.
*/
+ (void)showAlertWithTitle:(nullable NSString *)title
message:(NSString *)message
actionTitle:(NSString *)actionTitle
presentingViewController:(UIViewController *)presentingViewController
actionHandler:(FUIAuthAlertActionHandler)actionHandler
cancelHandler:(FUIAuthAlertActionHandler)cancelHandler;

/** @fn showSignInAlertWithEmail:provider:handler:
@brief Displays an alert to conform with user whether she wants to proceed with the provider.
@param email The email address to sign in with.
Expand Down