Merge branch 'trunk' into merge/10.9-final-into-trunk

Author: spencertransier

Experiments/Experiments/ABTest.swift

@@ -14,11 +14,7 @@ public enum ABTest: String, CaseIterable {
 
     /// A/A test to make sure there is no bias in the logged out state.
     /// Experiment ref: pbxNRc-1S0-p2
-    case aaTestLoggedOut202209 = "woocommerceios_explat_aa_test_logged_out_202209"
-
-    /// A/B test for the login button order on the prologues screen.
-    /// Experiment ref: pbxNRc-1VA-p2
-    case loginPrologueButtonOrder = "woocommerceios_login_prologue_button_order_202209"
+    case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
 
     /// Returns a variation for the given experiment
     public var variation: Variation {
@@ -32,7 +28,7 @@ public enum ABTest: String, CaseIterable {
         switch self {
         case .aaTestLoggedIn202210:
             return .loggedIn
-        case .aaTestLoggedOut202209, .loginPrologueButtonOrder:
+        case .aaTestLoggedOut:
             return .loggedOut
         case .null:
             return .none

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -36,11 +36,19 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .orderCreationSearchCustomers:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .wpcomSignup:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            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
+        case .productsOnboarding:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -85,4 +85,13 @@ public enum FeatureFlag: Int {
     /// Store creation MVP.
     ///
     case storeCreationMVP
+
+    /// Temporary feature flag for the simplified login flow.
+    /// TODO: replace with A/B testing.
+    ///
+    case simplifiedLoginFlowI1
+
+    /// Hides products onboarding development.
+    ///
+    case productsOnboarding
 }

Fakes/Fakes/Networking.generated.swift

@@ -261,6 +261,40 @@ extension JetpackUser {
         )
     }
 }
+extension JustInTimeMessage {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> JustInTimeMessage {
+        .init(
+            siteID: .fake(),
+            messageID: .fake(),
+            featureClass: .fake(),
+            ttl: .fake(),
+            content: .fake(),
+            cta: .fake()
+        )
+    }
+}
+extension JustInTimeMessage.CTA {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> JustInTimeMessage.CTA {
+        .init(
+            message: .fake(),
+            link: .fake()
+        )
+    }
+}
+extension JustInTimeMessage.Content {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> JustInTimeMessage.Content {
+        .init(
+            message: .fake(),
+            description: .fake()
+        )
+    }
+}
 extension Leaderboard {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -1475,6 +1509,7 @@ extension Site {
             description: .fake(),
             url: .fake(),
             adminURL: .fake(),
+            loginURL: .fake(),
             plan: .fake(),
             isJetpackThePluginInstalled: .fake(),
             isJetpackConnected: .fake(),

Fakes/Fakes/Yosemite.generated.swift

@@ -16,3 +16,18 @@ extension ProductReviewFromNoteParcel {
         )
     }
 }
+extension YosemiteJustInTimeMessage {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> YosemiteJustInTimeMessage {
+        .init(
+            siteID: .fake(),
+            messageID: .fake(),
+            featureClass: .fake(),
+            title: .fake(),
+            detail: .fake(),
+            buttonTitle: .fake(),
+            url: .fake()
+        )
+    }
+}

Networking/Networking.xcodeproj/project.pbxproj

@@ -0,0 +1,32 @@
+import Foundation
+
+/// Mapper: Just In Time Message
+///
+struct JustInTimeMessageListMapper: Mapper {
+
+    /// Site we're parsing `JustInTimeMessage`s for
+    /// We're injecting this field by copying it in after parsing response, because `siteID` is not returned in any of the JITM endpoints.
+    ///
+    let siteID: Int64
+
+    /// (Attempts) to convert an array into a Just In Time Message.
+    ///
+    func map(response: Data) throws -> [JustInTimeMessage] {
+        let decoder = JSONDecoder()
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+        return try decoder.decode(JustInTimeMessageListEnvelope.self, from: response).data
+    }
+}
+
+/// JustInTimeMessageEnvelope Disposable Entity:
+/// This entity allows us to parse JustInTimeMessage with JSONDecoder.
+///
+private struct JustInTimeMessageListEnvelope: Decodable {
+    let data: [JustInTimeMessage]
+
+    private enum CodingKeys: String, CodingKey {
+        case data
+    }
+}

Networking/Networking/Mapper/JustInTimeMessageListMapper.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+/// Mapper: Product IDs
+///
+struct ProductIDMapper: Mapper {
+
+    /// (Attempts) to convert an instance of Data into an array of Product IDs
+    ///
+    func map(response: Data) throws -> [Int64] {
+        let decoder = JSONDecoder()
+
+        return try decoder.decode(ProductIDEnvelope.self, from: response).productIDs.compactMap { $0["id"] }
+    }
+}
+
+
+/// ProductIDEnvelope Disposable Entity:
+/// `Products` endpoint returns if a product exists. This entity
+/// allows us to parse the product IDs with JSONDecoder.
+///
+private struct ProductIDEnvelope: Decodable {
+    let productIDs: [[String: Int64]]
+
+    private enum CodingKeys: String, CodingKey {
+        case productIDs = "data"
+    }
+}

Networking/Networking/Mapper/ProductIDMapper.swift

@@ -313,6 +313,63 @@ extension JetpackUser {
     }
 }
 
+extension JustInTimeMessage {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        messageID: CopiableProp<String> = .copy,
+        featureClass: CopiableProp<String> = .copy,
+        ttl: CopiableProp<Int64> = .copy,
+        content: CopiableProp<JustInTimeMessage.Content> = .copy,
+        cta: CopiableProp<JustInTimeMessage.CTA> = .copy
+    ) -> JustInTimeMessage {
+        let siteID = siteID ?? self.siteID
+        let messageID = messageID ?? self.messageID
+        let featureClass = featureClass ?? self.featureClass
+        let ttl = ttl ?? self.ttl
+        let content = content ?? self.content
+        let cta = cta ?? self.cta
+
+        return JustInTimeMessage(
+            siteID: siteID,
+            messageID: messageID,
+            featureClass: featureClass,
+            ttl: ttl,
+            content: content,
+            cta: cta
+        )
+    }
+}
+
+extension JustInTimeMessage.CTA {
+    public func copy(
+        message: CopiableProp<String> = .copy,
+        link: CopiableProp<String> = .copy
+    ) -> JustInTimeMessage.CTA {
+        let message = message ?? self.message
+        let link = link ?? self.link
+
+        return JustInTimeMessage.CTA(
+            message: message,
+            link: link
+        )
+    }
+}
+
+extension JustInTimeMessage.Content {
+    public func copy(
+        message: CopiableProp<String> = .copy,
+        description: CopiableProp<String> = .copy
+    ) -> JustInTimeMessage.Content {
+        let message = message ?? self.message
+        let description = description ?? self.description
+
+        return JustInTimeMessage.Content(
+            message: message,
+            description: description
+        )
+    }
+}
+
 extension Media {
     public func copy(
         mediaID: CopiableProp<Int64> = .copy,
@@ -1727,6 +1784,7 @@ extension Site {
         description: CopiableProp<String> = .copy,
         url: CopiableProp<String> = .copy,
         adminURL: CopiableProp<String> = .copy,
+        loginURL: CopiableProp<String> = .copy,
         plan: CopiableProp<String> = .copy,
         isJetpackThePluginInstalled: CopiableProp<Bool> = .copy,
         isJetpackConnected: CopiableProp<Bool> = .copy,
@@ -1741,6 +1799,7 @@ extension Site {
         let description = description ?? self.description
         let url = url ?? self.url
         let adminURL = adminURL ?? self.adminURL
+        let loginURL = loginURL ?? self.loginURL
         let plan = plan ?? self.plan
         let isJetpackThePluginInstalled = isJetpackThePluginInstalled ?? self.isJetpackThePluginInstalled
         let isJetpackConnected = isJetpackConnected ?? self.isJetpackConnected
@@ -1756,6 +1815,7 @@ extension Site {
             description: description,
             url: url,
             adminURL: adminURL,
+            loginURL: loginURL,
             plan: plan,
             isJetpackThePluginInstalled: isJetpackThePluginInstalled,
             isJetpackConnected: isJetpackConnected,