Merge branch 'trunk' into issue/8015-add-build-identifiers-to-jitm-request

Author: joshheald

.buildkite/cache-builder.yml

@@ -10,7 +10,10 @@ common_params:
     - automattic/bash-cache#2.8.0
     - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "woocommerce/woocommerce-ios/"
+        # This is not necessarily the actual name of the repo or the GitHub organization
+        # it belongs to. It is the key used in the bucket, which is set based on
+        # the Buildkite pipeline slug
+        repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-14

.buildkite/pipeline.yml

@@ -5,7 +5,10 @@ common_params:
     - automattic/bash-cache#2.8.0
     - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "woocommerce/woocommerce-ios/"
+        # This is not necessarily the actual name of the repo or the GitHub organization
+        # it belongs to. It is the key used in the bucket, which is set based on
+        # the Buildkite pipeline slug
+        repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-14

.buildkite/release-builds.yml

@@ -7,7 +7,10 @@ common_params:
     - automattic/bash-cache#2.8.0
     - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "woocommerce/woocommerce-ios/"
+        # This is not necessarily the actual name of the repo or the GitHub organization
+        # it belongs to. It is the key used in the bucket, which is set based on
+        # the Buildkite pipeline slug
+        repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-14

Experiments/Experiments/ABTest.swift

@@ -16,6 +16,15 @@ public enum ABTest: String, CaseIterable {
     /// Experiment ref: pbxNRc-1S0-p2
     case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
 
+    /// A/B test to measure the sign-in success rate when only WPCom login is enabled.
+    /// Experiment ref: pbxNRc-27s-p2
+    ///
+    case abTestLoginWithWPComOnly = "woocommerceios_login_wpcom_only"
+
+    /// A/B test for the Products Onboarding banner on the My Store dashboard.
+    /// Experiment ref: pbxNRc-26F-p2
+    case productsOnboardingBanner = "woocommerceios_products_onboarding_first_product_banner"
+
     /// Returns a variation for the given experiment
     public var variation: Variation {
         ExPlat.shared?.experiment(rawValue) ?? .control
@@ -26,9 +35,9 @@ public enum ABTest: String, CaseIterable {
     /// When adding a new experiment, add it to the appropriate case depending on its context (logged-in or logged-out experience).
     public var context: ExperimentContext {
         switch self {
-        case .aaTestLoggedIn202210:
+        case .aaTestLoggedIn202210, .productsOnboardingBanner:
             return .loggedIn
-        case .aaTestLoggedOut:
+        case .aaTestLoggedOut, .abTestLoginWithWPComOnly:
             return .loggedOut
         case .null:
             return .none

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -18,7 +18,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .newToWooCommerceLinkInLoginPrologue:
-            return true
+            return false
         case .loginPrologueOnboarding:
             return true
         case .loginErrorNotifications:
@@ -33,20 +33,12 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .searchProductsBySKU:
             return true
-        case .orderCreationSearchCustomers:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .wpcomSignup:
-            guard isFeatureFlagEnabled(.simplifiedLoginFlowI1) else {
-                return buildConfig == .localDeveloper || buildConfig == .alpha
-            }
-            // To disable automatically sending signup link for unknown email IDs
             return false
         case .inAppPurchases:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .storeCreationMVP:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .simplifiedLoginFlowI1:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .justInTimeMessagesOnDashboard:
             return true
         case .productsOnboarding:

Experiments/Experiments/FeatureFlag.swift

@@ -70,10 +70,6 @@ public enum FeatureFlag: Int {
     ///
     case searchProductsBySKU
 
-    /// Enables the Search Customers functionality in the Order Creation screen
-    ///
-    case orderCreationSearchCustomers
-
     /// Enables signing up for a WP.com account.
     ///
     case wpcomSignup
@@ -86,11 +82,6 @@ public enum FeatureFlag: Int {
     ///
     case storeCreationMVP
 
-    /// Temporary feature flag for the simplified login flow.
-    /// TODO: replace with A/B testing.
-    ///
-    case simplifiedLoginFlowI1
-
     /// Just In Time Messages on Dashboard
     ///
     case justInTimeMessagesOnDashboard

Fakes/Fakes/Networking.generated.swift

@@ -1514,7 +1514,7 @@ extension Networking.Site {
             isJetpackThePluginInstalled: .fake(),
             isJetpackConnected: .fake(),
             isWooCommerceActive: .fake(),
-            isWordPressStore: .fake(),
+            isWordPressComStore: .fake(),
             jetpackConnectionActivePlugins: .fake(),
             timezone: .fake(),
             gmtOffset: .fake()

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -1789,7 +1789,7 @@ extension Networking.Site {
         isJetpackThePluginInstalled: CopiableProp<Bool> = .copy,
         isJetpackConnected: CopiableProp<Bool> = .copy,
         isWooCommerceActive: CopiableProp<Bool> = .copy,
-        isWordPressStore: CopiableProp<Bool> = .copy,
+        isWordPressComStore: CopiableProp<Bool> = .copy,
         jetpackConnectionActivePlugins: CopiableProp<[String]> = .copy,
         timezone: CopiableProp<String> = .copy,
         gmtOffset: CopiableProp<Double> = .copy
@@ -1804,7 +1804,7 @@ extension Networking.Site {
         let isJetpackThePluginInstalled = isJetpackThePluginInstalled ?? self.isJetpackThePluginInstalled
         let isJetpackConnected = isJetpackConnected ?? self.isJetpackConnected
         let isWooCommerceActive = isWooCommerceActive ?? self.isWooCommerceActive
-        let isWordPressStore = isWordPressStore ?? self.isWordPressStore
+        let isWordPressComStore = isWordPressComStore ?? self.isWordPressComStore
         let jetpackConnectionActivePlugins = jetpackConnectionActivePlugins ?? self.jetpackConnectionActivePlugins
         let timezone = timezone ?? self.timezone
         let gmtOffset = gmtOffset ?? self.gmtOffset
@@ -1820,7 +1820,7 @@ extension Networking.Site {
             isJetpackThePluginInstalled: isJetpackThePluginInstalled,
             isJetpackConnected: isJetpackConnected,
             isWooCommerceActive: isWooCommerceActive,
-            isWordPressStore: isWordPressStore,
+            isWordPressComStore: isWordPressComStore,
             jetpackConnectionActivePlugins: jetpackConnectionActivePlugins,
             timezone: timezone,
             gmtOffset: gmtOffset

Networking/Networking/Model/Site.swift

@@ -45,9 +45,9 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
     ///
     public let isWooCommerceActive: Bool
 
-    /// Indicates if this site hosts a WordPress Store.
+    /// Indicates if this site is hosted on WordPress.com.
     ///
-    public let isWordPressStore: Bool
+    public let isWordPressComStore: Bool
 
     /// For Jetpack CP sites (connected to Jetpack with Jetpack Connection Package instead of Jetpack-the-plugin), this property contains
     /// a list of active plugins with Jetpack Connection Package (e.g. WooCommerce Payments, Jetpack Backup).
@@ -75,7 +75,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
         let isJetpackConnected = try siteContainer.decode(Bool.self, forKey: .isJetpackConnected)
 
         let optionsContainer = try siteContainer.nestedContainer(keyedBy: OptionKeys.self, forKey: .options)
-        let isWordPressStore = try optionsContainer.decode(Bool.self, forKey: .isWordPressStore)
+        let isWordPressComStore = try optionsContainer.decode(Bool.self, forKey: .isWordPressComStore)
         let isWooCommerceActive = try optionsContainer.decode(Bool.self, forKey: .isWooCommerceActive)
         let jetpackConnectionActivePlugins = try optionsContainer.decodeIfPresent([String].self, forKey: .jetpackConnectionActivePlugins) ?? []
         let timezone = try optionsContainer.decode(String.self, forKey: .timezone)
@@ -93,7 +93,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
                   isJetpackThePluginInstalled: isJetpackThePluginInstalled,
                   isJetpackConnected: isJetpackConnected,
                   isWooCommerceActive: isWooCommerceActive,
-                  isWordPressStore: isWordPressStore,
+                  isWordPressComStore: isWordPressComStore,
                   jetpackConnectionActivePlugins: jetpackConnectionActivePlugins,
                   timezone: timezone,
                   gmtOffset: gmtOffset)
@@ -111,7 +111,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
                 isJetpackThePluginInstalled: Bool,
                 isJetpackConnected: Bool,
                 isWooCommerceActive: Bool,
-                isWordPressStore: Bool,
+                isWordPressComStore: Bool,
                 jetpackConnectionActivePlugins: [String],
                 timezone: String,
                 gmtOffset: Double) {
@@ -124,7 +124,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
         self.plan = plan
         self.isJetpackThePluginInstalled = isJetpackThePluginInstalled
         self.isJetpackConnected = isJetpackConnected
-        self.isWordPressStore = isWordPressStore
+        self.isWordPressComStore = isWordPressComStore
         self.isWooCommerceActive = isWooCommerceActive
         self.jetpackConnectionActivePlugins = jetpackConnectionActivePlugins
         self.timezone = timezone
@@ -156,7 +156,7 @@ private extension Site {
     }
 
     enum OptionKeys: String, CodingKey {
-        case isWordPressStore = "is_wpcom_store"
+        case isWordPressComStore = "is_wpcom_store"
         case isWooCommerceActive = "woocommerce_is_active"
         case timezone = "timezone"
         case gmtOffset = "gmt_offset"

Networking/Networking/Settings/Settings.swift

@@ -10,6 +10,8 @@ public struct Settings {
     public static var wordpressApiBaseURL: String = {
         if ProcessInfo.processInfo.arguments.contains("mocked-wpcom-api") {
             return "http://localhost:8282/"
+        } else if let wpComApiBaseURL = ProcessInfo.processInfo.environment["wpcom-api-base-url"] {
+            return wpComApiBaseURL
         }
 
         return "https://public-api.wordpress.com/"