[PM-16445] Renamed most uses of CXP acronym to CXF

BitwardenShared/Core/Platform/Services/API/Extensions/JSONDecoder+Bitwarden.swift

@@ -53,13 +53,13 @@ extension JSONDecoder {
         return decoder
     }()
 
-    /// A `JSONDecoder` instance that handles decoding JSON from CXP format to Apple's expected format.
-    static let cxpDecoder: JSONDecoder = {
+    /// A `JSONDecoder` instance that handles decoding JSON from Credential Exchange format to Apple's expected format.
+    static let cxfDecoder: JSONDecoder = {
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .custom { keys in
             let key = keys.last!.stringValue
             let camelCaseKey = keyToCamelCase(key: key)
-            return AnyKey(stringValue: customTransformCodingKeyForCXP(key: camelCaseKey))
+            return AnyKey(stringValue: customTransformCodingKeyForCXF(key: camelCaseKey))
         }
         decoder.dateDecodingStrategy = .secondsSince1970
         return decoder
@@ -84,8 +84,9 @@ extension JSONDecoder {
 
     // MARK: Private Static Functions
 
-    /// Transforms the keys from CXP format handled by the Bitwarden SDK into the keys that Apple expects.
-    private static func customTransformCodingKeyForCXP(key: String) -> String {
+    /// Transforms the keys from Credential Exchange format handled by the Bitwarden SDK
+    /// into the keys that Apple expects.
+    private static func customTransformCodingKeyForCXF(key: String) -> String {
         return switch key {
         case "credentialId":
             "credentialID"

BitwardenShared/Core/Platform/Services/API/Extensions/JSONDecoderBitwardenTests.swift

@@ -5,9 +5,9 @@ import XCTest
 class JSONDecoderBitwardenTests: BitwardenTestCase {
     // MARK: Tests
 
-    /// `JSONDecoder.cxpDecoder` can decode Credential Exchange Format.
-    func test_cxpDecoder_decodesISO8601DateWithFractionalSeconds() {
-        let subject = JSONDecoder.cxpDecoder
+    /// `JSONDecoder.cxfDecoder` can decode Credential Exchange Format.
+    func test_cxfDecoder_decodesISO8601DateWithFractionalSeconds() {
+        let subject = JSONDecoder.cxfDecoder
         let toDecode = #"{"credentialId":"credential","date":1697790414,"otherKey":"other","rpId":"rp"}"#
 
         struct JSONBody: Codable, Equatable {

BitwardenShared/Core/Platform/Services/API/Extensions/JSONEncoder+Bitwarden.swift

@@ -17,23 +17,24 @@ extension JSONEncoder {
     }()
 
     /// The default `JSONEncoder` used to encode JSON payloads when in Credential Exchange flow.
-    static let cxpEncoder: JSONEncoder = {
+    static let cxfEncoder: JSONEncoder = {
         let jsonEncoder = JSONEncoder()
         jsonEncoder.dateEncodingStrategy = .custom { date, encoder in
             var container = encoder.singleValueContainer()
             try container.encode(Int(date.timeIntervalSince1970))
         }
         jsonEncoder.keyEncodingStrategy = .custom { keys in
             let key = keys.last!.stringValue
-            return AnyKey(stringValue: customTransformCodingKeyForCXP(key: key))
+            return AnyKey(stringValue: customTransformCodingKeyForCXF(key: key))
         }
         return jsonEncoder
     }()
 
     // MARK: Static Functions
 
-    /// Transforms the keys from CXP format handled by the Bitwarden SDK into the keys that Apple expects.
-    static func customTransformCodingKeyForCXP(key: String) -> String {
+    /// Transforms the keys from Credential Exchange format handled by the Bitwarden SDK
+    /// into the keys that Apple expects.
+    static func customTransformCodingKeyForCXF(key: String) -> String {
         return switch key {
         case "credentialID":
             "credentialId"

BitwardenShared/Core/Platform/Services/API/Extensions/JSONEncoderBitwardenTests.swift

@@ -5,9 +5,9 @@ import XCTest
 class JSONEncoderBitwardenTests: BitwardenTestCase {
     // MARK: Tests
 
-    /// `JSONEncoder.cxpEncoder` encodes for Credential Exchange Format.
+    /// `JSONEncoder.cxfEncoder` encodes for Credential Exchange Format.
     func test_cxfpEncoder_encodesISO8601DateWithFractionalSeconds() throws {
-        let subject = JSONEncoder.cxpEncoder
+        let subject = JSONEncoder.cxfEncoder
         subject.outputFormatting = .sortedKeys // added for test consistency so output is ordered.
 
         struct JSONBody: Codable {

BitwardenShared/Core/Tools/Repositories/ExportCXFCiphersRepository.swift

@@ -127,7 +127,7 @@
             name: account.profile.name
         )
         let serializedCXF = try await clientService.exporters().exportCxf(account: sdkAccount, ciphers: ciphers)
-        return try JSONDecoder.cxpDecoder.decode(ASImportableAccount.self, from: Data(serializedCXF.utf8))
+        return try JSONDecoder.cxfDecoder.decode(ASImportableAccount.self, from: Data(serializedCXF.utf8))
     }
 
     #endif

BitwardenShared/Core/Tools/Repositories/ImportCiphersRepository.swift

@@ -84,7 +84,7 @@
             throw ImportCiphersRepositoryError.noDataFound
         }
 
-        let accountJsonData = try JSONEncoder.cxpEncoder.encode(accountData)
+        let accountJsonData = try JSONEncoder.cxfEncoder.encode(accountData)
         guard let accountJsonString = String(data: accountJsonData, encoding: .utf8) else {
             // this should never happen.
             throw ImportCiphersRepositoryError.dataEncodingFailed

BitwardenShared/Core/Tools/Repositories/ImportCiphersRepositoryTests.swift

@@ -246,7 +246,7 @@ class ImportCiphersRepositoryTests: BitwardenTestCase {
 
     @available(iOS 18.2, *)
     private func getASExportedCredentialDataAsJson(data: ASExportedCredentialData) throws -> String {
-        let credentialData = try JSONEncoder.cxpEncoder.encode(data)
+        let credentialData = try JSONEncoder.cxfEncoder.encode(data)
         guard let credentialDataJsonString = String(data: credentialData, encoding: .utf8) else {
             throw BitwardenError.dataError("Failed to encode ASExportedCredentialData")
         }

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

@@ -25,15 +25,15 @@ class MockCredentialExportManager: CredentialExportManager {
     /// A JSON encoded `String` is used as the value instead of the actual object
     /// to avoid crashing on simulators older than iOS 18.2 because of not finding the symbol
     /// thus resulting in bad access error when running the test suite.
-    /// Use `JSONDecoder.cxpDecoder.decode` to decode data for this.
+    /// Use `JSONDecoder.cxfDecoder.decode` to decode data for this.
     var exportCredentialsJSONData: String?
     var exportCredentialsError: Error?
 
     @available(iOS 18.2, *)
     func exportCredentials(_ credentialData: ASExportedCredentialData) async throws {
         exportCredentialsCalled = true
 
-        let data = try JSONEncoder.cxpEncoder.encode(credentialData)
+        let data = try JSONEncoder.cxfEncoder.encode(credentialData)
         guard let dataJsonString = String(data: data, encoding: .utf8) else {
             // this should never happen.
             throw BitwardenError.dataError("Failed encoding credential data")
@@ -51,15 +51,15 @@ class MockCredentialImportManager: CredentialImportManager {
     /// A JSON encoded `String` is used as the value instead of the actual object
     /// to avoid crashing on simulators older than iOS 18.2 because of not finding the symbol
     /// thus resulting in bad access error when running the test suite.
-    /// Use `JSONEncoder.cxpEncoder.encode` to encode data for this.
+    /// Use `JSONEncoder.cxfEncoder.encode` to encode data for this.
     var importCredentialsResult: Result<String, Error> = .failure(BitwardenTestError.example)
 
     @available(iOS 18.2, *)
     func importCredentials(token: UUID) async throws -> ASExportedCredentialData {
         guard let data = try importCredentialsResult.get().data(using: .utf8) else {
             throw BitwardenError.dataError("importCredentialsResult data not set or not in UTF8")
         }
-        return try JSONDecoder.cxpDecoder.decode(
+        return try JSONDecoder.cxfDecoder.decode(
             ASExportedCredentialData.self,
             from: data
         )

BitwardenShared/UI/Platform/Application/AppProcessor.swift

@@ -213,7 +213,7 @@
     /// - Parameter credentialImportToken: The credentials import token to user with the `ASCredentialImportManager`.
     @available(iOSApplicationExtension 18.2, *)
     public func handleImportCredentials(credentialImportToken: UUID) async {
-        let route = AppRoute.tab(.vault(.importCXP(
+        let route = AppRoute.tab(.vault(.importCXF(
             .importCredentials(credentialImportToken: credentialImportToken)
         )))
         await checkIfLockedAndPerformNavigation(route: route)

BitwardenShared/UI/Platform/Application/Support/Localizations/en.lproj/Localizable.strings

@@ -1071,7 +1071,7 @@
 "FailedToAutofillItem" = "Failed to autofill item %1$@";
 "ExportingFailed" = "Exporting failed";
 "YouMayNeedToEnableDevicePasscodeOrBiometrics" = "You may need to enable device passcode or biometrics.";
-"StartImportCXPDescriptionLong" = "Import passwords, passkeys, credit cards, and any personal identity information from another password manager.\n\nYour data will **not** be deleted from your previous provider.";
+"StartImportCXFDescriptionLong" = "Import passwords, passkeys, credit cards, and any personal identity information from another password manager.\n\nYour data will **not** be deleted from your previous provider.";
 "ImportPasswords" = "Import passwords";
 "ImportingEllipsis" = "Importing...";
 "AreYouSureYouWantToCancelTheImportProcessQuestionMark" = "Are you sure you want to cancel the import process?";

BitwardenShared/UI/Platform/Application/Views/PageHeaderViewTests.swift

@@ -36,7 +36,7 @@ class PageHeaderViewTests: BitwardenTestCase {
             image: Asset.Images.plus24,
             style: .largeTextTintedIcon,
             title: Localizations.importPasswords,
-            message: Localizations.startImportCXPDescriptionLong
+            message: Localizations.startImportCXFDescriptionLong
         )
         assertSnapshots(
             of: subject,

BitwardenShared/UI/Tools/ExportCXF/ExportCXF/ExportCXFView.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-// MARK: - ImportCXPView
+// MARK: - ExportCXFView
 
 /// A view to export credentials in the Credential Exchange flow.
 ///

BitwardenShared/UI/Tools/ExportCXF/ExportCXFCoordinator.swift

@@ -52,12 +52,12 @@ class ExportCXFCoordinator: Coordinator, HasStackNavigator {
     }
 
     func start() {
-        showExportCXP()
+        showExportCXF()
     }
 
     // MARK: Private Methods
 
-    private func showExportCXP() {
+    private func showExportCXF() {
         let processor = ExportCXFProcessor(
             coordinator: asAnyCoordinator(),
             delegate: self,

BitwardenShared/UI/Tools/ExportCXF/ExportCXFCoordinatorTests.swift

@@ -63,7 +63,7 @@ class ExportCXFCoordinatorTests: BitwardenTestCase {
 
     /// `start()` shows the Credential Exchange export view.
     @MainActor
-    func test_start_showsExportCXP() {
+    func test_start_showsExportCXF() {
         subject.start()
 
         XCTAssertTrue(stackNavigator.actions.last?.view is ExportCXFView)

BitwardenShared/UI/Tools/ImportCXP/ImportCXP/ImportCXPEffect.swift → BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFEffect.swift

@@ -1,10 +1,10 @@
 import Foundation
 
-// MARK: - ImportCXPEffect
+// MARK: - ImportCXFEffect
 
-/// Effects that can be processed by a `ImportCXPProcessor`.
+/// Effects that can be processed by a `ImportCXFProcessor`.
 ///
-enum ImportCXPEffect: Equatable {
+enum ImportCXFEffect: Equatable {
     /// The view appeared.
     case appeared
 

BitwardenShared/UI/Tools/ImportCXP/ImportCXP/ImportCXPProcessor.swift → BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFProcessor.swift

@@ -1,11 +1,11 @@
 import AuthenticationServices
 import BitwardenSdk
 
-// MARK: - ImportCXPProcessor
+// MARK: - ImportCXFProcessor
 
 /// The processor used to manage state and handle actions/effects for the Credential Exchange import screen.
 ///
-class ImportCXPProcessor: StateProcessor<ImportCXPState, Void, ImportCXPEffect> {
+class ImportCXFProcessor: StateProcessor<ImportCXFState, Void, ImportCXFEffect> {
     // MARK: Types
 
     typealias Services = HasConfigService
@@ -16,24 +16,24 @@ class ImportCXPProcessor: StateProcessor<ImportCXPState, Void, ImportCXPEffect>
     // MARK: Private Properties
 
     /// The coordinator that handles navigation.
-    private let coordinator: AnyCoordinator<ImportCXPRoute, Void>
+    private let coordinator: AnyCoordinator<ImportCXFRoute, Void>
 
     /// The services used by this processor.
     private let services: Services
 
     // MARK: Initialization
 
-    /// Creates a new `ImportCXPProcessor`.
+    /// Creates a new `ImportCXFProcessor`.
     ///
     /// - Parameters:
     ///   - coordinator: The coordinator that handles navigation.
     ///   - services: The services used by the processor.
     ///   - state: The initial state of the processor.
     ///
     init(
-        coordinator: AnyCoordinator<ImportCXPRoute, Void>,
+        coordinator: AnyCoordinator<ImportCXFRoute, Void>,
         services: Services,
-        state: ImportCXPState
+        state: ImportCXFState
     ) {
         self.coordinator = coordinator
         self.services = services
@@ -42,7 +42,7 @@ class ImportCXPProcessor: StateProcessor<ImportCXPState, Void, ImportCXPEffect>
 
     // MARK: Methods
 
-    override func perform(_ effect: ImportCXPEffect) async {
+    override func perform(_ effect: ImportCXFEffect) async {
         switch effect {
         case .appeared:
             await checkEnabled()
@@ -62,7 +62,7 @@ class ImportCXPProcessor: StateProcessor<ImportCXPState, Void, ImportCXPEffect>
 
     // MARK: Private
 
-    /// Checks whether the CXP import feature is enabled.
+    /// Checks whether the CXF import feature is enabled.
     private func checkEnabled() async {
         guard #available(iOS 18.2, *), await services.configService.getFeatureFlag(.cxpImportMobile) else {
             state.status = .failure(message: Localizations.importingFromAnotherProviderIsNotAvailableForThisDevice)
@@ -115,7 +115,7 @@ class ImportCXPProcessor: StateProcessor<ImportCXPState, Void, ImportCXPEffect>
             return
         }
 
-        coordinator.showAlert(.confirmCancelCXPImport { [weak self] in
+        coordinator.showAlert(.confirmCancelCXFImport { [weak self] in
             guard let self else { return }
             coordinator.navigate(to: .dismiss)
         })

BitwardenShared/UI/Tools/ImportCXP/ImportCXP/ImportCXPProcessorTests.swift → BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFProcessorTests.swift

@@ -2,31 +2,31 @@ import XCTest
 
 @testable import BitwardenShared
 
-// MARK: - ImportCXPProcessorTests
+// MARK: - ImportCXFProcessorTests
 
-class ImportCXPProcessorTests: BitwardenTestCase {
+class ImportCXFProcessorTests: BitwardenTestCase {
     // MARK: Properties
 
     var configService: MockConfigService!
-    var coordinator: MockCoordinator<ImportCXPRoute, Void>!
+    var coordinator: MockCoordinator<ImportCXFRoute, Void>!
     var errorReporter: MockErrorReporter!
     var importCiphersRepository: MockImportCiphersRepository!
-    var state: ImportCXPState!
+    var state: ImportCXFState!
     var stateService: MockStateService!
-    var subject: ImportCXPProcessor!
+    var subject: ImportCXFProcessor!
 
     // MARK: Setup & Teardown
 
     override func setUp() {
         super.setUp()
 
         configService = MockConfigService()
-        coordinator = MockCoordinator<ImportCXPRoute, Void>()
+        coordinator = MockCoordinator<ImportCXFRoute, Void>()
         errorReporter = MockErrorReporter()
         importCiphersRepository = MockImportCiphersRepository()
-        state = ImportCXPState()
+        state = ImportCXFState()
         stateService = MockStateService()
-        subject = ImportCXPProcessor(
+        subject = ImportCXFProcessor(
             coordinator: coordinator.asAnyCoordinator(),
             services: ServiceContainer.withMocks(
                 configService: configService,
@@ -297,7 +297,7 @@ class ImportCXPProcessorTests: BitwardenTestCase {
         #endif
     }
 
-    /// Checks whether the alert is shown when not in the correct iOS version for CXP Import to work.
+    /// Checks whether the alert is shown when not in the correct iOS version for CXF Import to work.
     @MainActor
     private func checkAlertShownWhenNotInCorrectIOSVersion() -> Bool {
         guard #available(iOS 18.2, *) else {

BitwardenShared/UI/Tools/ImportCXP/ImportCXP/ImportCXPState.swift → BitwardenShared/UI/Tools/ImportCXF/ImportCXF/ImportCXFState.swift

@@ -1,14 +1,14 @@
 import Foundation
 
-// MARK: - ImportCXPState
+// MARK: - ImportCXFState
 
-/// The state used to present the `ImportCXPView`.
+/// The state used to present the `ImportCXFView`.
 ///
-struct ImportCXPState: Equatable, Sendable {
+struct ImportCXFState: Equatable, Sendable {
     // MARK: Types
 
     /// The status of the import process.
-    enum ImportCXPStatus: Equatable, Sendable {
+    enum ImportCXFStatus: Equatable, Sendable {
         /// The import flow is at the start point.
         case start
 
@@ -27,7 +27,7 @@ struct ImportCXPState: Equatable, Sendable {
     /// The token used in `ASCredentialImportManager` to get the credentials to import.
     var credentialImportToken: UUID?
 
-    /// Whether the CXP import feature is available.
+    /// Whether the Credential Exchange import feature is available.
     var isFeatureUnvailable: Bool = false
 
     /// The title of the main button.
@@ -60,7 +60,7 @@ struct ImportCXPState: Equatable, Sendable {
     var message: String {
         return switch status {
         case .start:
-            Localizations.startImportCXPDescriptionLong
+            Localizations.startImportCXFDescriptionLong
         case .importing:
             ""
         case let .success(total, _):
@@ -103,5 +103,5 @@ struct ImportCXPState: Equatable, Sendable {
     }
 
     /// The current status of the import process.
-    var status: ImportCXPStatus = .start
+    var status: ImportCXFStatus = .start
 }