Merge branch 'trunk' into issue/7850-ios-15

Author: koke

Experiments/Experiments/ABTest.swift

@@ -10,7 +10,7 @@ public enum ABTest: String, CaseIterable {
     /// A/A test for ExPlat integration in the logged in state.
     /// Experiment ref: pbxNRc-1QS-p2
     ///
-    case aaTest202209 = "woocommerceios_explat_aa_test_logged_in_202209"
+    case aaTestLoggedIn202210 = "woocommerceios_explat_aa_test_logged_in_202210"
 
     /// A/A test to make sure there is no bias in the logged out state.
     /// Experiment ref: pbxNRc-1S0-p2
@@ -24,18 +24,34 @@ public enum ABTest: String, CaseIterable {
     public var variation: Variation {
         ExPlat.shared?.experiment(rawValue) ?? .control
     }
+
+    /// Returns the context for the given experiment.
+    ///
+    /// 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:
+            return .loggedIn
+        case .aaTestLoggedOut202209, .loginPrologueButtonOrder:
+            return .loggedOut
+        case .null:
+            return .none
+        }
+    }
 }
 
 public extension ABTest {
-    /// Start the AB Testing platform if any experiment exists
+    /// Start the AB Testing platform if any experiment exists for the provided context
     ///
-    static func start() async {
+    static func start(for context: ExperimentContext) async {
+        let experiments = ABTest.allCases.filter { $0.context == context }
+
         await withCheckedContinuation { continuation in
-            guard ABTest.allCases.count > 1 else {
+            guard !experiments.isEmpty else {
                 return continuation.resume(returning: ())
             }
 
-            let experimentNames = ABTest.allCases.filter { $0 != .null }.map { $0.rawValue }
+            let experimentNames = experiments.map { $0.rawValue }
             ExPlat.shared?.register(experiments: experimentNames)
 
             ExPlat.shared?.refresh {
@@ -56,3 +72,11 @@ public extension Variation {
         }
     }
 }
+
+/// The context for an A/B testing experiment (where the experience being tested occurs).
+///
+public enum ExperimentContext: Equatable {
+    case loggedOut
+    case loggedIn
+    case none // For the `null` experiment case
+}

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -37,6 +37,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .wpcomSignup:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .inAppPurchases:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -77,4 +77,8 @@ public enum FeatureFlag: Int {
     /// Enables signing up for a WP.com account.
     ///
     case wpcomSignup
+
+    /// Enables In-app purchases for buying Hosted WooCommerce plans
+    ///
+    case inAppPurchases
 }

RELEASE-NOTES.txt

@@ -4,7 +4,7 @@
 -----
 - [***] Stats: Now you can add a Today's Stats Widget to your lock screen (iOS 16 only) to monitor your sales. [https://github.com/woocommerce/woocommerce-ios/pull/7839]
 - [***] Dropped iOS 14 support. From now we support iOS 15 and later. [https://github.com/woocommerce/woocommerce-ios/pull/7851]
-
+- [internal] In-Person Payments: add UTM parameters to card reader purchase URLs to allow attribution [https://github.com/woocommerce/woocommerce-ios/pull/7858]
 
 10.7
 -----

WooCommerce/Classes/Analytics/TracksProvider.swift

@@ -73,22 +73,19 @@ private extension TracksProvider {
                 UserDefaults.standard[.analyticsUsername] = account.username
                 tracksService.switchToAuthenticatedUser(withUsername: account.username,
                                                         userID: String(account.userID),
-                                                        anonymousID: anonymousID,
                                                         wpComToken: credentials.authToken,
                                                         skipAliasEventCreation: false)
             } else if currentAnalyticsUsername == account.username {
                 // Username did not change - just make sure Tracks client has it
                 tracksService.switchToAuthenticatedUser(withUsername: account.username,
                                                         userID: String(account.userID),
-                                                        anonymousID: anonymousID,
                                                         wpComToken: credentials.authToken,
                                                         skipAliasEventCreation: true)
             } else {
                 // Username changed for some reason - switch back to anonymous first
                 tracksService.switchToAnonymousUser(withAnonymousID: anonymousID)
                 tracksService.switchToAuthenticatedUser(withUsername: account.username,
                                                         userID: String(account.userID),
-                                                        anonymousID: anonymousID,
                                                         wpComToken: credentials.authToken,
                                                         skipAliasEventCreation: false)
             }

WooCommerce/Classes/AppDelegate.swift

@@ -372,10 +372,11 @@ private extension AppDelegate {
         }
     }
 
-    /// Starts the AB testing platform
+    /// Starts the AB testing platform and fetches test assignments for the current context
     ///
     func startABTesting() async {
-        await ABTest.start()
+        let context: ExperimentContext = ServiceLocator.stores.isAuthenticated ? .loggedIn : .loggedOut
+        await ABTest.start(for: context)
     }
 
     /// Tracks if the application was opened via a widget tap.

WooCommerce/Classes/Authentication/AuthenticatedWebViewController.swift

@@ -128,6 +128,7 @@ private extension AuthenticatedWebViewController {
         guard let url = viewModel.initialURL else {
             return
         }
+
         if let credentials = ServiceLocator.stores.sessionManager.defaultCredentials {
             webView.authenticateForWPComAndRedirect(to: url, credentials: credentials)
         } else {

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -524,7 +524,7 @@ private extension StorePickerViewController {
             return
         }
         Task { @MainActor in
-            await ABTest.start()
+            await ABTest.start(for: .loggedIn)
         }
     }
 }

WooCommerce/Classes/Notifications/PushNotificationsManager.swift

@@ -446,14 +446,19 @@ private extension PushNotificationsManager {
     func handleRemoteNotificationInAllAppStates(_ userInfo: [AnyHashable: Any]) {
         DDLogVerbose("📱 Push Notification Received: \n\(userInfo)\n")
 
-        // Badge: Update
         if let typeString = userInfo.string(forKey: APNSKey.type),
            let type = Note.Kind(rawValue: typeString),
            let siteID = siteID,
            let notificationSiteID = userInfo[APNSKey.siteID] as? Int64 {
+            // Badge: Update
             incrementNotificationCount(siteID: notificationSiteID, type: type, incrementCount: 1) { [weak self] in
                 self?.loadNotificationCountAndUpdateApplicationBadgeNumber(siteID: siteID, type: type, postNotifications: true)
             }
+
+            // Update related product when review notification is received
+            if type == .comment, let productID = userInfo[APNSKey.postID] as? Int64 {
+                updateProduct(productID, siteID: notificationSiteID)
+            }
         }
 
         // Badge: Reset
@@ -483,6 +488,16 @@ private extension PushNotificationsManager {
 
         inactiveNotificationsSubject.send(notification)
     }
+
+    /// Reload related product when review notification is received
+    ///
+    func updateProduct(_ productID: Int64, siteID: Int64) {
+        let action = ProductAction.retrieveProduct(siteID: siteID,
+                                                   productID: productID) { _ in
+            // ResultsController<StorageProduct> will reload the Product List (ProductsViewController)
+        }
+        stores.dispatch(action)
+    }
 }
 
 private extension PushNotificationsManager {
@@ -657,6 +672,7 @@ private enum APNSKey {
     static let identifier = "note_id"
     static let type = "type"
     static let siteID = "blog"
+    static let postID = "post_id"
 }
 
 private enum AnalyticKey {

WooCommerce/Classes/ViewModels/Feature Announcement Cards/FeatureAnnouncementCardViewModel.swift

@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import Yosemite
+import WooFoundation
 
 private typealias FeatureCardEvent = WooAnalyticsEvent.FeatureCard