[PM-17467] 🍒 Wrapped Credential Exchange related APIs into SUPPORTS_CXP compiler flag (#1295) (#1296)

Author: fedemkr

Bitwarden/Application/SceneDelegate.swift

@@ -73,7 +73,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                 appProcessor.handleAppLinks(incomingURL: incomingURL)
             }
 
-            #if compiler(>=6.0.3)
+            #if SUPPORTS_CXP
 
             if #available(iOS 18.2, *),
                let userActivity = connectionOptions.userActivities.first {
@@ -97,7 +97,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             appProcessor.handleAppLinks(incomingURL: incomingURL)
         }
 
-        #if compiler(>=6.0.3)
+        #if SUPPORTS_CXP
 
         if #available(iOS 18.2, *) {
             Task {
@@ -182,7 +182,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 // MARK: - SceneDelegate 18.2
 
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 
 @available(iOS 18.2, *)
 extension SceneDelegate {

BitwardenShared/Core/Tools/Repositories/ImportCiphersRepository.swift

@@ -68,7 +68,7 @@ extension DefaultImportCiphersRepository: ImportCiphersRepository {
         credentialImportToken: UUID,
         onProgress: @MainActor (Double) -> Void
     ) async throws -> [ImportedCredentialsResult] {
-        #if compiler(>=6.0.3)
+        #if SUPPORTS_CXP
 
         let credentialData = try await credentialManagerFactory.createImportManager().importCredentials(
             token: credentialImportToken

BitwardenShared/Core/Tools/Repositories/ImportCiphersRepositoryTests.swift

@@ -1,4 +1,4 @@
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 import AuthenticationServices
 import XCTest
 

BitwardenShared/Core/Tools/Utilities/CredentialManagerFactory.swift

@@ -18,7 +18,12 @@ protocol CredentialImportManager: AnyObject {
     func importCredentials(token: UUID) async throws -> ASExportedCredentialData
 }
 
-#if compiler(>=6.0.3)
+// MARK: - Helpers
+
+// This section is needed for compiling the project on Xcode version < 16.2
+// and to ease unit testing.
+
+#if SUPPORTS_CXP
 
 @available(iOS 18.2, *)
 extension ASCredentialImportManager: CredentialImportManager {}

BitwardenShared/Core/Tools/Utilities/CredentialManagerFactoryTests.swift

@@ -1,4 +1,4 @@
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 import AuthenticationServices
 #endif
 import XCTest

BitwardenShared/Core/Tools/Utilities/TestHelpers/MockCredentialManagerFactory.swift

@@ -1,4 +1,4 @@
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 import AuthenticationServices
 import BitwardenSdk
 

BitwardenShared/Core/Vault/Services/ExportVaultService.swift

@@ -43,7 +43,7 @@ protocol ExportVaultService: AnyObject {
     ///
     func exportVaultFileContents(format: ExportFileType) async throws -> String
 
-    #if compiler(>=6.0.3)
+    #if SUPPORTS_CXP
     /// Exports the vault creating the `ASImportableAccount` to be used in Credential Exchange Protocol.
     /// - Returns: An `ASImportableAccount`
     @available(iOS 18.2, *)
@@ -196,7 +196,7 @@ class DefultExportVaultService: ExportVaultService {
         )
     }
 
-    #if compiler(>=6.0.3)
+    #if SUPPORTS_CXP
 
     @available(iOS 18.2, *)
     func exportVaultForCXP() async throws -> ASImportableAccount {

BitwardenShared/Core/Vault/Services/ExportVaultServiceTests.swift

@@ -193,7 +193,7 @@ final class ExportVaultServiceTests: BitwardenTestCase { // swiftlint:disable:th
 
     // MARK: Tests
 
-    #if compiler(>=6.0.3)
+    #if SUPPORTS_CXP
 
     /// `exportVaultForCXP()` CXP exporting the vault succeeds.
     func test_exportVaultForCXP_success() async throws {

BitwardenShared/Core/Vault/Services/TestHelpers/ASImportableAccount+Extensions.swift

@@ -1,4 +1,4 @@
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 
 import AuthenticationServices
 

BitwardenShared/Core/Vault/Services/TestHelpers/ASImportableItem+Extensions.swift

@@ -1,4 +1,4 @@
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 import AuthenticationServices
 
 @available(iOS 18.2, *)

BitwardenShared/Core/Vault/Services/TestHelpers/MockExportVaultService.swift

@@ -19,7 +19,7 @@ class MockExportVaultService: ExportVaultService {
         didClearFiles = true
     }
 
-    #if compiler(>=6.0.3)
+    #if SUPPORTS_CXP
     @available(iOS 18.2, *)
     func exportVaultForCXP() async throws -> ASImportableAccount {
         guard let result = try exportVaultForCXPResult.get() as? ASImportableAccount else {
@@ -48,7 +48,7 @@ class MockExportVaultService: ExportVaultService {
 
 protocol ImportableAccountProxy {}
 
-#if compiler(>=6.0.3)
+#if SUPPORTS_CXP
 @available(iOS 18.2, *)
 extension ASImportableAccount: ImportableAccountProxy {}
 #endif

BitwardenShared/UI/Platform/Settings/SettingsCoordinator.swift

@@ -343,7 +343,13 @@ final class SettingsCoordinator: Coordinator, HasStackNavigator { // swiftlint:d
     ///
     @MainActor
     private func showExportVault() async {
-        guard await services.configService.getFeatureFlag(.cxpExportMobile) else {
+        #if SUPPORTS_CXP
+        let cxpEnabled = true
+        #else
+        let cxpEnabled = false
+        #endif
+
+        guard cxpEnabled, await services.configService.getFeatureFlag(.cxpExportMobile) else {
             navigate(to: .exportVaultToFile)
             return
         }

BitwardenShared/UI/Platform/Settings/SettingsCoordinatorTests.swift

@@ -201,6 +201,8 @@ class SettingsCoordinatorTests: BitwardenTestCase { // swiftlint:disable:this ty
         }
         defer { task.cancel() }
 
+        #if SUPPORTS_CXP
+
         try await waitForAsync { [weak self] in
             guard let self else { return true }
             return stackNavigator.actions.last != nil
@@ -209,6 +211,19 @@ class SettingsCoordinatorTests: BitwardenTestCase { // swiftlint:disable:this ty
         let action = try XCTUnwrap(stackNavigator.actions.last)
         XCTAssertEqual(action.type, .pushed)
         XCTAssertTrue(action.view is UIHostingController<ExportSettingsView>)
+
+        #else
+
+        try await waitForAsync { [weak self] in
+            guard let self else { return true }
+            return stackNavigator.actions.last?.view is UINavigationController
+        }
+
+        let navigationController = try XCTUnwrap(stackNavigator.actions.last?.view as? UINavigationController)
+        XCTAssertTrue(stackNavigator.actions.last?.view is UINavigationController)
+        XCTAssertTrue(navigationController.viewControllers.first is UIHostingController<ExportVaultView>)
+
+        #endif
     }
 
     /// `navigate(to:)` with `.exportVaultToFile` presents the export vault to file view.

BitwardenShared/UI/Tools/ImportCXP/ImportCXP/ImportCXPProcessor.swift

@@ -72,7 +72,7 @@ class ImportCXPProcessor: StateProcessor<ImportCXPState, Void, ImportCXPEffect>
 
     /// Starts the import process.
     private func startImport() async {
-        #if compiler(>=6.0.3)
+        #if SUPPORTS_CXP
 
         guard #available(iOS 18.2, *), let credentialImportToken = state.credentialImportToken else {
             coordinator.showAlert(

BitwardenShared/UI/Tools/ImportCXP/ImportCXP/ImportCXPProcessorTests.swift

@@ -290,7 +290,7 @@ class ImportCXPProcessorTests: BitwardenTestCase {
     /// Checks whether the appropriate compiler is being used to have the code available.
     /// - Returns: `true` if the compiler is correct, `false`otherwise.
     private func checkCompiler() throws -> Bool {
-        #if compiler(>=6.0.3)
+        #if SUPPORTS_CXP
         return true
         #else
         throw XCTSkip("CXP Import works only from 6.0.3 compiler.")

Configs/BitwardenSharedTests-Debug.xcconfig

@@ -0,0 +1,4 @@
+#include "./Base-Debug.xcconfig"
+#include? "./Local.xcconfig"
+
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) $(BITWARDEN_FLAGS)

Configs/BitwardenSharedTests-Release.xcconfig

@@ -0,0 +1,4 @@
+#include "./Base-Release.xcconfig"
+#include? "./Local.xcconfig"
+
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) $(BITWARDEN_FLAGS)

project.yml

@@ -418,6 +418,9 @@ targets:
   BitwardenSharedTests:
     type: bundle.unit-test
     platform: iOS
+    configFiles:
+      Debug: Configs/BitwardenSharedTests-Debug.xcconfig
+      Release: Configs/BitwardenSharedTests-Release.xcconfig
     settings:
       base:
         BUNDLE_LOADER: "$(TEST_HOST)"