Merge branch 'trunk' into issue/14004-better-application-password-disabled-note-take-2

Author: pmusolino

.buildkite/pipeline.yml

@@ -44,6 +44,29 @@ steps:
       - github_commit_status:
           context: Unit Tests
 
+  - label: ":microscope: Standalone WordPressAuthenticator Unit Tests"
+    command: |
+      echo "--- :rubygems: Setting up Gems"
+      install_gems
+
+      echo "--- :cocoapods: Setting up Pods"
+      install_cocoapods
+
+      echo "--- :swift: Setting up Swift Packages"
+      install_swiftpm_dependencies
+
+      echo "--- 🧪 Testing"
+      bundle exec fastlane run scan \
+        scheme:WordPressAuthenticator \
+        prelaunch_simulator:true \
+        device:'iPhone 16'
+    plugins: [$CI_TOOLKIT]
+    artifact_paths:
+      - fastlane/test_output/*
+    notify:
+      - github_commit_status:
+          context: WordPressAuthenticator Unit Tests
+
   #################
   # Linters
   #################

.buildkite/release-pipelines/download-release-translations.yml

@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+agents:
+  queue: mac
+
+env:
+  IMAGE_ID: $IMAGE_ID
+
+steps:
+  - label: Download Release Translations
+    plugins: [$CI_TOOLKIT]
+    command: |
+      echo '--- :robot_face: Use bot for Git operations'
+      source use-bot-for-git
+
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
+      echo '--- :closed_lock_with_key: Access Secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :globe_with_meridians: Download Release Translations'
+      bundle exec fastlane download_release_translations skip_confirm:true
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -89,8 +89,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .sendReceiptsForPointOfSale:
             return true
-        case .acceptCashForPointOfSale:
-            return true
         case .hideSitesInStorePicker:
             return true
         case .filterHistoryOnOrderAndProductLists:

Experiments/Experiments/FeatureFlag.swift

@@ -193,10 +193,6 @@ public enum FeatureFlag: Int {
     ///
     case sendReceiptsForPointOfSale
 
-    /// Adds support for  accepting cash as payment for POS
-    ///
-    case acceptCashForPointOfSale
-
     /// Supports hiding sites from the store picker
     ///
     case hideSitesInStorePicker

Fakes/Fakes/Networking.generated.swift

@@ -2219,7 +2219,8 @@ extension Networking.Site {
             visibility: .fake(),
             canBlaze: .fake(),
             isAdmin: .fake(),
-            wasEcommerceTrial: .fake()
+            wasEcommerceTrial: .fake(),
+            hasSSOEnabled: .fake()
         )
     }
 }

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

@@ -3311,7 +3311,8 @@ extension Networking.Site {
         visibility: CopiableProp<SiteVisibility> = .copy,
         canBlaze: CopiableProp<Bool> = .copy,
         isAdmin: CopiableProp<Bool> = .copy,
-        wasEcommerceTrial: CopiableProp<Bool> = .copy
+        wasEcommerceTrial: CopiableProp<Bool> = .copy,
+        hasSSOEnabled: CopiableProp<Bool> = .copy
     ) -> Networking.Site {
         let siteID = siteID ?? self.siteID
         let name = name ?? self.name
@@ -3334,6 +3335,7 @@ extension Networking.Site {
         let canBlaze = canBlaze ?? self.canBlaze
         let isAdmin = isAdmin ?? self.isAdmin
         let wasEcommerceTrial = wasEcommerceTrial ?? self.wasEcommerceTrial
+        let hasSSOEnabled = hasSSOEnabled ?? self.hasSSOEnabled
 
         return Networking.Site(
             siteID: siteID,
@@ -3356,7 +3358,8 @@ extension Networking.Site {
             visibility: visibility,
             canBlaze: canBlaze,
             isAdmin: isAdmin,
-            wasEcommerceTrial: wasEcommerceTrial
+            wasEcommerceTrial: wasEcommerceTrial,
+            hasSSOEnabled: hasSSOEnabled
         )
     }
 }

Networking/Networking/Model/Site.swift

@@ -88,6 +88,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
     ///
     public let wasEcommerceTrial: Bool
 
+    /// Whether Jetpack SSO is enabled for the site
+    ///
+    public let hasSSOEnabled: Bool
+
     /// Decodable Conformance.
     ///
     public init(from decoder: Decoder) throws {
@@ -126,6 +130,11 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
             return activeFeatures.contains { $0 == Constants.aiAssistantFeature }
         }()
 
+        let hasSSOEnabled: Bool = {
+            let jetpackModules = (try? siteContainer.decodeIfPresent([String].self, forKey: SiteKeys.jetpackModules)) ?? []
+            return jetpackModules.contains(OptionKeys.sso.rawValue) == true
+        }()
+
         self.init(siteID: siteID,
                   name: name,
                   description: description,
@@ -146,7 +155,8 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                   visibility: visibility,
                   canBlaze: canBlaze,
                   isAdmin: isAdmin,
-                  wasEcommerceTrial: wasEcommerceTrial)
+                  wasEcommerceTrial: wasEcommerceTrial,
+                  hasSSOEnabled: hasSSOEnabled)
     }
 
     /// Designated Initializer.
@@ -171,7 +181,8 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                 visibility: SiteVisibility,
                 canBlaze: Bool,
                 isAdmin: Bool,
-                wasEcommerceTrial: Bool) {
+                wasEcommerceTrial: Bool,
+                hasSSOEnabled: Bool) {
         self.siteID = siteID
         self.name = name
         self.description = description
@@ -193,6 +204,7 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
         self.canBlaze = canBlaze
         self.isAdmin = isAdmin
         self.wasEcommerceTrial = wasEcommerceTrial
+        self.hasSSOEnabled = hasSSOEnabled
     }
 }
 
@@ -239,6 +251,7 @@ private extension Site {
         case isJetpackThePluginInstalled = "jetpack"
         case isJetpackConnected          = "jetpack_connection"
         case wasEcommerceTrial           = "was_ecommerce_trial"
+        case jetpackModules = "jetpack_modules"
     }
 
     enum PlanInfo: String, CodingKey {
@@ -266,6 +279,7 @@ private extension Site {
         case frameNonce = "frame_nonce"
         case visibility = "blog_public"
         case canBlaze = "can_blaze"
+        case sso = "sso"
     }
 
     enum PlanKeys: String, CodingKey {

Networking/Networking/Model/WordPressSite.swift

@@ -108,7 +108,8 @@ public extension WordPressSite {
               visibility: .publicSite,
               canBlaze: false,
               isAdmin: false,
-              wasEcommerceTrial: false)
+              wasEcommerceTrial: false,
+              hasSSOEnabled: false)
     }
 
     struct Authentication: Decodable {

Networking/Networking/Remote/SiteRemote.swift

@@ -292,7 +292,7 @@ extension SiteRemote {
     enum SiteParameter {
         enum Fields {
             static let key = "fields"
-            static let value = "ID,name,description,URL,options,jetpack,jetpack_connection,capabilities,was_ecommerce_trial,plan"
+            static let value = "ID,name,description,URL,options,jetpack,jetpack_connection,capabilities,was_ecommerce_trial,plan,jetpack_modules"
         }
         enum Options {
             static let key = "options"

Networking/NetworkingTests/Mapper/SiteListMapperTests.swift

@@ -24,6 +24,18 @@ final class SiteListMapperTests: XCTestCase {
         XCTAssertFalse(site.wasEcommerceTrial)
         XCTAssertEqual(site.plan, "business-bundle")
     }
+
+    func test_site_hasSSOEnabled_is_parsed_successfully() throws {
+        // Given
+        let sites = mapLoadSiteListResponse()
+
+        // Then
+        let first = try XCTUnwrap(sites[safe: 0])
+        XCTAssertTrue(first.hasSSOEnabled)
+
+        let second = try XCTUnwrap(sites[safe: 1])
+        XCTAssertFalse(second.hasSSOEnabled)
+    }
 }
 
 private extension SiteListMapperTests {