From 6929212071f36f775e3668c6a4767853a9d903a0 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 1 Apr 2020 14:39:32 -0500 Subject: [PATCH 01/33] Set storyboard ID --- WordPressAuthenticator/Signup/Signup.storyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator/Signup/Signup.storyboard b/WordPressAuthenticator/Signup/Signup.storyboard index d6ab6cfe0..94c12288e 100644 --- a/WordPressAuthenticator/Signup/Signup.storyboard +++ b/WordPressAuthenticator/Signup/Signup.storyboard @@ -27,7 +27,7 @@ - + From 98add156ec10b45c2aeb3e71a04ea6e6a8083e92 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 1 Apr 2020 14:40:40 -0500 Subject: [PATCH 02/33] Remove .showSigninV2 segue from Login Prologue VC Navigate programmatically --- WordPressAuthenticator/Signin/Login.storyboard | 2 -- .../Signin/LoginPrologueViewController.swift | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index e7231640d..af460a74e 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -108,7 +108,6 @@ - @@ -1451,7 +1450,6 @@ - diff --git a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift index 2ef87d374..b477dd1d3 100644 --- a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift +++ b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift @@ -124,7 +124,12 @@ class LoginPrologueViewController: LoginViewController { vc.modalPresentationStyle = .custom vc.emailTapped = { [weak self] in - self?.performSegue(withIdentifier: .showSigninV2, sender: self) + guard let toVC = SignupEmailViewController.instantiate(from: .signup) else { + DDLogError("Failed to navigate to SignupEmailViewController") + return + } + + self?.navigationController?.pushViewController(toVC, animated: true) } vc.googleTapped = { [weak self] in From 02d44484f97b0a08d10b95c898a3f1f3fd4b4ee2 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 1 Apr 2020 14:44:15 -0500 Subject: [PATCH 03/33] Remove `.showSigninV2` from LoginEmailVC and use nav controller Also delete storyboard placeholder from SignupEmailVC --- WordPressAuthenticator/Signin/Login.storyboard | 9 --------- .../Signin/LoginEmailViewController.swift | 10 +++++++++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index af460a74e..ebaf77a02 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -353,7 +353,6 @@ - @@ -361,14 +360,6 @@ - - - - - - - - diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index 2e18f566f..20ef62c46 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -405,9 +405,16 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { if let vc = segue.destination as? LoginPrologueSignupMethodViewController { vc.transitioningDelegate = self + vc.emailTapped = { [weak self] in - self?.performSegue(withIdentifier: .showSigninV2, sender: self) + guard let toVC = SignupEmailViewController.instantiate(from: .signup) else { + DDLogError("Failed to navigate from LoginEmailViewController to SignupEmailViewController") + return + } + + self?.navigationController?.pushViewController(toVC, animated: true) } + vc.googleTapped = { [weak self] in guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else { DDLogError("Failed to navigate to SignupGoogleViewController") @@ -416,6 +423,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { self?.navigationController?.pushViewController(toVC, animated: true) } + vc.modalPresentationStyle = .custom } } From a1203c556a5f4cd099acb2598d7229191c883e2d Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 1 Apr 2020 14:46:01 -0500 Subject: [PATCH 04/33] Remove segue identifier case `showsigninV2` --- WordPressAuthenticator/NUX/NUXViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPressAuthenticator/NUX/NUXViewController.swift b/WordPressAuthenticator/NUX/NUXViewController.swift index 708adfa9c..e92b861f3 100644 --- a/WordPressAuthenticator/NUX/NUXViewController.swift +++ b/WordPressAuthenticator/NUX/NUXViewController.swift @@ -25,7 +25,6 @@ open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewCon // MARK: associated type for NUXSegueHandler /// Segue identifiers to avoid using strings public enum SegueIdentifier: String { - case showSigninV2 case showURLUsernamePassword case showWPUsernamePassword case showSelfHostedLogin From 58fc5c2e810e9130ee1bb87284238767bcacf18b Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 1 Apr 2020 15:28:41 -0500 Subject: [PATCH 05/33] Bump podspec --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 2973b0187..45146dae4 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.12.0-beta.6" + s.version = "1.12.0-beta.8" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 7f4277bf63c97930f61e726d018eea2268794877 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 6 Apr 2020 09:08:51 -0500 Subject: [PATCH 06/33] Bump podspec --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index caeb9fb9b..2b85c7267 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.12.0-beta.8" + s.version = "1.13.0-beta.1" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 56e6f1a69880c65ea550d14b368440449f6a8757 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 6 Apr 2020 09:10:45 -0500 Subject: [PATCH 07/33] Update documentation to explain that Google Sign In conforms to 2fa --- .../Signin/LoginEmailViewController.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index 20ef62c46..a90e74724 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -519,7 +519,9 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { // MARK: - Google Sign In -// LoginFacadeDelegate methods for Google Google Sign In +/// Make Google Sign In conform to the LoginFacade protocol. +/// The delegate calls these methods from LoginFacade.m. +/// extension LoginEmailViewController { func finishedLogin(withGoogleIDToken googleIDToken: String, authToken: String) { googleFinishedLogin(withGoogleIDToken: googleIDToken, authToken: authToken) @@ -530,6 +532,9 @@ extension LoginEmailViewController { googleExistingUserNeedsConnection(email) } + /// After a successful Google Sign In, this method gets called when the user + /// has enabled 2-factor authentication for their WordPress.com account. + /// func needsMultifactorCode(forUserID userID: Int, andNonceInfo nonceInfo: SocialLogin2FANonceInfo) { configureViewLoading(false) socialNeedsMultifactorCode(forUserID: userID, andNonceInfo: nonceInfo) From d6c60b26365be0c2d52b876df89a478c7d2948f3 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 6 Apr 2020 14:06:18 -0500 Subject: [PATCH 08/33] Remove unused prepare for segue override function This prepare for segue is no longer used because login in by email and login by google are done using nav controllers rather than calling perform segue. --- .../Signin/LoginEmailViewController.swift | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index a90e74724..620c9b9fd 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -397,37 +397,6 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { return EmailFormatValidator.validate(string: loginFields.username) } - - // MARK: - Segue - - override open func prepare(for segue: UIStoryboardSegue, sender: Any?) { - super.prepare(for: segue, sender: sender) - - if let vc = segue.destination as? LoginPrologueSignupMethodViewController { - vc.transitioningDelegate = self - - vc.emailTapped = { [weak self] in - guard let toVC = SignupEmailViewController.instantiate(from: .signup) else { - DDLogError("Failed to navigate from LoginEmailViewController to SignupEmailViewController") - return - } - - self?.navigationController?.pushViewController(toVC, animated: true) - } - - vc.googleTapped = { [weak self] in - guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else { - DDLogError("Failed to navigate to SignupGoogleViewController") - return - } - - self?.navigationController?.pushViewController(toVC, animated: true) - } - - vc.modalPresentationStyle = .custom - } - } - // MARK: - Actions From 474bb4d92fa51275a73beb078219bf9a02011e67 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Thu, 9 Apr 2020 08:55:19 -0500 Subject: [PATCH 09/33] Restore changes after merging from develop --- .../Signin/LoginEmailViewController.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index 1a4225226..780c92f89 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -205,8 +205,14 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { // Don't forget to handle the button taps! vc.emailTapped = { [weak self] in - self?.performSegue(withIdentifier: .showSigninV2, sender: self) + guard let toVC = SignupEmailViewController.instantiate(from: .signup) else { + DDLogError("Failed to navigate from LoginEmailViewController to SignupEmailViewController") + return + } + + self?.navigationController?.pushViewController(toVC, animated: true) } + vc.googleTapped = { [weak self] in guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else { DDLogError("Failed to navigate to SignupGoogleViewController") @@ -215,6 +221,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { self?.navigationController?.pushViewController(toVC, animated: true) } + vc.appleTapped = { [weak self] in self?.appleTapped() } From a232c3c7ac6a4bffbb156acbc3a8ef6c64bc7707 Mon Sep 17 00:00:00 2001 From: James Frost Date: Tue, 14 Apr 2020 14:50:20 +0100 Subject: [PATCH 10/33] Switch the primary login prologue button to Sign Up --- .../Signin/LoginPrologueViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift index b477dd1d3..c05dd0a3e 100644 --- a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift +++ b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift @@ -78,10 +78,10 @@ class LoginPrologueViewController: LoginViewController { let loginTitle = NSLocalizedString("Log In", comment: "Button title. Tapping takes the user to the login form.") let createTitle = NSLocalizedString("Sign up for WordPress.com", comment: "Button title. Tapping begins the process of creating a WordPress.com account.") - buttonViewController.setupTopButton(title: loginTitle, isPrimary: true, accessibilityIdentifier: "Prologue Log In Button") { [weak self] in + buttonViewController.setupTopButton(title: loginTitle, isPrimary: false, accessibilityIdentifier: "Prologue Log In Button") { [weak self] in self?.loginTapped() } - buttonViewController.setupBottomButton(title: createTitle, isPrimary: false, accessibilityIdentifier: "Prologue Signup Button") { [weak self] in + buttonViewController.setupBottomButton(title: createTitle, isPrimary: true, accessibilityIdentifier: "Prologue Signup Button") { [weak self] in self?.signupTapped() } if showCancel { From f37763a0f2514470d67c92ce16886dc2ef764564 Mon Sep 17 00:00:00 2001 From: James Frost Date: Tue, 14 Apr 2020 14:50:43 +0100 Subject: [PATCH 11/33] Bump podspec version --- Podfile.lock | 2 +- WordPressAuthenticator.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 38440736e..8e7a5e36a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -124,4 +124,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: d2a5f1cb57eeb9eb2ac2cb22d29b6b827ccf8ce4 -COCOAPODS: 1.8.4 +COCOAPODS: 1.8.3 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 2b85c7267..b3477352a 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.13.0-beta.1" + s.version = "1.13.0-beta.2" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From b8cadb18f4733f8d304640efbb6ef57c4082b260 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:46:53 -0500 Subject: [PATCH 12/33] Navigate using navController instead of segue --- .../Signin/LoginEmailViewController.swift | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index 780c92f89..8b0783e6a 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -403,13 +403,24 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { } /// Configures loginFields to log into wordpress.com and - /// navigates to the selfhosted username/password form. Displays the specified - /// error message when the new view controller appears. + /// navigates to the selfhosted username/password form. + /// Displays the specified error message when the new + /// view controller appears. /// @objc func showSelfHostedUsernamePasswordAndError(_ error: Error) { loginFields.siteAddress = "https://wordpress.com" errorToPresent = error - performSegue(withIdentifier: .showURLUsernamePassword, sender: self) + + guard let vc = LoginSelfHostedViewController.instantiate(from: .login) else { + DDLogError("Failed to navigate from LoginEmailViewController to LoginSelfHostedViewController") + return + } + + vc.loginFields = loginFields + vc.dismissBlock = dismissBlock + vc.errorToPresent = errorToPresent + + navigationController?.pushViewController(vc, animated: true) } override open func displayRemoteError(_ error: Error) { From ed543cb53270327f8aad3ca5a7ffd745f58c575f Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:48:21 -0500 Subject: [PATCH 13/33] Update the Xcode tools version. Remove storyboard ID from self-hosted vc --- WordPressAuthenticator/Signin/Login.storyboard | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index 166797e34..5ab52fc28 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -1,9 +1,9 @@ - + - + @@ -361,7 +361,7 @@ - + @@ -1425,11 +1425,6 @@ - - - - - @@ -1437,4 +1432,9 @@ + + + + + From a92deadd7e172ea24f1532f72663a70d493c61cc Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:49:27 -0500 Subject: [PATCH 14/33] Delete the segue in IB from LoginEmailVC --- WordPressAuthenticator/Signin/Login.storyboard | 2 -- 1 file changed, 2 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index 5ab52fc28..30651e0bc 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -351,7 +351,6 @@ - @@ -1429,7 +1428,6 @@ - From e26ccf94416629217a607aef4c5aa347ab3a4eaf Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:51:37 -0500 Subject: [PATCH 15/33] Weird indentation --- .../Signin/LoginEmailViewController.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index 8b0783e6a..b3903f61e 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -413,14 +413,14 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { guard let vc = LoginSelfHostedViewController.instantiate(from: .login) else { DDLogError("Failed to navigate from LoginEmailViewController to LoginSelfHostedViewController") - return - } + return + } - vc.loginFields = loginFields - vc.dismissBlock = dismissBlock - vc.errorToPresent = errorToPresent + vc.loginFields = loginFields + vc.dismissBlock = dismissBlock + vc.errorToPresent = errorToPresent - navigationController?.pushViewController(vc, animated: true) + navigationController?.pushViewController(vc, animated: true) } override open func displayRemoteError(_ error: Error) { From 116b941c50f55365423d09d6c9bbae7dc926cdce Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:51:59 -0500 Subject: [PATCH 16/33] Use navController to navigate to self-hosted VC instead of segue --- .../Signin/LoginSiteAddressViewController.swift | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift index 03363719b..8c0326022 100644 --- a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift +++ b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift @@ -258,7 +258,16 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder /// @objc func showSelfHostedUsernamePassword() { configureViewLoading(false) - performSegue(withIdentifier: .showURLUsernamePassword, sender: self) + guard let vc = LoginSelfHostedViewController.instantiate(from: .login) else { + DDLogError("Failed to navigate from LoginEmailViewController to LoginSelfHostedViewController") + return + } + + vc.loginFields = loginFields + vc.dismissBlock = dismissBlock + vc.errorToPresent = errorToPresent + + navigationController?.pushViewController(vc, animated: true) } /// Break away from the self-hosted flow. From 3e293518170baa14d8e6851d855857741719b36b Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:54:03 -0500 Subject: [PATCH 17/33] Delete segue from LoginSelfHostedVC in Interface Builder --- WordPressAuthenticator/Signin/Login.storyboard | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index 30651e0bc..0156bfac3 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -1144,7 +1144,6 @@ - From 0c0710718e5afe8ff0ec3bd76b2e9dd2551017d3 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 11:55:01 -0500 Subject: [PATCH 18/33] Delete `showURLUsernamePassword` case from SegueIdentifier enum --- WordPressAuthenticator/NUX/NUXViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPressAuthenticator/NUX/NUXViewController.swift b/WordPressAuthenticator/NUX/NUXViewController.swift index fa08a04dd..6d0de6d0a 100644 --- a/WordPressAuthenticator/NUX/NUXViewController.swift +++ b/WordPressAuthenticator/NUX/NUXViewController.swift @@ -25,7 +25,6 @@ open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewCon // MARK: associated type for NUXSegueHandler /// Segue identifiers to avoid using strings public enum SegueIdentifier: String { - case showURLUsernamePassword case showWPUsernamePassword case showSelfHostedLogin case showWPComLogin From ce0cd4ab3ac266dc747db048a8c33375d3ec00d8 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 13:22:11 -0500 Subject: [PATCH 19/33] Add class name as storyboardID --- WordPressAuthenticator/Signin/Login.storyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index 0156bfac3..e809f8895 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -360,7 +360,7 @@ - + From 9a1cdfce612c96623bdf7680cc493d405f295e3a Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 14 Apr 2020 13:41:08 -0500 Subject: [PATCH 20/33] Update podspec version --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 2b85c7267..5e921267f 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.13.0-beta.1" + s.version = "1.13.0-beta.3" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 505909b0734e17b02e0f7e567c4ae4d1dde516e9 Mon Sep 17 00:00:00 2001 From: James Frost Date: Tue, 14 Apr 2020 20:24:01 +0100 Subject: [PATCH 21/33] Updated Podfile.lock --- Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile.lock b/Podfile.lock index 8e7a5e36a..38440736e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -124,4 +124,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: d2a5f1cb57eeb9eb2ac2cb22d29b6b827ccf8ce4 -COCOAPODS: 1.8.3 +COCOAPODS: 1.8.4 From 16b7da5a9770d259b94fc251e0f30d0f03552b9c Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:10:39 -0500 Subject: [PATCH 22/33] Remove performSegue from LoginVC Use navController to push selfHostedVC --- .../Signin/LoginViewController.swift | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/WordPressAuthenticator/Signin/LoginViewController.swift b/WordPressAuthenticator/Signin/LoginViewController.swift index 0252a08c9..c12b391f7 100644 --- a/WordPressAuthenticator/Signin/LoginViewController.swift +++ b/WordPressAuthenticator/Signin/LoginViewController.swift @@ -136,8 +136,18 @@ open class LoginViewController: NUXViewController, LoginFacadeDelegate { } /// Displays the self-hosted sign in form. + /// func loginToSelfHostedSite() { - performSegue(withIdentifier: .showSelfHostedLogin, sender: self) + guard let vc = LoginSiteAddressViewController.instantiate(from: .login) else { + DDLogError("Failed to navigate from LoginViewController to LoginSiteAddressViewController") + return + } + + vc.loginFields = loginFields + vc.dismissBlock = dismissBlock + vc.errorToPresent = errorToPresent + + navigationController?.pushViewController(vc, animated: true) } /// Validates what is entered in the various form fields and, if valid, From f5cdcc97f152ea17094a635255f292e03caacc2e Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:12:19 -0500 Subject: [PATCH 23/33] Rename storyboardID from siteAddress to class name siteAddress is now LoginSiteAddressViewController --- WordPressAuthenticator/Signin/Login.storyboard | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index e809f8895..bbfbf5908 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -1002,7 +1002,7 @@ - + @@ -1424,10 +1424,10 @@ - + - - + + From 35ed14ec6bd482453ec91579cd3acf2ef2ab76c6 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:15:43 -0500 Subject: [PATCH 24/33] Remove showSelfHostedLogin segue from LoginPrologueVC --- WordPressAuthenticator/Signin/Login.storyboard | 2 -- 1 file changed, 2 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index bbfbf5908..e24b540af 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -109,7 +109,6 @@ - @@ -1425,7 +1424,6 @@ - From b857aa7926b6e389a4951a80784c7e83b0bc2d79 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:29:07 -0500 Subject: [PATCH 25/33] Remove showSelfHostedLogin segue from LoginEmailVC This segue was used in the text button "Or log in by _entering your site address_. --- WordPressAuthenticator/Signin/Login.storyboard | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index e24b540af..cab8e9d53 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -348,7 +348,6 @@ - @@ -1423,8 +1422,8 @@ - - + + From a2de49fa9d7317977911b8a32d2c947fc3757149 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:29:47 -0500 Subject: [PATCH 26/33] Remove the showSelfHostedLogin case from SegueIdentifier enum --- WordPressAuthenticator/NUX/NUXViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPressAuthenticator/NUX/NUXViewController.swift b/WordPressAuthenticator/NUX/NUXViewController.swift index 6d0de6d0a..489557766 100644 --- a/WordPressAuthenticator/NUX/NUXViewController.swift +++ b/WordPressAuthenticator/NUX/NUXViewController.swift @@ -26,7 +26,6 @@ open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewCon /// Segue identifiers to avoid using strings public enum SegueIdentifier: String { case showWPUsernamePassword - case showSelfHostedLogin case showWPComLogin case startMagicLinkFlow case showMagicLink From cec5a83a436efe509301280f3e2787c6772d4cb9 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:37:21 -0500 Subject: [PATCH 27/33] Missed a piece - updated segue references in Login.storyboard --- WordPressAuthenticator/Signin/Login.storyboard | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index cab8e9d53..82aee14c0 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -1423,8 +1423,8 @@ - - + + From 76b7c675cceea0d584926c36e76d52fbfbcac35d Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Wed, 15 Apr 2020 11:38:31 -0500 Subject: [PATCH 28/33] Bump podspec version --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 5e921267f..a87872039 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.13.0-beta.3" + s.version = "1.13.0-beta.4" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 7cf66f06c24a9443ec8d4b08c1c3ce79dd92101f Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Thu, 16 Apr 2020 08:34:30 -0500 Subject: [PATCH 29/33] Replace creating controller from storyboardID to using new convenience method --- .../Authenticator/WordPressAuthenticator.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift index 9e20f0fb5..4e4cbf05d 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift @@ -198,8 +198,7 @@ import AuthenticationServices /// Returns an instance of LoginSiteAddressViewController: allows the user to log into a WordPress.org website. /// @objc public class func signinForWPOrg() -> UIViewController { - let storyboard = UIStoryboard(name: "Login", bundle: bundle) - guard let controller = storyboard.instantiateViewController(withIdentifier: "siteAddress") as? LoginSiteAddressViewController else { + guard let controller = LoginSiteAddressViewController.instantiate(from: .login) else { fatalError("unable to create wpcom password screen") } From 23807e0c3b57e11625021b74e6939b0b830e1cc2 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Thu, 16 Apr 2020 15:50:58 -0600 Subject: [PATCH 30/33] Updating wpkit to beta pod. --- Podfile | 4 ++-- Podfile.lock | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index 5e7789d04..ba3455db7 100644 --- a/Podfile +++ b/Podfile @@ -11,8 +11,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 1.0' pod 'WordPressUI', '~> 1.5.2' - pod 'WordPressKit', '~> 4.7.0' - # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => '' + # pod 'WordPressKit', '~> 4.7.0' + pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'fix/11771-gravatar_user_not_found' # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '' pod 'WordPressShared', '~> 1.8.16' diff --git a/Podfile.lock b/Podfile.lock index 38440736e..0347562a1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,7 +44,7 @@ PODS: - Specta (1.0.7) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.4.0) - - WordPressKit (4.7.0): + - WordPressKit (4.8.0-beta.1): - Alamofire (~> 4.8.0) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.4) @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (~> 4.7.0) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `fix/11771-gravatar_user_not_found`) - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.5.2) @@ -94,11 +94,20 @@ SPEC REPOS: - Specta - SVProgressHUD - UIDeviceIdentifier - - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc +EXTERNAL SOURCES: + WordPressKit: + :branch: fix/11771-gravatar_user_not_found + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + +CHECKOUT OPTIONS: + WordPressKit: + :commit: 864eec7eb314cf89e3c7defedf631db87c1af42b + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -117,11 +126,11 @@ SPEC CHECKSUMS: Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPressKit: 0602e8188245b3267269570d3d78c138e64a4eba + WordPressKit: 636f3f7e1c879b22f1d46e61d662ad640161f8b2 WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01 WordPressUI: 70cc58a253c352330b23cd8fa6dd6a2021570e18 wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf -PODFILE CHECKSUM: d2a5f1cb57eeb9eb2ac2cb22d29b6b827ccf8ce4 +PODFILE CHECKSUM: db5d0ce73f34dcea3781f77c6dd0bedec53217a2 COCOAPODS: 1.8.4 From f597659ec0c82b1b786dbd87e786cefede11117c Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Thu, 16 Apr 2020 15:56:00 -0600 Subject: [PATCH 31/33] Updating wpkit pod version. --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index a87872039..0ee50b58d 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 1.0' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.5.2' - s.dependency 'WordPressKit', '~> 4.7.0' + s.dependency 'WordPressKit', '~> 4.8.0-beta.1' s.dependency 'WordPressShared', '~> 1.8.16' end From bc136f685e337f88bf95631350ff36a2a582382f Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 17 Apr 2020 12:15:47 -0600 Subject: [PATCH 32/33] Updating WPKit to beta version. --- Podfile | 4 ++-- Podfile.lock | 15 +++------------ WordPressAuthenticator.podspec | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Podfile b/Podfile index ba3455db7..94a144319 100644 --- a/Podfile +++ b/Podfile @@ -11,8 +11,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 1.0' pod 'WordPressUI', '~> 1.5.2' - # pod 'WordPressKit', '~> 4.7.0' - pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'fix/11771-gravatar_user_not_found' + pod 'WordPressKit', '~> 4.8.0-beta.1' + # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => '' # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '' pod 'WordPressShared', '~> 1.8.16' diff --git a/Podfile.lock b/Podfile.lock index 0347562a1..b460d31bc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `fix/11771-gravatar_user_not_found`) + - WordPressKit (~> 4.8.0-beta.1) - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.5.2) @@ -94,20 +94,11 @@ SPEC REPOS: - Specta - SVProgressHUD - UIDeviceIdentifier + - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc -EXTERNAL SOURCES: - WordPressKit: - :branch: fix/11771-gravatar_user_not_found - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - -CHECKOUT OPTIONS: - WordPressKit: - :commit: 864eec7eb314cf89e3c7defedf631db87c1af42b - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -131,6 +122,6 @@ SPEC CHECKSUMS: WordPressUI: 70cc58a253c352330b23cd8fa6dd6a2021570e18 wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf -PODFILE CHECKSUM: db5d0ce73f34dcea3781f77c6dd0bedec53217a2 +PODFILE CHECKSUM: b5a906d2c4561de3ad1b3c684f6043c8ce9f1b14 COCOAPODS: 1.8.4 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 0ee50b58d..d24383947 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.13.0-beta.4" + s.version = "1.13.0-beta.5" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 9e873b6ec516d3af83aae1eff03f245b62c6b699 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 20 Apr 2020 12:26:13 +0200 Subject: [PATCH 33/33] Bump version to 1.13.0 --- Podfile | 2 +- Podfile.lock | 8 ++++---- WordPressAuthenticator.podspec | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index 94a144319..0a4dd901e 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,7 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 1.0' pod 'WordPressUI', '~> 1.5.2' - pod 'WordPressKit', '~> 4.8.0-beta.1' + pod 'WordPressKit', '~> 4.8.0' # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => '' # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '' pod 'WordPressShared', '~> 1.8.16' diff --git a/Podfile.lock b/Podfile.lock index b460d31bc..86b625bd6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,7 +44,7 @@ PODS: - Specta (1.0.7) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.4.0) - - WordPressKit (4.8.0-beta.1): + - WordPressKit (4.8.0): - Alamofire (~> 4.8.0) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.4) @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (~> 4.8.0-beta.1) + - WordPressKit (~> 4.8.0) - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.5.2) @@ -117,11 +117,11 @@ SPEC CHECKSUMS: Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPressKit: 636f3f7e1c879b22f1d46e61d662ad640161f8b2 + WordPressKit: 84045e236949248632a2c644149e5657733011bb WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01 WordPressUI: 70cc58a253c352330b23cd8fa6dd6a2021570e18 wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf -PODFILE CHECKSUM: b5a906d2c4561de3ad1b3c684f6043c8ce9f1b14 +PODFILE CHECKSUM: 8e0158473c1f3e6910b3b417c2f53fee11dc0bfc COCOAPODS: 1.8.4 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index d24383947..f6d07700f 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.13.0-beta.5" + s.version = "1.13.0" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 1.0' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.5.2' - s.dependency 'WordPressKit', '~> 4.8.0-beta.1' + s.dependency 'WordPressKit', '~> 4.8.0' s.dependency 'WordPressShared', '~> 1.8.16' end