Merge pull request #7320 from woocommerce/feat/7298-site-cred-login

[Login] - Introduce a way to sign in using store credentials.

Author: selanthiraiyan

Podfile

@@ -42,7 +42,7 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 2.0.1'
+  pod 'WordPressAuthenticator', '~> 2.1.0-beta.3'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (2.0.1):
+  - WordPressAuthenticator (2.1.0-beta.3):
     - Alamofire (~> 4.8)
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
@@ -92,7 +92,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 2.0.1)
+  - WordPressAuthenticator (~> 2.1.0-beta.3)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -163,7 +163,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 7f41297c3ac33ff19a65cb84950c6260932e47c0
+  WordPressAuthenticator: 5882d5ba6084a20c0e660950363e456162a11296
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 3112ab60d6ff0779572bbc86e380a622138ccc64
+PODFILE CHECKSUM: 918b977da8de7fa51654420e8011f30808657095
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 9.8
 -----
+- [***] Login: Introduce a way to sign in using store credentials.  [https://github.com/woocommerce/woocommerce-ios/pull/7320]
 - [*] In-Person Payments: The purchase card reader information card appears also in the Orders list screen. [https://github.com/woocommerce/woocommerce-ios/pull/7326]
 
 9.7

WooCommerce/Classes/Authentication/AuthenticationConstants.swift

@@ -21,8 +21,8 @@ struct AuthenticationConstants {
     /// What is WordPress.com? link (Continue with WordPress.com)
     ///
     static let whatIsWPComLinkTitle = NSLocalizedString(
-        "_What is WordPress.com?_",
-        comment: "Navigates to page with details about What is WordPress.com. The underscores _..._ denote underline."
+        "What is WordPress.com?",
+        comment: "Navigates to page with details about What is WordPress.com."
     )
 
     /// Login with Jetpack instructions.
@@ -58,6 +58,13 @@ struct AuthenticationConstants {
         comment: "Button title. Takes the user to the login by store address flow."
     )
 
+    /// Title of "Sign in with store credentials" button
+    //
+    static let signInWithSiteCredsButtonTitle = NSLocalizedString(
+        "Sign in with store credentials",
+        comment: "Button title. Takes the user to the site credentials entry screen."
+    )
+
     /// Title of views in Unified Login
     //
     static let loginTitle = NSLocalizedString(

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -45,7 +45,9 @@ class AuthenticationManager: Authentication {
                                                                 enableSignInWithApple: true,
                                                                 enableSignupWithGoogle: false,
                                                                 enableUnifiedAuth: true,
-                                                                continueWithSiteAddressFirst: true)
+                                                                continueWithSiteAddressFirst: true,
+                                                                enableSiteCredentialsLoginForSelfHostedSites: true,
+                                                                isWPComLoginRequiredForSiteCredentialsLogin: true)
 
         let systemGray3LightModeColor = UIColor(red: 199/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1)
         let systemLabelLightModeColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1)
@@ -85,6 +87,7 @@ class AuthenticationManager: Authentication {
                                                                   usernamePasswordInstructions: AuthenticationConstants.usernamePasswordInstructions,
                                                                   continueWithWPButtonTitle: AuthenticationConstants.continueWithWPButtonTitle,
                                                                   enterYourSiteAddressButtonTitle: AuthenticationConstants.enterYourSiteAddressButtonTitle,
+                                                                  signInWithSiteCredentialsButtonTitle: AuthenticationConstants.signInWithSiteCredsButtonTitle,
                                                                   findSiteButtonTitle: AuthenticationConstants.findYourStoreAddressButtonTitle,
                                                                   signupTermsOfService: AuthenticationConstants.signupTermsOfService,
                                                                   whatIsWPComLinkTitle: AuthenticationConstants.whatIsWPComLinkTitle,
@@ -260,6 +263,15 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
     /// Presents the Login Epilogue, in the specified NavigationController.
     ///
     func presentLoginEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, onDismiss: @escaping () -> Void) {
+        let matcher = ULAccountMatcher()
+        matcher.refreshStoredSites()
+
+        /// Jetpack is required. Present an error if we don't detect a valid installation for a self-hosted site.
+        if let urlFromCredentials = credentials.wpcom?.siteURL ?? credentials.wporg?.siteURL,
+           isJetpackValidForSelfHostedSite(url: urlFromCredentials) {
+            return presentJetpackError(for: urlFromCredentials, with: credentials, in: navigationController, onDismiss: onDismiss)
+        }
+
         // We are currently supporting WPCom credentials only
         // Update this when handling store credentials authentication.
         guard let wpcomLogin = credentials.wpcom else {
@@ -270,16 +282,7 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
             ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: [.loginSiteAddressError])
         }
 
-        let matcher = ULAccountMatcher()
-        matcher.refreshStoredSites()
-
         guard matcher.match(originalURL: wpcomLogin.siteURL) else {
-
-            /// Jetpack is required. Present an error if we don't detect a valid installation for a self-hosted site.
-            if isJetpackValidForSelfHostedSite(url: wpcomLogin.siteURL) {
-                return presentJetpackError(for: wpcomLogin.siteURL, with: credentials, in: navigationController, onDismiss: onDismiss)
-            }
-
             DDLogWarn("⚠️ Present account mismatch error for site: \(String(describing: credentials.wpcom?.siteURL))")
             let viewModel = WrongAccountErrorViewModel(siteURL: credentials.wpcom?.siteURL)
             let mismatchAccountUI = ULAccountMismatchViewController(viewModel: viewModel)
@@ -447,6 +450,7 @@ private extension AuthenticationManager {
                              in navigationController: UINavigationController,
                              onDismiss: @escaping () -> Void) {
         let viewModel = JetpackErrorViewModel(siteURL: siteURL, onJetpackSetupCompletion: { [weak self] in
+            self?.currentSelfHostedSite = nil
             self?.presentLoginEpilogue(in: navigationController, for: credentials, onDismiss: onDismiss)
         })
         let installJetpackUI = ULErrorViewController(viewModel: viewModel)

WooCommerce/WooCommerceTests/Authentication/AuthenticationManagerTests.swift

@@ -172,4 +172,22 @@ final class AuthenticationManagerTests: XCTestCase {
         let rootController = navigationController.viewControllers.first
         XCTAssertTrue(rootController is ULErrorViewController)
     }
+
+    func test_it_can_display_jetpack_error_for_org_site_credentials_sign_in() {
+        // Given
+        let manager = AuthenticationManager()
+        let testSite = "http://test.com"
+        let siteInfo = WordPressComSiteInfo(remote: ["isWordPress": true, "hasJetpack": false, "urlAfterRedirects": testSite])
+        let wporgCredentials = WordPressOrgCredentials(username: "cba", password: "password", xmlrpc: "http://test.com/xmlrpc.php", options: [:])
+        let credentials = AuthenticatorCredentials(wpcom: nil, wporg: wporgCredentials)
+        let navigationController = UINavigationController()
+
+        // When
+        manager.shouldPresentUsernamePasswordController(for: siteInfo, onCompletion: { _ in })
+        manager.presentLoginEpilogue(in: navigationController, for: credentials, onDismiss: {})
+
+        // Then
+        let rootController = navigationController.viewControllers.first
+        XCTAssertTrue(rootController is ULErrorViewController)
+    }
 }