Fix swift 6 compile errors

Author: NovaDev404

Sources/prostore/certificates/CertificatesManager.swift

@@ -20,32 +20,33 @@ public enum CertificateError: Error {
     case unknown
 }
 
-/// CertificatesManager handles cert extraction/checking and exposes the currently selected identity.
-/// Replace `SecIdentity` with your own wrapper type if you use a custom model.
 public final class CertificatesManager: ObservableObject {
     public static let shared = CertificatesManager()
     private init() {}
 
-    // REMOVED: @Published public var selectedCertificate: SecIdentity? = nil
-
     /// Returns the currently selected SecIdentity by loading from the selected folder in UserDefaults
     public var selectedIdentity: SecIdentity? {
         guard let folderName = UserDefaults.standard.string(forKey: "selectedCertificateFolder"),
               !folderName.isEmpty else {
             return nil
         }
 
-        let certDir = CertificateFileManager.shared.certificatesDirectory.appendingPathComponent(folderName)
+        let certDir = CertificateFileManager.shared.certificatesDirectory
+            .appendingPathComponent(folderName)
+
         let p12URL = certDir.appendingPathComponent("certificate.p12")
-        let pwURL = certDir.appendingPathComponent("password.txt")
+        let pwURL  = certDir.appendingPathComponent("password.txt")
 
         guard let p12Data = try? Data(contentsOf: p12URL),
-              let password = try? String(contentsOf: pwURL, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) else {
+              let passwordRaw = try? String(contentsOf: pwURL, encoding: .utf8) else {
             return nil
         }
 
+        let password = passwordRaw.trimmingCharacters(in: .whitespacesAndNewlines)
+
         var items: CFArray?
         let options = [kSecImportExportPassphrase as String: password] as CFDictionary
+
         let status = SecPKCS12Import(p12Data as CFData, options, &items)
 
         guard status == errSecSuccess,
@@ -55,35 +56,29 @@ public final class CertificatesManager: ObservableObject {
             return nil
         }
 
-        return identityAny as! SecIdentity
+        return identityAny as? SecIdentity
     }
 
-    // MARK: - Utility: SHA256 hex
+    // MARK: - SHA256 hex
     public static func sha256Hex(_ d: Data) -> String {
         let digest = SHA256.hash(data: d)
         return digest.map { String(format: "%02x", $0) }.joined()
     }
 
-    // MARK: - Export public key bytes for a SecCertificate
+    // MARK: - Public key data
     private static func publicKeyData(from cert: SecCertificate) throws -> Data {
         guard let secKey = SecCertificateCopyKey(cert) else {
             throw CertificateError.certExtractionFailed
         }
-
-        var cfErr: Unmanaged<CFError>?
-        guard let keyData = SecKeyCopyExternalRepresentation(secKey, &cfErr) as Data? else {
-            if let cfError = cfErr?.takeRetainedValue() {
-                let code = CFErrorGetCode(cfError)
-                throw CertificateError.publicKeyExportFailed(OSStatus(code))
-            } else {
-                throw CertificateError.publicKeyExportFailed(-1)
-            }
+        var error: Unmanaged<CFError>?
+        guard let data = SecKeyCopyExternalRepresentation(secKey, &error) as Data? else {
+            let code = error?.takeRetainedValue().map { CFErrorGetCode($0) as OSStatus } ?? -1
+            throw CertificateError.publicKeyExportFailed(code)
         }
-
-        return keyData
+        return data
     }
 
-    // MARK: - Extract certificates array from mobileprovision (PKCS7) blob
+    // MARK: - Extract certs from mobileprovision
     private static func certificatesFromMobileProvision(_ data: Data) throws -> [SecCertificate] {
         let startTag = Data("<plist".utf8)
         let endTag = Data("</plist>".utf8)
@@ -96,122 +91,79 @@ public final class CertificatesManager: ObservableObject {
         let plistData = data[startRange.lowerBound..<endRange.upperBound]
         let parsed = try PropertyListSerialization.propertyList(from: Data(plistData), options: [], format: nil)
 
-        guard let dict = parsed as? [String: Any] else {
-            throw CertificateError.plistExtractionFailed
+        guard let dict = parsed as? [String: Any],
+              let devArray = dict["DeveloperCertificates"] as? [Any] else {
+            throw CertificateError.noCertsInProvision
         }
 
-        var resultCerts: [SecCertificate] = []
-        if let devArray = dict["DeveloperCertificates"] as? [Any] {
-            for item in devArray {
-                if let certData = item as? Data {
-                    if let secCert = SecCertificateCreateWithData(nil, certData as CFData) {
-                        resultCerts.append(secCert)
-                    }
-                } else if let base64String = item as? String,
-                          let certData = Data(base64Encoded: base64String) {
-                    if let secCert = SecCertificateCreateWithData(nil, certData as CFData) {
-                        resultCerts.append(secCert)
-                    }
-                }
+        var result: [SecCertificate] = []
+        for item in devArray {
+            if let certData = item as? Data,
+               let cert = SecCertificateCreateWithData(nil, certData as CFData) {
+                result.append(cert)
+            } else if let base64 = item as? String,
+                      let certData = Data(base64Encoded: base64),
+                      let cert = SecCertificateCreateWithData(nil, certData as CFData) {
+                result.append(cert)
             }
         }
 
-        if resultCerts.isEmpty {
-            throw CertificateError.noCertsInProvision
-        }
-
-        return resultCerts
+        guard !result.isEmpty else { throw CertificateError.noCertsInProvision }
+        return result
     }
 
-    // MARK: - Readable display name from mobileprovision
+    // MARK: - Display name from provision
     public func getCertificateName(mobileProvisionData: Data) -> String? {
-        // Extract the <plist>...</plist> block
         let startTag = Data("<plist".utf8)
         let endTag = Data("</plist>".utf8)
         guard let startRange = mobileProvisionData.range(of: startTag),
-              let endRange = mobileProvisionData.range(of: endTag) else {
-            return nil
-        }
-
-        let plistDataSlice = mobileProvisionData[startRange.lowerBound..<endRange.upperBound]
-        let plistData = Data(plistDataSlice)
+              let endRange = mobileProvisionData.range(of: endTag) else { return nil }
 
-        guard let parsed = try? PropertyListSerialization.propertyList(from: plistData, options: [], format: nil),
-              let dict = parsed as? [String: Any] else {
-            return nil
-        }
+        let plistData = mobileProvisionData[startRange.lowerBound..<endRange.upperBound]
+        guard let parsed = try? PropertyListSerialization.propertyList(from: Data(plistData), options: [], format: nil),
+              let dict = parsed as? [String: Any] else { return nil }
 
-        if let teamName = dict["TeamName"] as? String, !teamName.isEmpty {
-            return teamName
-        }
-        if let name = dict["Name"] as? String, !name.isEmpty {
-            return name
-        }
-        return nil
+        return (dict["TeamName"] as? String) ?? (dict["Name"] as? String)
     }
 
-    // MARK: - Top-level check: verify p12 matches one of the embedded certs in mobileprovision
-    /// Returns .success(.success) if match, .success(.noMatch) if no match, or .failure(Error)
+    // MARK: - Check p12 ↔ mobileprovision match
     public static func check(p12Data: Data, password: String, mobileProvisionData: Data) -> Result<CertificateCheckResult, Error> {
         let options = [kSecImportExportPassphrase as String: password] as CFDictionary
-        var itemsCF: CFArray?
-
-        let importStatus = SecPKCS12Import(p12Data as CFData, options, &itemsCF)
-
-        if importStatus == errSecAuthFailed {
-            return .success(.incorrectPassword)
-        }
+        var items: CFArray?
 
-        guard importStatus == errSecSuccess, let items = itemsCF as? [[String: Any]], items.count > 0 else {
-            return .failure(CertificateError.p12ImportFailed(importStatus))
-        }
+        let status = SecPKCS12Import(p12Data as CFData, options, &items)
 
-        guard let first = items.first else {
-            return .failure(CertificateError.identityExtractionFailed)
-        }
+        if status == errSecAuthFailed { return .success(.incorrectPassword) }
 
-        // kSecImportItemIdentity should be present
-        guard let identityAny = first[kSecImportItemIdentity as String] else {
-            return .failure(CertificateError.identityExtractionFailed)
+        guard status == errSecSuccess,
+              let itemsArray = items as? [[String: Any]],
+              let identityAny = itemsArray.first?[kSecImportItemIdentity as String],
+              CFGetTypeID(identityAny as CFTypeRef) == SecIdentityGetTypeID(),
+              let identity = identityAny as? SecIdentity else {
+            return .failure(CertificateError.p12ImportFailed(status))
         }
 
-// Verify CFTypeID is SecIdentity, then force-cast
-guard CFGetTypeID(identityAny as CFTypeRef) == SecIdentityGetTypeID() else {
-    return .failure(CertificateError.identityExtractionFailed)
-}
-let identity = identityAny as! SecIdentity
-
         var certRef: SecCertificate?
-        let certStatus = SecIdentityCopyCertificate(identity, &certRef)
-
-        guard certStatus == errSecSuccess, let p12Cert = certRef else {
+        guard SecIdentityCopyCertificate(identity, &certRef) == errSecSuccess,
+              let p12Cert = certRef else {
             return .failure(CertificateError.certExtractionFailed)
         }
 
         do {
-            let p12PubKeyData = try publicKeyData(from: p12Cert)
-            let p12Hash = sha256Hex(p12PubKeyData)
-
-            let embeddedCerts = try certificatesFromMobileProvision(mobileProvisionData)
-
-            for cert in embeddedCerts {
-                do {
-                    let embPubKeyData = try publicKeyData(from: cert)
-                    let embHash = sha256Hex(embPubKeyData)
-
-                    if embHash == p12Hash {
-                        return .success(.success)
-                    }
-                } catch {
-                    // continue checking other embedded certs
-                    continue
+            let p12KeyData = try publicKeyData(from: p12Cert)
+            let p12Hash = sha256Hex(p12KeyData)
+
+            let embedded = try certificatesFromMobileProvision(mobileProvisionData)
+
+            for cert in embedded {
+                let keyData = try publicKeyData(from: cert)
+                if sha256Hex(keyData) == p12Hash {
+                    return .success(.success)
                 }
             }
-
             return .success(.noMatch)
         } catch {
             return .failure(error)
         }
     }
-}
-
+}

Sources/prostore/signing/DownloadSignManager.swift

@@ -2,15 +2,14 @@
 import Foundation
 import Combine
 
-class DownloadSignManager: ObservableObject {
+final class DownloadSignManager: ObservableObject, @unchecked Sendable {
+    @Published var isProcessing = false
     @Published var progress: Double = 0.0
     @Published var status: String = ""
-    @Published var isProcessing: Bool = false
-    @Published var showSuccess: Bool = false
-    
-    private var downloadTask: URLSessionDownloadTask?
+    @Published var showSuccess = false
+
     private var cancellables = Set<AnyCancellable>()
-    
+
     func downloadAndSign(app: AltApp) {
         guard let downloadURL = app.downloadURL else {
             self.status = "No download URL available"