Fix LCP localization fallback and add Keychain clear API (#722)

Author: mickael-menu

BuildTools/Package.resolved

@@ -11,7 +11,7 @@ let package = Package(
     name: "BuildTools",
     platforms: [.macOS(.v10_11)],
     dependencies: [
-        .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.51.6"),
+        .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.59.1"),
     ],
     targets: [.target(name: "BuildTools", path: "")]
 )

BuildTools/Package.swift

@@ -1,6 +1,6 @@
 // swift-tools-version:5.10
 //
-//  Copyright 2025 Readium Foundation. All rights reserved.
+//  Copyright 2026 Readium Foundation. All rights reserved.
 //  Use of this source code is governed by the BSD-style license
 //  available in the top-level LICENSE file of the project.
 //

Package.swift

@@ -33,19 +33,17 @@ public class LCPSQLitePassphraseRepository: LCPPassphraseRepository, Loggable {
     public func passphrase(for licenseID: LicenseDocument.ID) async throws -> LCPPassphraseHash? {
         try logAndRethrow {
             try db.prepare(transactions.select(passphrase)
-                .filter(self.licenseId == licenseID)
-            )
-            .compactMap { try $0.get(passphrase) }
-            .first
+                .filter(self.licenseId == licenseID))
+                .compactMap { try $0.get(passphrase) }
+                .first
         }
     }
 
     public func passphrasesMatching(userID: User.ID?, provider: LicenseDocument.Provider) async throws -> [LCPPassphraseHash] {
         try logAndRethrow {
             try db.prepare(transactions.select(passphrase)
-                .filter(self.userId == userID && self.provider == provider)
-            )
-            .compactMap { try $0.get(passphrase) }
+                .filter(self.userId == userID && self.provider == provider))
+                .compactMap { try $0.get(passphrase) }
         }
     }
 

Sources/Adapters/LCPSQLite/SQLiteLCPPassphraseRepository.swift

@@ -48,7 +48,7 @@ public final class Keychain: Sendable {
     /// - Parameters:
     ///   - data: The data to save.
     ///   - key: The account identifier.
-    public func save(data: Data, forKey key: String) throws (KeychainError) {
+    public func save(data: Data, forKey key: String) throws(KeychainError) {
         var query = baseQuery(forKey: key, forAdding: true)
         query[kSecValueData as String] = data
 
@@ -63,7 +63,7 @@ public final class Keychain: Sendable {
     ///
     /// - Parameter key: The account identifier.
     /// - Returns: The data if found, or `nil` if no item exists with this key.
-    public func load(forKey key: String) throws (KeychainError) -> Data? {
+    public func load(forKey key: String) throws(KeychainError) -> Data? {
         var query = baseQuery(forKey: key, forAdding: false)
         query[kSecReturnData as String] = true
         query[kSecMatchLimit as String] = kSecMatchLimitOne
@@ -91,7 +91,7 @@ public final class Keychain: Sendable {
     /// - Parameters:
     ///   - data: The new data to save.
     ///   - key: The account identifier.
-    public func update(data: Data, forKey key: String) throws (KeychainError) {
+    public func update(data: Data, forKey key: String) throws(KeychainError) {
         let query = baseQuery(forKey: key, forAdding: false)
         let attributesToUpdate: [String: Any] = [
             kSecValueData as String: data,
@@ -107,7 +107,7 @@ public final class Keychain: Sendable {
     /// Deletes an item from the Keychain for the specified key.
     ///
     /// - Parameter key: The account identifier.
-    public func delete(forKey key: String) throws (KeychainError) {
+    public func delete(forKey key: String) throws(KeychainError) {
         let query = baseQuery(forKey: key, forAdding: false)
         let status = SecItemDelete(query as CFDictionary)
 
@@ -118,7 +118,7 @@ public final class Keychain: Sendable {
     }
 
     /// Deletes all items for this service from the Keychain.
-    public func deleteAll() throws (KeychainError) {
+    public func deleteAll() throws(KeychainError) {
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: serviceName,
@@ -134,7 +134,7 @@ public final class Keychain: Sendable {
     /// Returns all account identifiers (keys) stored for this service.
     ///
     /// - Returns: An array of account identifiers.
-    public func allKeys() throws (KeychainError) -> [String] {
+    public func allKeys() throws(KeychainError) -> [String] {
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: serviceName,
@@ -165,7 +165,7 @@ public final class Keychain: Sendable {
     ///
     /// - Returns: A dictionary where keys are account identifiers and values are
     ///   the stored data.
-    public func allItems() throws (KeychainError) -> [String: Data] {
+    public func allItems() throws(KeychainError) -> [String: Data] {
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: serviceName,

Sources/Internal/Keychain.swift

@@ -41,9 +41,13 @@ public struct UTI {
         self.init(type: type)
     }
 
-    public var name: String? { type.localizedDescription }
+    public var name: String? {
+        type.localizedDescription
+    }
 
-    public var string: String { type.identifier }
+    public var string: String {
+        type.identifier
+    }
 
     /// Returns the preferred tag for this `UTI`, with the given type `tagClass`.
     public func preferredTag(withClass tagClass: TagClass) -> String? {

Sources/Internal/UTI.swift

@@ -68,8 +68,4 @@ public struct LCPAuthenticatedLicense {
 
     /// License Document being opened.
     public let document: LicenseDocument
-
-    init(document: LicenseDocument) {
-        self.document = document
-    }
 }

Sources/LCP/Authentications/LCPAuthenticating.swift

@@ -58,7 +58,9 @@ public struct LCPDialog: View {
         }
     }
 
-    public var id: LCPDialog { self }
+    public var id: LCPDialog {
+        self
+    }
 
     private let hint: String?
     private let errorMessage: ErrorMessage?
@@ -137,7 +139,7 @@ public struct LCPDialog: View {
         .navigationViewStyle(.stack)
     }
 
-    @ViewBuilder private var header: some View {
+    private var header: some View {
         Section {
             HStack {
                 Spacer()
@@ -168,7 +170,7 @@ public struct LCPDialog: View {
         .font(.callout)
     }
 
-    @ViewBuilder private var input: some View {
+    private var input: some View {
         Section {
             VStack(alignment: .leading, spacing: 8) {
                 TextField(text: $passphrase) {

Sources/LCP/Authentications/LCPDialog.swift

@@ -56,7 +56,6 @@ final class LCPContentProtection: ContentProtection, Loggable {
         return await asset.resource.readAsLCPL()
             .mapError { .reading($0) }
             .asyncFlatMap { licenseDocument in
-
                 await assetRetriever.retrieve(link: licenseDocument.publicationLink)
                     .flatMap { publicationAsset in
                         switch publicationAsset {

Sources/LCP/Content Protection/LCPContentProtection.swift

@@ -81,50 +81,50 @@ public enum StatusError: Error {
 
 /// Errors while renewing a loan.
 public enum RenewError: Error {
-    // Your publication could not be renewed properly.
+    /// Your publication could not be renewed properly.
     case renewFailed
-    // Incorrect renewal period, your publication could not be renewed.
+    /// Incorrect renewal period, your publication could not be renewed.
     case invalidRenewalPeriod(maxRenewDate: Date?)
-    // An unexpected error has occurred on the licensing server.
+    /// An unexpected error has occurred on the licensing server.
     case unexpectedServerError(HTTPError)
 }
 
 /// Errors while returning a loan.
 public enum ReturnError: Error {
-    // Your publication could not be returned properly.
+    /// Your publication could not be returned properly.
     case returnFailed
-    // Your publication has already been returned before or is expired.
+    /// Your publication has already been returned before or is expired.
     case alreadyReturnedOrExpired
-    // An unexpected error has occurred on the licensing server.
+    /// An unexpected error has occurred on the licensing server.
     case unexpectedServerError(HTTPError)
 }
 
 /// Errors while parsing the License or Status JSON Documents.
 public enum ParsingError: Error {
-    // The JSON is malformed and can't be parsed.
+    /// The JSON is malformed and can't be parsed.
     case malformedJSON
-    // The JSON is not representing a valid License Document.
+    /// The JSON is not representing a valid License Document.
     case licenseDocument
-    // The JSON is not representing a valid Status Document.
+    /// The JSON is not representing a valid Status Document.
     case statusDocument
-    // Invalid Link.
+    /// Invalid Link.
     case link
-    // Invalid Encryption.
+    /// Invalid Encryption.
     case encryption
-    // Invalid License Document Signature.
+    /// Invalid License Document Signature.
     case signature
-    // Invalid URL for link with rel %@.
+    /// Invalid URL for link with rel %@.
     case url(rel: String)
 }
 
 /// Errors while reading or writing a LCP container (LCPL, EPUB, LCPDF, etc.)
 public enum ContainerError: Error {
-    // Can't access the container, it's format is wrong.
+    /// Can't access the container, it's format is wrong.
     case openFailed(Error?)
-    // The file at given relative path is not found in the Container.
+    /// The file at given relative path is not found in the Container.
     case fileNotFound(String)
-    // Can't read the file at given relative path in the Container.
+    /// Can't read the file at given relative path in the Container.
     case readFailed(path: String)
-    // Can't write the file at given relative path in the Container.
+    /// Can't write the file at given relative path in the Container.
     case writeFailed(path: String)
 }