Merge pull request #7484 from woocommerce/issue/7468-no-stores-site-discovery

itsmeichigo · web-flow · commit d00bd6019176 · 2022-08-18T22:01:15.000+07:00
Login: Site discovery on the empty store picker
diff --git a/Podfile b/Podfile
@@ -42,8 +42,8 @@ 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.2.1-beta.2'
-  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  pod 'WordPressAuthenticator', '~> 2.2.1-beta.3'
+  #   pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '7cdd0c6e44fb1f5356a974cdd6a05c3d2d5210f6'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 
diff --git a/Podfile.lock b/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.2.1-beta.2):
+  - WordPressAuthenticator (2.2.1-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.2.1-beta.2)
+  - WordPressAuthenticator (~> 2.2.1-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: 5695f2f517df46414456195914eccfe2a6be4b1b
+  WordPressAuthenticator: 40d028b26ceeb093620d3748198f142f4e416e65
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: a9489557183401ff27ecf7a8b78378f0e3363892
+PODFILE CHECKSUM: 2f80965199751d9b642db8d680aa08c11547a548
 
 COCOAPODS: 1.11.2
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,11 +2,11 @@
 
 10.0
 -----
-
 - [**] In-Person Payments and Simple Payments have been moved to a new Payments section [https://github.com/woocommerce/woocommerce-ios/pull/7473]
 - [*] Login: on the WP.com password screen, the magic link login option is moved from below "Reset your password" to below the primary Continue button for higher visibility. [https://github.com/woocommerce/woocommerce-ios/pull/7469]
 - [*] Login: some minor enhancements are made to the error screen after entering an invalid WP.com email - a new "What is WordPress.com?" link, hiding the "Log in with store address" button when it's from the store address login flow, and some copy changes. [https://github.com/woocommerce/woocommerce-ios/pull/7485]
 - [**] In-Person Payments: Accounts with pending requirements are no longer blocked from taking payments - we have added a skip button to the relevant screen. [https://github.com/woocommerce/woocommerce-ios/pull/7504]
+- [*] Login: New button added to the empty site picker screen to enter a site address for troubleshooting. [https://github.com/woocommerce/woocommerce-ios/pull/7484]
 
 9.9
 -----
diff --git a/WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift b/WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift
@@ -1398,3 +1398,34 @@ extension WooAnalyticsEvent {
         }
     }
 }
+
+// MARK: - Site picker
+//
+extension WooAnalyticsEvent {
+    enum SitePicker {
+
+        enum Key: String {
+            case hasWordPress = "has_wordpress"
+            case isWPCom = "is_wpcom"
+            case hasValidJetpack = "has_valid_jetpack"
+        }
+
+        /// Tracks when the user taps the Enter Your Store Address button
+        static func enterStoreAddressTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .sitePickerEnterStoreAddressTapped, properties: [:])
+        }
+
+        /// Tracks when the result for site discovery is returned
+        static func siteDiscovery(hasWordPress: Bool, isWPCom: Bool, hasValidJetpack: Bool) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .sitePickerSiteDiscovery, properties: [Key.hasWordPress.rawValue: hasWordPress,
+                                                                               Key.isWPCom.rawValue: isWPCom,
+                                                                               Key.hasValidJetpack.rawValue: hasValidJetpack])
+        }
+
+        /// Tracks when the user taps the New To WooCommerce button
+        ///
+        static func newToWooTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .sitePickerNewToWooTapped, properties: [:])
+        }
+    }
+}
diff --git a/WooCommerce/Classes/Analytics/WooAnalyticsStat.swift b/WooCommerce/Classes/Analytics/WooAnalyticsStat.swift
@@ -115,6 +115,9 @@ public enum WooAnalyticsStat: String {
     case sitePickerStoresShown = "site_picker_stores_shown"
     case sitePickerHelpButtonTapped = "site_picker_help_button_tapped"
     case sitePickerNonWooSiteTapped = "site_picker_non_woo_site_tapped"
+    case sitePickerEnterStoreAddressTapped = "site_picker_enter_store_address_tapped"
+    case sitePickerSiteDiscovery = "site_picker_site_discovery"
+    case sitePickerNewToWooTapped = "site_picker_new_to_woo_tapped"
 
     // MARK: Help & Support Events
     //
diff --git a/WooCommerce/Classes/Authentication/AuthenticationManager.swift b/WooCommerce/Classes/Authentication/AuthenticationManager.swift
@@ -192,23 +192,16 @@ class AuthenticationManager: Authentication {
         /// Account mismatched case
         guard matcher.match(originalURL: siteURL) else {
             DDLogWarn("⚠️ Present account mismatch error for site: \(String(describing: siteURL))")
-            let viewModel = WrongAccountErrorViewModel(siteURL: siteURL, showsConnectedStores: matcher.hasConnectedStores)
-            let mismatchAccountUI = ULAccountMismatchViewController(viewModel: viewModel)
-            return mismatchAccountUI
+            return accountMismatchUI(for: siteURL, with: matcher)
         }
 
         /// No Woo found
         if let matchedSite = matcher.matchedSite(originalURL: siteURL),
            matchedSite.isWooCommerceActive == false {
-            let viewModel = NoWooErrorViewModel(
-                site: matchedSite,
-                showsConnectedStores: matcher.hasConnectedStores,
-                onSetupCompletion: { [weak self] siteID in
-                    guard let self = self else { return }
-                    self.startStorePicker(with: siteID, in: navigationController, onDismiss: onStorePickerDismiss)
-            })
-            let noWooUI = ULErrorViewController(viewModel: viewModel)
-            return noWooUI
+            return noWooUI(for: matchedSite,
+                           with: matcher,
+                           navigationController: navigationController,
+                           onStorePickerDismiss: onStorePickerDismiss)
         }
 
         // All good!
@@ -289,10 +282,7 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
 
         /// WordPress must be present.
         guard let site = siteInfo, site.isWP else {
-            let viewModel = NotWPErrorViewModel()
-            let notWPErrorUI = ULErrorViewController(viewModel: viewModel)
-
-            let authenticationResult: WordPressAuthenticatorResult = .injectViewController(value: notWPErrorUI)
+            let authenticationResult: WordPressAuthenticatorResult = .injectViewController(value: noWPUI)
 
             onCompletion(authenticationResult)
 
@@ -319,6 +309,23 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
         onCompletion(authenticationResult)
     }
 
+    /// Displays appropriate error based on the input `siteInfo`.
+    /// Data flow following ZwYqDGHdenvYZoPHXZ1SOf-fi
+    ///
+    func troubleshootSite(_ siteInfo: WordPressComSiteInfo?, in navigationController: UINavigationController?) {
+        ServiceLocator.analytics.track(event: .SitePicker.siteDiscovery(hasWordPress: siteInfo?.isWP ?? false,
+                                                                        isWPCom: siteInfo?.isWPCom ?? false,
+                                                                        hasValidJetpack: siteInfo?.hasValidJetpack ?? false))
+
+        guard let site = siteInfo, let navigationController = navigationController else {
+            navigationController?.show(noWPUI, sender: nil)
+            return
+        }
+
+        let errorUI = errorUI(for: site, in: navigationController)
+        navigationController.show(errorUI, sender: nil)
+    }
+
     /// Presents the Login Epilogue, in the specified NavigationController.
     ///
     func presentLoginEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, onDismiss: @escaping () -> Void) {
@@ -507,6 +514,8 @@ private extension AuthenticationManager {
         return false
     }
 
+    /// Presents an error if the user tries to log in to a site without Jetpack.
+    ///
     func presentJetpackError(for siteURL: String,
                              with credentials: AuthenticatorCredentials,
                              in navigationController: UINavigationController,
@@ -542,6 +551,92 @@ private extension AuthenticationManager {
             storePickerCoordinator?.start()
         }
     }
+
+    /// The error screen to be displayed when the user enters a site
+    /// without Jetpack in the site discovery flow
+    ///
+    func jetpackErrorUI(for siteURL: String, with matcher: ULAccountMatcher, in navigationController: UINavigationController) -> UIViewController {
+        let viewModel = JetpackErrorViewModel(siteURL: siteURL, onJetpackSetupCompletion: { [weak self] authorizedEmailAddress in
+            guard let self = self else { return }
+
+            // Tries re-syncing to get an updated store list
+            ServiceLocator.stores.synchronizeEntities { [weak self] in
+                guard let self = self else { return }
+                matcher.refreshStoredSites()
+                guard let matchedSite = matcher.matchedSite(originalURL: siteURL) else {
+                    DDLogWarn("⚠️ Could not find \(siteURL) connected to the account")
+                    return
+                }
+                // checks if the site has woo
+                if matchedSite.isWooCommerceActive == false {
+                    let noWooUI = self.noWooUI(for: matchedSite,
+                                               with: matcher,
+                                               navigationController: navigationController,
+                                               onStorePickerDismiss: {})
+                    navigationController.show(noWooUI, sender: nil)
+                } else {
+                    self.startStorePicker(with: matchedSite.siteID, in: navigationController, onDismiss: {})
+                }
+            }
+        })
+        return ULErrorViewController(viewModel: viewModel)
+    }
+
+    /// The error screen to be displayed when the user tries to enter a site
+    /// whose Jetpack is not associated with their account.
+    ///
+    func accountMismatchUI(for siteURL: String, with matcher: ULAccountMatcher) -> UIViewController {
+        let viewModel = WrongAccountErrorViewModel(siteURL: siteURL, showsConnectedStores: matcher.hasConnectedStores)
+        let mismatchAccountUI = ULAccountMismatchViewController(viewModel: viewModel)
+        return mismatchAccountUI
+    }
+
+    /// The error screen to be displayed when the user tries to enter a site without WooCommerce.
+    ///
+    func noWooUI(for site: Site,
+                 with matcher: ULAccountMatcher,
+                 navigationController: UINavigationController,
+                 onStorePickerDismiss: @escaping () -> Void) -> UIViewController {
+        let viewModel = NoWooErrorViewModel(
+            site: site,
+            showsConnectedStores: matcher.hasConnectedStores,
+            onSetupCompletion: { [weak self] siteID in
+                guard let self = self else { return }
+                self.startStorePicker(with: siteID, in: navigationController, onDismiss: onStorePickerDismiss)
+        })
+        let noWooUI = ULErrorViewController(viewModel: viewModel)
+        return noWooUI
+    }
+
+    /// The error screen to be displayed when the user tries to enter a site without WordPress.
+    ///
+    var noWPUI: UIViewController {
+        let viewModel = NotWPErrorViewModel()
+        return ULErrorViewController(viewModel: viewModel)
+    }
+
+    /// Appropriate error to display for a site when entered from the site discovery flow.
+    ///
+    func errorUI(for site: WordPressComSiteInfo, in navigationController: UINavigationController) -> UIViewController {
+        guard site.isWP else {
+            return noWPUI
+        }
+
+        let matcher = ULAccountMatcher(storageManager: storageManager)
+        matcher.refreshStoredSites()
+
+        guard !site.isWPCom else {
+            // The site doesn't belong to the current account since it was not included in the site picker.
+            return accountMismatchUI(for: site.url, with: matcher)
+        }
+
+        /// Jetpack is required. Present an error if we don't detect a valid installation.
+        guard site.hasValidJetpack == true else {
+            return jetpackErrorUI(for: site.url, with: matcher, in: navigationController)
+        }
+
+        return accountMismatchUI(for: site.url, with: matcher)
+    }
 }
 
 // MARK: - ViewModel Factory
diff --git a/WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.swift b/WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.swift
@@ -6,8 +6,6 @@ import UIKit
 ///
 final class EmptyStoresTableViewCell: UITableViewCell {
 
-    var onJetpackSetupButtonTapped: (() -> Void)?
-
     var onCloseAccountButtonTapped: (() -> Void)?
 
     /// LegendLabel: To be displayed below the ImageView.
@@ -22,7 +20,6 @@ final class EmptyStoresTableViewCell: UITableViewCell {
 
     @IBOutlet private weak var stackView: UIStackView!
     @IBOutlet private weak var emptyStoresImageView: UIImageView!
-    @IBOutlet private weak var actionButton: UIButton!
     @IBOutlet private weak var removeAppleIDAccessButton: UIButton!
 
     override func awakeFromNib() {
@@ -31,7 +28,6 @@ final class EmptyStoresTableViewCell: UITableViewCell {
         configureBackground()
         configureStackView()
         configureImageView()
-        configureActionButton()
         configureRemoveAppleIDAccessButton()
         updateRemoveAppleIDAccessButtonVisibility(isVisible: false)
     }
@@ -56,14 +52,6 @@ private extension EmptyStoresTableViewCell {
         emptyStoresImageView.contentMode = .scaleAspectFit
     }
 
-    func configureActionButton() {
-        actionButton.applyPrimaryButtonStyle()
-        actionButton.setTitle(Localization.actionTitle, for: .normal)
-        actionButton.on(.touchUpInside) { [weak self] _ in
-            self?.onJetpackSetupButtonTapped?()
-        }
-    }
-
     func configureRemoveAppleIDAccessButton() {
         removeAppleIDAccessButton.applyLinkButtonStyle()
         removeAppleIDAccessButton.setTitle(Localization.closeAccountTitle, for: .normal)
@@ -75,14 +63,12 @@ private extension EmptyStoresTableViewCell {
 
 private extension EmptyStoresTableViewCell {
     enum Localization {
-        static let actionTitle = NSLocalizedString("Connect your store with Jetpack",
-                                                   comment: "Link on the store picker when there are no stores available. Opens a webview about Jetpack setup.")
         static let closeAccountTitle = NSLocalizedString(
             "Close Account",
             comment: "Link on the store picker for users who signed in with Apple to close their WordPress.com account."
         )
         static let legend =
-            NSLocalizedString("If you already have a store, you’ll need to install the free Jetpack plugin and connect it to your WordPress.com account.",
+            NSLocalizedString("We couldn't find a WooCommerce store connected to your account.",
                               comment: "Displayed during the Login flow, whenever the user has no woo stores associated.")
     }
 }
diff --git a/WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.xib b/WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21179.7" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21169.4"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,20 +20,16 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="222"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="woo-no-store" translatesAutoresizingMaskIntoConstraints="NO" id="uuh-xp-DA5">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="140.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="152"/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bPV-bJ-GBz">
-                                <rect key="frame" x="0.0" y="140.5" width="375" height="20.5"/>
+                                <rect key="frame" x="0.0" y="152" width="375" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vE6-Wu-Y7b">
-                                <rect key="frame" x="0.0" y="161" width="375" height="30"/>
-                                <state key="normal" title="Button"/>
-                            </button>
                             <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF9-r3-Vq9" userLabel="Remove Apple ID Access Button">
-                                <rect key="frame" x="0.0" y="191" width="375" height="31"/>
+                                <rect key="frame" x="0.0" y="172.5" width="375" height="49.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
@@ -50,7 +46,6 @@
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
-                <outlet property="actionButton" destination="vE6-Wu-Y7b" id="ecz-oF-tox"/>
                 <outlet property="emptyStoresImageView" destination="uuh-xp-DA5" id="4yf-Rz-3c2"/>
                 <outlet property="legendLabel" destination="bPV-bJ-GBz" id="sQX-ir-ghQ"/>
                 <outlet property="removeAppleIDAccessButton" destination="XF9-r3-Vq9" id="sLP-Jl-0hK"/>
diff --git a/WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift b/WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift
diff --git a/WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.xib b/WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.xib
diff --git a/WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackSetupWebViewModel.swift b/WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackSetupWebViewModel.swift
diff --git a/WooCommerce/WooCommerceTests/Authentication/AuthenticationManagerTests.swift b/WooCommerce/WooCommerceTests/Authentication/AuthenticationManagerTests.swift
