From 477247e7b05a17ac072d62511f49b9913d6764cc Mon Sep 17 00:00:00 2001 From: Cesar Tardaguila <2722505+ctarda@users.noreply.github.com> Date: Tue, 5 Jan 2021 14:01:49 -0500 Subject: [PATCH 1/3] Add a new case to navigate to the view controller requesting email address --- .../Authenticator/WordPressAuthenticatorResult.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorResult.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorResult.swift index 2cc175b51..ecd7a6309 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorResult.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorResult.swift @@ -17,6 +17,11 @@ public enum WordPressAuthenticatorResult { /// case presentPasswordController(value: Bool) + /// Present the view controller requesting the email address + /// associated to the user's wordpress.com account + /// + case presentEmailController + /// A view controller to be inserted into the navigation stack /// case injectViewController(value: UIViewController) From da23afaa4615161a632d2384c92ceea3f0c1eab7 Mon Sep 17 00:00:00 2001 From: Cesar Tardaguila <2722505+ctarda@users.noreply.github.com> Date: Tue, 5 Jan 2021 14:02:00 -0500 Subject: [PATCH 2/3] Implement suppor for the new case --- .../Signin/LoginSiteAddressViewController.swift | 6 ++++-- .../Site Address/SiteAddressViewController.swift | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift index 7eb6ba620..6e0c696f7 100644 --- a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift +++ b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift @@ -235,8 +235,10 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder self.showSelfHostedUsernamePassword() } - self.showWPUsernamePassword() - + self.showWPUsernamePassword() + case .presentEmailController: + // This case is only used for UL&S + break case .injectViewController(_): // This case is only used for UL&S break diff --git a/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift index 7c76ea29d..da3be0974 100644 --- a/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift +++ b/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift @@ -513,6 +513,8 @@ private extension SiteAddressViewController { } self.showWPUsernamePassword() + case .presentEmailController: + self.showGetStarted() case let .injectViewController(customUI): self.pushCustomUI(customUI) } From af22630e4ed21687dad44e58279a457a9819a4c4 Mon Sep 17 00:00:00 2001 From: Cesar Tardaguila <2722505+ctarda@users.noreply.github.com> Date: Tue, 5 Jan 2021 14:02:37 -0500 Subject: [PATCH 3/3] Bump podspec --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 09a6ede30..8b23ce38e 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.33.0-beta.2" + s.version = "1.33.0-beta.3" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC