Merge pull request #767 from wordpress-mobile/wcios/navigate-to-wpcom-with-email

itsmeichigo · web-flow · commit eba1abd0e775 · 2023-04-17T15:18:53.000+07:00
Support navigation to WPCom login with an existing email
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,15 +30,15 @@ _None._
 
 -->
 
-## 6.0.1
+## 6.1.0
 
 ### Breaking Changes
 
 _None._
 
 ### New Features
 
-_None._
+- Support navigating to the WPCom login flow with an existing email through `NavigateToEnterAccount`. [#767]
 
 ### Bug Fixes
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -22,7 +22,7 @@ PODS:
   - SVProgressHUD (2.2.5)
   - SwiftLint (0.49.1)
   - UIDeviceIdentifier (2.2.0)
-  - WordPressAuthenticator (6.0.1-beta.1):
+  - WordPressAuthenticator (6.1.0-beta.1):
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
@@ -94,7 +94,7 @@ SPEC CHECKSUMS:
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
   UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67
-  WordPressAuthenticator: 3b05690984590e0c97e44fec89bd06ab16a2da1f
+  WordPressAuthenticator: e632aa8afeb4583d0c7c0818e2add2bffce47ef2
   WordPressKit: d5bff8713aa7c0092ff6e2a58623e46a99fc897c
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressAuthenticator'
-  s.version       = '6.0.1-beta.1'
+  s.version       = '6.1.0-beta.1'
 
   s.summary       = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.'
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/Navigation/NavigateToEnterAccount.swift b/WordPressAuthenticator/Navigation/NavigateToEnterAccount.swift
@@ -4,23 +4,26 @@ import Foundation
 ///
 public struct NavigateToEnterAccount: NavigationCommand {
     private let signInSource: SignInSource
+    private let email: String?
 
-    public init(signInSource: SignInSource) {
+    public init(signInSource: SignInSource, email: String? = nil) {
         self.signInSource = signInSource
+        self.email = email
     }
 
     public func execute(from: UIViewController?) {
-        continueWithDotCom(navigationController: from?.navigationController)
+        continueWithDotCom(email: email, navigationController: from?.navigationController)
     }
 }
 
 private extension NavigateToEnterAccount {
-    private func continueWithDotCom(navigationController: UINavigationController?) {
+    private func continueWithDotCom(email: String? = nil, navigationController: UINavigationController?) {
         guard let vc = GetStartedViewController.instantiate(from: .getStarted) else {
             WPAuthenticatorLogError("Failed to navigate from LoginPrologueViewController to GetStartedViewController")
             return
         }
         vc.source = signInSource
+        vc.loginFields.username = email ?? ""
 
         navigationController?.pushViewController(vc, animated: true)
     }

Original file line number	Diff line number	Diff line change
`@@ -4,23 +4,26 @@ import Foundation`
`4`	`4`	`///`
`5`	`5`	`public struct NavigateToEnterAccount: NavigationCommand {`
`6`	`6`	`private let signInSource: SignInSource`
	`7`	`+ private let email: String?`
`7`	`8`
`8`		`- public init(signInSource: SignInSource) {`
	`9`	`+ public init(signInSource: SignInSource, email: String? = nil) {`
`9`	`10`	`self.signInSource = signInSource`
	`11`	`+ self.email = email`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`public func execute(from: UIViewController?) {`
`13`		`- continueWithDotCom(navigationController: from?.navigationController)`
	`15`	`+ continueWithDotCom(email: email, navigationController: from?.navigationController)`
`14`	`16`	`}`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`private extension NavigateToEnterAccount {`
`18`		`- private func continueWithDotCom(navigationController: UINavigationController?) {`
	`20`	`+ private func continueWithDotCom(email: String? = nil, navigationController: UINavigationController?) {`
`19`	`21`	`guard let vc = GetStartedViewController.instantiate(from: .getStarted) else {`
`20`	`22`	`WPAuthenticatorLogError("Failed to navigate from LoginPrologueViewController to GetStartedViewController")`
`21`	`23`	`return`
`22`	`24`	`}`
`23`	`25`	`vc.source = signInSource`
	`26`	`+ vc.loginFields.username = email ?? ""`
`24`	`27`
`25`	`28`	`navigationController?.pushViewController(vc, animated: true)`
`26`	`29`	`}`