Merge branch 'trunk' into issue/7855-utm-params-and-analytics-on-JITM-cta

# Conflicts:
#	WooCommerce/Classes/ViewModels/Feature Announcement Cards/JustInTimeMessageAnnouncementCardViewModel.swift

Author: joshheald

Networking/Networking/Remote/AccountRemote.swift

@@ -233,7 +233,7 @@ public enum CreateAccountError: Error, Equatable {
                 self = .invalidEmail
             case Constants.invalidPassword:
                 self = .invalidPassword(message: message)
-            case Constants.invalidUsername:
+            case Constants.invalidUsername, Constants.usernameExists:
                 self = .invalidUsername
             default:
                 self = .unexpected(error: error)
@@ -249,6 +249,7 @@ public enum CreateAccountError: Error, Equatable {
         static let emailExists = "email_exists"
         static let invalidEmail = "email_invalid"
         static let invalidPassword = "password_invalid"
-        static let invalidUsername = "username_exists"
+        static let usernameExists = "username_exists"
+        static let invalidUsername = "username_invalid"
     }
 }

Networking/NetworkingTests/Mapper/WCAnalyticsCustomerMapperTests.swift

@@ -35,7 +35,7 @@ class WCAnalyticsCustomerMapperTests: XCTestCase {
         customers = try! mapper.map(response: data)
 
         // Then
-        XCTAssertEqual(customers.count, 3)
+        XCTAssertEqual(customers.count, 4)
     }
 
     func test_WCAnalyticsCustomer_array_response_values_are_correctly_parsed() {
@@ -50,11 +50,13 @@ class WCAnalyticsCustomerMapperTests: XCTestCase {
         let customers = try! mapper.map(response: data)
 
         // Then
-        XCTAssertEqual(customers[0].userID, 1)
-        XCTAssertEqual(customers[0].name, "John")
-        XCTAssertEqual(customers[1].userID, 2)
-        XCTAssertEqual(customers[1].name, "Paul")
-        XCTAssertEqual(customers[2].userID, 3)
-        XCTAssertEqual(customers[2].name, "John Doe")
+        XCTAssertEqual(customers[0].userID, 0)
+        XCTAssertEqual(customers[0].name, "Matt The Unregistered")
+        XCTAssertEqual(customers[1].userID, 1)
+        XCTAssertEqual(customers[1].name, "John")
+        XCTAssertEqual(customers[2].userID, 2)
+        XCTAssertEqual(customers[2].name, "Paul")
+        XCTAssertEqual(customers[3].userID, 3)
+        XCTAssertEqual(customers[3].name, "John Doe")
     }
 }

Networking/NetworkingTests/Remote/WCAnalyticsCustomerRemoteTests.swift

@@ -45,13 +45,15 @@ class WCAnalyticsCustomerRemoteTests: XCTestCase {
         let customers = try XCTUnwrap(result.get())
         let hasSearchParameter = network.queryParameters?.contains(where: { $0 == "search=John" }) ?? false
         XCTAssertTrue(hasSearchParameter)
-        assertEqual(3, customers.count)
-        assertEqual(1, customers[0].userID)
-        assertEqual(2, customers[1].userID)
-        assertEqual(3, customers[2].userID)
-        assertEqual("John", customers[0].name)
-        assertEqual("Paul", customers[1].name)
-        assertEqual("John Doe", customers[2].name)
+        assertEqual(4, customers.count)
+        assertEqual(0, customers[0].userID)
+        assertEqual(1, customers[1].userID)
+        assertEqual(2, customers[2].userID)
+        assertEqual(3, customers[3].userID)
+        assertEqual("Matt The Unregistered", customers[0].name)
+        assertEqual("John", customers[1].name)
+        assertEqual("Paul", customers[2].name)
+        assertEqual("John Doe", customers[3].name)
     }
 
     func test_WCAnalyticsCustomerRemote_when_calls_retrieveCustomersByName_fails_then_returns_result_isFailure() {

Networking/NetworkingTests/Responses/wc-analytics-customers.json

@@ -1,5 +1,24 @@
 { "data":
     [
+        {
+            "id":0,
+            "user_id":0,
+            "username":"Matt.the.unregistered",
+            "name":"Matt The Unregistered",
+            "email":"[email protected]",
+            "country":"US",
+            "city":"San Francisco",
+            "state":"CA",
+            "postcode":"94103",
+            "date_registered":null,
+            "date_last_active":"2022-07-12T08:36:54",
+            "date_last_order":"2022-07-12 08:36:54",
+            "orders_count":1,
+            "total_spend":10,
+            "avg_order_value":10,
+            "date_registered_gmt":null,
+            "date_last_active_gmt":"2022-07-12T08:36:54"
+        },
         {
             "id":1,
             "user_id":1,

WooCommerce/Classes/Analytics/WooAnalyticsEvent+StoreCreation.swift

@@ -0,0 +1,102 @@
+import enum Yosemite.CreateAccountError
+
+extension WooAnalyticsEvent {
+    enum StoreCreation {
+        /// Event property keys.
+        private enum Key {
+            static let source = "source"
+            static let url = "url"
+            static let errorType = "error_type"
+        }
+
+        /// Tracked when the user taps on the CTA in store picker (logged in to WPCOM) to create a store.
+        static func sitePickerCreateSiteTapped(source: StorePickerSource) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .sitePickerCreateSiteTapped,
+                              properties: [Key.source: source.rawValue])
+        }
+
+        /// Tracked when a site is created from the store creation flow.
+        static func siteCreated(source: Source, siteURL: String) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .siteCreated,
+                              properties: [Key.source: source.rawValue, Key.url: siteURL])
+        }
+
+        /// Tracked when site creation fails.
+        static func siteCreationFailed(source: Source, error: Error) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .siteCreationFailed,
+                              properties: [Key.source: source.rawValue],
+                              error: error)
+        }
+
+        /// Tracked when the user dismisses the store creation flow before the flow is complete.
+        static func siteCreationDismissed(source: Source) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .siteCreationDismissed,
+                              properties: [Key.source: source.rawValue])
+        }
+
+        /// Tracked when the user taps on the CTA in login prologue (logged out) to create a store.
+        static func loginPrologueCreateSiteTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .loginPrologueCreateSiteTapped,
+                              properties: [:])
+        }
+
+        /// Tracked when the user taps on the CTA in the account creation form to log in instead.
+        static func signupFormLoginTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .signupFormLoginTapped,
+                              properties: [:])
+        }
+
+        /// Tracked when the user taps to submit the WPCOM signup form.
+        static func signupSubmitted() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .signupSubmitted,
+                              properties: [:])
+        }
+
+        /// Tracked when WPCOM signup succeeds.
+        static func signupSuccess() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .signupSuccess,
+                              properties: [:])
+        }
+
+        /// Tracked when WPCOM signup fails.
+        static func signupFailed(error: CreateAccountError) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .signupFailed,
+                              properties: [Key.errorType: error.analyticsValue])
+        }
+    }
+}
+
+extension WooAnalyticsEvent.StoreCreation {
+    enum StorePickerSource: String {
+        /// From switching stores.
+        case switchStores = "switching_stores"
+        /// From the login flow.
+        case login
+        /// The store creation flow is originally initiated from login prologue and dismissed,
+        /// which lands on the store picker.
+        case loginPrologue = "prologue"
+        /// Other sources like from any error screens during the login flow.
+        case other
+    }
+
+    enum Source: String {
+        case loginPrologue = "prologue"
+        case storePicker = "store_picker"
+        case loginEmailError = "login_email_error"
+    }
+}
+
+private extension CreateAccountError {
+    var analyticsValue: String {
+        switch self {
+        case .emailExists:
+            return "EMAIL_EXIST"
+        case .invalidEmail:
+            return "EMAIL_INVALID"
+        case .invalidPassword:
+            return "PASSWORD_INVALID"
+        default:
+            return "\(self)"
+        }
+    }
+}

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -1579,11 +1579,6 @@ extension WooAnalyticsEvent {
             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,
@@ -1655,3 +1650,21 @@ extension WooAnalyticsEvent {
         }
     }
 }
+
+// MARK: - Products Onboarding
+//
+extension WooAnalyticsEvent {
+    enum ProductsOnboarding {
+        /// Tracks when a store is eligible for products onboarding
+        ///
+        static func storeIsEligible() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .productsOnboardingEligible, properties: [:])
+        }
+
+        /// Tracks when the call to action is tapped on the products onboarding banner
+        ///
+        static func bannerCTATapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .productsOnboardingCTATapped, properties: [:])
+        }
+    }
+}

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -111,19 +111,33 @@ public enum WooAnalyticsStat: String {
     case dashboardNewStatsRevertedBannerLearnMoreTapped = "dashboard_new_stats_reverted_banner_learn_more_tapped"
     case usedAnalytics = "used_analytics"
 
-    // MARK: Onboarding Events
+    // MARK: Products Onboarding Events
     //
     case productsOnboardingEligible = "products_onboarding_store_is_eligible"
+    case productsOnboardingCTATapped = "products_onboarding_cta_tapped"
 
     // MARK: Site picker. Can be triggered by login epilogue or settings.
     //
     case sitePickerContinueTapped = "site_picker_continue_tapped"
     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"
+    case sitePickerAddStoreTapped = "site_picker_add_a_store_tapped"
+    case sitePickerConnectExistingStoreTapped = "site_picker_connect_existing_store_tapped"
+
+    // MARK: Site creation
+    //
+    case sitePickerCreateSiteTapped = "site_picker_create_site_tapped"
+    case siteCreated = "login_woocommerce_site_created"
+    case siteCreationFailed = "site_creation_failed"
+    case siteCreationDismissed = "site_creation_dismissed"
+    case loginPrologueCreateSiteTapped = "login_prologue_create_site_tapped"
+    case signupFormLoginTapped = "signup_login_button_tapped"
+    case signupSubmitted = "signup_submitted"
+    case signupSuccess = "signup_success"
+    case signupFailed = "signup_failed"
 
     // MARK: Help & Support Events
     //

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -18,6 +18,9 @@ class AuthenticationManager: Authentication {
     ///
     private var storePickerCoordinator: StorePickerCoordinator?
 
+    /// Store creation coordinator in the logged-out state.
+    private var loggedOutStoreCreationCoordinator: LoggedOutStoreCreationCoordinator?
+
     /// Keychain access for SIWA auth token
     ///
     private lazy var keychain = Keychain(service: WooConstants.keychainServiceName)
@@ -543,8 +546,12 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
 
     // Navigate to store creation
     func showSiteCreation(in navigationController: UINavigationController) {
-        // TODO: add tracks
-        // Navigate to store creation
+        ServiceLocator.analytics.track(event: .StoreCreation.loginPrologueCreateSiteTapped())
+
+        let coordinator = LoggedOutStoreCreationCoordinator(source: .prologue,
+                                                            navigationController: navigationController)
+        self.loggedOutStoreCreationCoordinator = coordinator
+        coordinator.start()
     }
 }
 
@@ -628,8 +635,12 @@ private extension AuthenticationManager {
                           onDismiss: @escaping () -> Void = {}) {
         let config: StorePickerConfiguration = {
             switch source {
-            case .custom(let source) where source == StoreCreationCoordinator.Source.prologue.rawValue:
-                return .storeCreationFromLoginPrologue
+            case .custom(let source):
+                if let loggedOutSource = LoggedOutStoreCreationCoordinator.Source(rawValue: source) {
+                    return .storeCreationFromLogin(source: loggedOutSource)
+                } else {
+                    return .login
+                }
             default:
                 return .login
             }

WooCommerce/Classes/Authentication/Epilogue/AccountHeaderView.swift

@@ -37,6 +37,8 @@ class AccountHeaderView: UIView {
     ///
     @IBOutlet private weak var helpButton: UIButton!
 
+    @IBOutlet private var containerView: UIView!
+
     /// Closure to be executed whenever the help button is pressed
     ///
     var onHelpRequested: (() -> Void)?
@@ -46,6 +48,7 @@ class AccountHeaderView: UIView {
     override func awakeFromNib() {
         super.awakeFromNib()
         setupHelpButton()
+        configureContainerView()
     }
 }
 
@@ -98,6 +101,12 @@ extension AccountHeaderView {
 //
 private extension AccountHeaderView {
 
+    func configureContainerView() {
+        containerView.layer.borderWidth = 1
+        containerView.layer.borderColor = UIColor.border.cgColor
+        containerView.layer.cornerRadius = 8
+    }
+
     func setupHelpButton() {
         helpButton.setTitle(Strings.helpButtonTitle, for: .normal)
         helpButton.setTitleColor(.accent, for: .normal)