[PM-26387] Fix lint warnings

.swiftformat

@@ -1,7 +1,7 @@
 # format options
 --indent 4
 --ifdef noindent
---swiftversion 5.8.1
+--swiftversion 6.2
 --header strip
 --funcattributes prev-line
 --typeattributes prev-line

Authenticator/Application/AppDelegate.swift

@@ -30,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     func application(
         _: UIApplication,
-        didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil
+        didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil,
     ) -> Bool {
         // Exit early if testing to avoid running any app functionality.
         guard !isTesting else { return true }
@@ -45,7 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
         let services = ServiceContainer(
             application: UIApplication.shared,
-            errorReporter: errorReporter
+            errorReporter: errorReporter,
         )
         let appModule = DefaultAppModule(services: services)
         appProcessor = AppProcessor(appModule: appModule, services: services)

Authenticator/Application/SceneDelegate.swift

@@ -26,7 +26,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func scene(
         _ scene: UIScene,
         willConnectTo session: UISceneSession,
-        options connectionOptions: UIScene.ConnectionOptions
+        options connectionOptions: UIScene.ConnectionOptions,
     ) {
         guard let windowScene = scene as? UIWindowScene else { return }
         guard let appProcessor else {
@@ -56,7 +56,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             await appProcessor.start(
                 appContext: .mainApp,
                 navigator: rootViewController,
-                window: appWindow
+                window: appWindow,
             )
             hideSplash()
             isStartingUp = false
@@ -84,7 +84,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         window.isHidden = false
         window.rootViewController = UIStoryboard(
             name: "LaunchScreen",
-            bundle: .main
+            bundle: .main,
         ).instantiateInitialViewController()
         window.windowLevel = UIWindow.Level.alert + 1
         return window
@@ -115,7 +115,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     private func addTripleTapGestureRecognizer(to window: UIWindow) {
         let tapGesture = UITapGestureRecognizer(
             target: self,
-            action: #selector(handleTripleTapGesture)
+            action: #selector(handleTripleTapGesture),
         )
         tapGesture.numberOfTapsRequired = 3
         tapGesture.numberOfTouchesRequired = 1

AuthenticatorBridgeKit/AuthenticatorBridgeDataStore.swift

@@ -66,13 +66,13 @@ public class AuthenticatorBridgeDataStore {
     public init(
         errorReporter: ErrorReporter,
         groupIdentifier: String,
-        storeType: AuthenticatorBridgeStoreType = .persisted
+        storeType: AuthenticatorBridgeStoreType = .persisted,
     ) {
         self.errorReporter = errorReporter
 
         persistentContainer = NSPersistentContainer(
             name: authenticatorBridgeModelName,
-            managedObjectModel: Self.managedObjectModel
+            managedObjectModel: Self.managedObjectModel,
         )
         let storeDescription: NSPersistentStoreDescription
         switch storeType {
@@ -105,7 +105,7 @@ public class AuthenticatorBridgeDataStore {
         try await backgroundContext.perform {
             try self.backgroundContext.executeAndMergeChanges(
                 batchDeleteRequest: request,
-                additionalContexts: [self.persistentContainer.viewContext]
+                additionalContexts: [self.persistentContainer.viewContext],
             )
         }
     }
@@ -118,7 +118,7 @@ public class AuthenticatorBridgeDataStore {
         try await backgroundContext.perform {
             try self.backgroundContext.executeAndMergeChanges(
                 batchInsertRequest: request,
-                additionalContexts: [self.persistentContainer.viewContext]
+                additionalContexts: [self.persistentContainer.viewContext],
             )
         }
     }
@@ -132,13 +132,13 @@ public class AuthenticatorBridgeDataStore {
     ///
     public func executeBatchReplace(
         deleteRequest: NSBatchDeleteRequest,
-        insertRequest: NSBatchInsertRequest
+        insertRequest: NSBatchInsertRequest,
     ) async throws {
         try await backgroundContext.perform {
             try self.backgroundContext.executeAndMergeChanges(
                 batchDeleteRequest: deleteRequest,
                 batchInsertRequest: insertRequest,
-                additionalContexts: [self.persistentContainer.viewContext]
+                additionalContexts: [self.persistentContainer.viewContext],
             )
         }
     }

AuthenticatorBridgeKit/AuthenticatorBridgeItemData.swift

@@ -29,7 +29,7 @@ public class AuthenticatorBridgeItemData: NSManagedObject, CodableModelData {
     convenience init(
         context: NSManagedObjectContext,
         userId: String,
-        authenticatorItem: AuthenticatorBridgeItemDataModel
+        authenticatorItem: AuthenticatorBridgeItemDataModel,
     ) throws {
         self.init(context: context)
         id = authenticatorItem.id
@@ -54,7 +54,7 @@ extension AuthenticatorBridgeItemData: ManagedUserObject {
             #keyPath(AuthenticatorBridgeItemData.userId),
             userId,
             #keyPath(AuthenticatorBridgeItemData.id),
-            id
+            id,
         )
     }
 

AuthenticatorBridgeKit/AuthenticatorBridgeItemService.swift

@@ -154,10 +154,10 @@ public class DefaultAuthenticatorBridgeItemService: AuthenticatorBridgeItemServi
 
     public func fetchTemporaryItem() async throws -> AuthenticatorBridgeItemDataView? {
         let decryptedItems = try await fetchAllForUserId(
-            DefaultAuthenticatorBridgeItemService.temporaryUserId
+            DefaultAuthenticatorBridgeItemService.temporaryUserId,
         )
         try await deleteAllForUserId(
-            DefaultAuthenticatorBridgeItemService.temporaryUserId
+            DefaultAuthenticatorBridgeItemService.temporaryUserId,
         )
 
         return decryptedItems.first
@@ -178,14 +178,14 @@ public class DefaultAuthenticatorBridgeItemService: AuthenticatorBridgeItemServi
                             forUserId userId: String) async throws {
         let encryptedItems = try await cryptoService.encryptAuthenticatorItems(items)
         try await dataStore.executeBatchInsert(
-            AuthenticatorBridgeItemData.batchInsertRequest(objects: encryptedItems, userId: userId)
+            AuthenticatorBridgeItemData.batchInsertRequest(objects: encryptedItems, userId: userId),
         )
     }
 
     public func insertTemporaryItem(_ item: AuthenticatorBridgeItemDataView) async throws {
         try await replaceAllItems(
             with: [item],
-            forUserId: DefaultAuthenticatorBridgeItemService.temporaryUserId
+            forUserId: DefaultAuthenticatorBridgeItemService.temporaryUserId,
         )
     }
 
@@ -201,11 +201,11 @@ public class DefaultAuthenticatorBridgeItemService: AuthenticatorBridgeItemServi
         let deleteRequest = AuthenticatorBridgeItemData.deleteByUserIdRequest(userId: userId)
         let insertRequest = try AuthenticatorBridgeItemData.batchInsertRequest(
             objects: encryptedItems,
-            userId: userId
+            userId: userId,
         )
         try await dataStore.executeBatchReplace(
             deleteRequest: deleteRequest,
-            insertRequest: insertRequest
+            insertRequest: insertRequest,
         )
     }
 
@@ -214,13 +214,13 @@ public class DefaultAuthenticatorBridgeItemService: AuthenticatorBridgeItemServi
         try await checkForLogout()
         let fetchRequest = AuthenticatorBridgeItemData.fetchRequest(
             predicate: NSPredicate(
-                format: "userId != %@", DefaultAuthenticatorBridgeItemService.temporaryUserId
-            )
+                format: "userId != %@", DefaultAuthenticatorBridgeItemService.temporaryUserId,
+            ),
         )
         fetchRequest.sortDescriptors = [NSSortDescriptor(keyPath: \AuthenticatorBridgeItemData.userId, ascending: true)]
         return FetchedResultsPublisher(
             context: dataStore.persistentContainer.viewContext,
-            request: fetchRequest
+            request: fetchRequest,
         )
         .map { dataItems in
             dataItems.compactMap(\.model)

AuthenticatorBridgeKit/Mocks/MockSharedTimeoutService.swift

@@ -27,7 +27,7 @@ public final class MockSharedTimeoutService: SharedTimeoutService {
     public func updateTimeout(
         forUserId userId: String,
         lastActiveDate: Date?,
-        timeoutLength: SessionTimeoutValue
+        timeoutLength: SessionTimeoutValue,
     ) async throws {
         if let updateTimeoutError {
             throw updateTimeoutError

AuthenticatorBridgeKit/SharedCryptographyService.swift

@@ -16,7 +16,7 @@ public protocol SharedCryptographyService: AnyObject {
     ///     key is not in the shared repository.
     ///
     func decryptAuthenticatorItems(
-        _ items: [AuthenticatorBridgeItemDataModel]
+        _ items: [AuthenticatorBridgeItemDataModel],
     ) async throws -> [AuthenticatorBridgeItemDataView]
 
     /// Takes an array of `AuthenticatorBridgeItemDataView` with decrypted data and
@@ -28,7 +28,7 @@ public protocol SharedCryptographyService: AnyObject {
     ///     key is not in the shared repository.
     ///
     func encryptAuthenticatorItems(
-        _ items: [AuthenticatorBridgeItemDataView]
+        _ items: [AuthenticatorBridgeItemDataView],
     ) async throws -> [AuthenticatorBridgeItemDataModel]
 }
 
@@ -55,7 +55,7 @@ public class DefaultAuthenticatorCryptographyService: SharedCryptographyService
     // MARK: Methods
 
     public func decryptAuthenticatorItems(
-        _ items: [AuthenticatorBridgeItemDataModel]
+        _ items: [AuthenticatorBridgeItemDataModel],
     ) async throws -> [AuthenticatorBridgeItemDataView] {
         guard !items.isEmpty else { return [] }
 
@@ -70,13 +70,13 @@ public class DefaultAuthenticatorCryptographyService: SharedCryptographyService
                 id: item.id,
                 name: (try? decrypt(item.name, withKey: symmetricKey)) ?? "",
                 totpKey: try? decrypt(item.totpKey, withKey: symmetricKey),
-                username: try? decrypt(item.username, withKey: symmetricKey)
+                username: try? decrypt(item.username, withKey: symmetricKey),
             )
         }
     }
 
     public func encryptAuthenticatorItems(
-        _ items: [AuthenticatorBridgeItemDataView]
+        _ items: [AuthenticatorBridgeItemDataView],
     ) async throws -> [AuthenticatorBridgeItemDataModel] {
         let key = try await sharedKeychainRepository.getAuthenticatorKey()
         let symmetricKey = SymmetricKey(data: key)
@@ -89,7 +89,7 @@ public class DefaultAuthenticatorCryptographyService: SharedCryptographyService
                 id: item.id,
                 name: encrypt(item.name, withKey: symmetricKey) ?? "",
                 totpKey: encrypt(item.totpKey, withKey: symmetricKey),
-                username: encrypt(item.username, withKey: symmetricKey)
+                username: encrypt(item.username, withKey: symmetricKey),
             )
         }
     }
@@ -106,11 +106,11 @@ public class DefaultAuthenticatorCryptographyService: SharedCryptographyService
             return nil
         }
         let encryptedSealedBox = try AES.GCM.SealedBox(
-            combined: data
+            combined: data,
         )
         let decryptedBox = try AES.GCM.open(
             encryptedSealedBox,
-            using: key
+            using: key,
         )
         return String(data: decryptedBox, encoding: .utf8)
     }

AuthenticatorBridgeKit/SharedKeychain/SharedKeychainRepository.swift

@@ -29,7 +29,7 @@ public protocol SharedKeychainRepository {
     /// - Returns: The time the user should be automatically logged out. If `nil`, then the user should not be.
     ///
     func getAccountAutoLogoutTime(
-        userId: String
+        userId: String,
     ) async throws -> Date?
 
     /// Sets when a user account should automatically log out.
@@ -40,7 +40,7 @@ public protocol SharedKeychainRepository {
     ///
     func setAccountAutoLogoutTime(
         _ value: Date?,
-        userId: String
+        userId: String,
     ) async throws
 }
 
@@ -94,7 +94,7 @@ public class DefaultSharedKeychainRepository: SharedKeychainRepository {
     ///
     public func setAccountAutoLogoutTime(
         _ value: Date?,
-        userId: String
+        userId: String,
     ) async throws {
         try await storage.setValue(value, for: .accountAutoLogout(userId: userId))
     }

AuthenticatorBridgeKit/SharedKeychain/SharedKeychainRepositoryTests.swift

@@ -17,7 +17,7 @@ final class SharedKeychainRepositoryTests: BitwardenTestCase {
     override func setUp() {
         storage = MockSharedKeychainStorage()
         subject = DefaultSharedKeychainRepository(
-            storage: storage
+            storage: storage,
         )
     }
 

AuthenticatorBridgeKit/SharedKeychain/SharedKeychainService.swift

@@ -40,7 +40,7 @@ public enum SharedKeychainServiceError: Error, Equatable, CustomNSError {
     public var errorUserInfo: [String: Any] {
         switch self {
         case let .keyNotFound(keychainItem):
-            return ["Keychain Item": keychainItem.unformattedKey]
+            ["Keychain Item": keychainItem.unformattedKey]
         }
     }
 }

AuthenticatorBridgeKit/SharedKeychain/SharedKeychainStorage.swift

@@ -74,7 +74,7 @@ public class DefaultSharedKeychainStorage: SharedKeychainStorage {
     ///   - sharedAppGroupIdentifier: An identifier for the shared access group used by the application.
     public init(
         keychainService: SharedKeychainService,
-        sharedAppGroupIdentifier: String
+        sharedAppGroupIdentifier: String,
     ) {
         self.keychainService = keychainService
         self.sharedAppGroupIdentifier = sharedAppGroupIdentifier
@@ -89,7 +89,7 @@ public class DefaultSharedKeychainStorage: SharedKeychainStorage {
                 kSecAttrAccessGroup: sharedAppGroupIdentifier,
                 kSecAttrAccount: item.unformattedKey,
                 kSecClass: kSecClassGenericPassword,
-            ] as CFDictionary
+            ] as CFDictionary,
         )
     }
 
@@ -103,7 +103,7 @@ public class DefaultSharedKeychainStorage: SharedKeychainStorage {
                 kSecAttrAccessible: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly,
                 kSecAttrAccount: item.unformattedKey,
                 kSecClass: kSecClassGenericPassword,
-            ] as CFDictionary
+            ] as CFDictionary,
         )
 
         guard let resultDictionary = foundItem as? [String: Any],
@@ -128,7 +128,7 @@ public class DefaultSharedKeychainStorage: SharedKeychainStorage {
         try? keychainService.delete(query: query)
 
         try keychainService.add(
-            attributes: query
+            attributes: query,
         )
     }
 }

AuthenticatorBridgeKit/SharedKeychain/SharedKeychainStorageTests.swift

@@ -17,7 +17,7 @@ final class SharedKeychainStorageTests: BitwardenTestCase {
         keychainService = MockSharedKeychainService()
         subject = DefaultSharedKeychainStorage(
             keychainService: keychainService,
-            sharedAppGroupIdentifier: accessGroup
+            sharedAppGroupIdentifier: accessGroup,
         )
     }
 

AuthenticatorBridgeKit/SharedTimeoutService.swift

@@ -47,7 +47,7 @@ public final class DefaultSharedTimeoutService: SharedTimeoutService {
 
     public init(
         sharedKeychainRepository: SharedKeychainRepository,
-        timeProvider: TimeProvider
+        timeProvider: TimeProvider,
     ) {
         self.sharedKeychainRepository = sharedKeychainRepository
         self.timeProvider = timeProvider
@@ -67,7 +67,7 @@ public final class DefaultSharedTimeoutService: SharedTimeoutService {
     public func updateTimeout(
         forUserId userId: String,
         lastActiveDate: Date?,
-        timeoutLength: SessionTimeoutValue
+        timeoutLength: SessionTimeoutValue,
     ) async throws {
         guard let lastActiveDate else {
             try await clearTimeout(forUserId: userId)