aboutsummaryrefslogtreecommitdiffhomepage
path: root/AuthSamples
diff options
context:
space:
mode:
authorGravatar Xiangtian Dai <xiangtian@google.com>2017-08-04 09:56:03 -0700
committerGravatar GitHub <noreply@github.com>2017-08-04 09:56:03 -0700
commit13627ec716ed4e7b2cf87ab6d7ffcf8f3f53ae6d (patch)
treea7b55d4fe27b74c0503a9e1d10727b98590ff53d /AuthSamples
parent5430b776ca6fea34d84dab09db39c51b51e551da (diff)
Adds the missing FIRActionCodeOperationRecoverEmail. (#177)
Also allow in-app action code handling to cancel and leave the code in pasteboard.
Diffstat (limited to 'AuthSamples')
-rw-r--r--AuthSamples/Sample/MainViewController.m17
1 files changed, 12 insertions, 5 deletions
diff --git a/AuthSamples/Sample/MainViewController.m b/AuthSamples/Sample/MainViewController.m
index 665e05c..ac6859c 100644
--- a/AuthSamples/Sample/MainViewController.m
+++ b/AuthSamples/Sample/MainViewController.m
@@ -822,6 +822,7 @@ static NSDictionary<NSString *, NSString *> *parseURL(NSString *urlString) {
[self showTextInputPromptWithMessage:@"New Password:"
completionBlock:^(BOOL userPressedOK, NSString *_Nullable newPassword) {
if (!userPressedOK || !newPassword.length) {
+ [UIPasteboard generalPasteboard].string = actionCode;
return;
}
[self showSpinner:^() {
@@ -843,8 +844,8 @@ static NSDictionary<NSString *, NSString *> *parseURL(NSString *urlString) {
return YES;
}
if ([mode isEqualToString:kVerifyEmailAction]) {
- [self showMessagePromptWithTitle:@"Verify Email"
- message:@"Proceed?"
+ [self showMessagePromptWithTitle:@"Tap OK to verify email"
+ message:actionCode
showCancelButton:YES
completion:^(BOOL userPressedOK, NSString *_Nullable userInput) {
if (!userPressedOK) {
@@ -2178,10 +2179,14 @@ static NSDictionary<NSString *, NSString *> *parseURL(NSString *urlString) {
}
[self logSuccess:@"Check action code succeeded."];
NSString *email = [info dataForKey:FIRActionCodeEmailKey];
+ NSString *fromEmail = [info dataForKey:FIRActionCodeFromEmailKey];
+ NSString *message =
+ fromEmail ? [NSString stringWithFormat:@"%@ -> %@", fromEmail, email] : email;
NSString *operation = [self nameForActionCodeOperation:info.operation];
- NSString *infoMessage =
- [[NSString alloc] initWithFormat:@"Email: %@\n Operation: %@", email, operation];
- [self showMessagePrompt:infoMessage];
+ [self showMessagePromptWithTitle:operation
+ message:message
+ showCancelButton:NO
+ completion:nil];
}];
}];
}];
@@ -2252,6 +2257,8 @@ static NSDictionary<NSString *, NSString *> *parseURL(NSString *urlString) {
switch (operation) {
case FIRActionCodeOperationVerifyEmail:
return @"Verify Email";
+ case FIRActionCodeOperationRecoverEmail:
+ return @"Recover Email";
case FIRActionCodeOperationPasswordReset:
return @"Password Reset";
case FIRActionCodeOperationUnknown: