Fix certificate detection

Author: NovaDev404

Sources/prostore/certificates/CertificatesManager.swift

@@ -26,8 +26,37 @@ public final class CertificatesManager: ObservableObject {
     public static let shared = CertificatesManager()
     private init() {}
 
-    // The currently selected certificate identity (nil if none chosen).
-    @Published public var selectedCertificate: SecIdentity? = nil
+    // 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 p12URL = certDir.appendingPathComponent("certificate.p12")
+        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 {
+            return nil
+        }
+
+        var items: CFArray?
+        let options = [kSecImportExportPassphrase as String: password] as CFDictionary
+        let status = SecPKCS12Import(p12Data as CFData, options, &items)
+
+        guard status == errSecSuccess,
+              let cfItems = items as? [[String: Any]],
+              let identityAny = cfItems.first?[kSecImportItemIdentity as String],
+              CFGetTypeID(identityAny as CFTypeRef) == SecIdentityGetTypeID() else {
+            return nil
+        }
+
+        return identityAny as! SecIdentity
+    }
 
     // MARK: - Utility: SHA256 hex
     public static func sha256Hex(_ d: Data) -> String {

Sources/prostore/views/AppsDetailView.swift

@@ -208,7 +208,7 @@ public struct AppDetailView: View {
                         Spacer()
                         Button(action: {
                             // Immediate certificate check from CertificatesManager
-                            if certificatesManager.selectedCertificate == nil {
+                            if certificatesManager.selectedIdentity == nil {
                                 showCertError = true
                                 return
                             }
@@ -226,8 +226,8 @@ public struct AppDetailView: View {
                             .cornerRadius(25)
                             .shadow(radius: 5)
                         }
-                        .disabled(certificatesManager.selectedCertificate == nil)
-                        .opacity(certificatesManager.selectedCertificate == nil ? 0.6 : 1.0)
+                        .disabled(certificatesManager.selectedIdentity == nil)
+                        .opacity(certificatesManager.selectedIdentity == nil ? 0.6 : 1.0)
                         .padding(.trailing, 20)
                         .padding(.bottom, 20)
                     }
@@ -295,7 +295,7 @@ public struct AppDetailView: View {
                     .foregroundColor(.red)
                 } else if app.downloadURL != nil {
                     Button(action: {
-                        if certificatesManager.selectedCertificate == nil {
+                        if certificatesManager.selectedIdentity == nil {
                             showCertError = true
                             return
                         }
@@ -306,9 +306,8 @@ public struct AppDetailView: View {
                             Text("Download")
                         }
                     }
-                    .disabled(certificatesManager.selectedCertificate == nil)
-                    .opacity(certificatesManager.selectedCertificate == nil ? 0.6 : 1.0)
-                }
+                    .disabled(certificatesManager.selectedIdentity == nil)
+                    .opacity(certificatesManager.selectedIdentity == nil ? 0.6 : 1.0)
             }
         }
         .alert("Please select a certificate first!", isPresented: $showCertError) {

project.yml

@@ -36,8 +36,8 @@ targets:
       properties:
         CFBundleDisplayName: "ProStore"
         CFBundleName: "prostore"
-        CFBundleVersion: "49"
-        CFBundleShortVersionString: "0.12.0d4"
+        CFBundleVersion: "50"
+        CFBundleShortVersionString: "0.12.0d5"
         UILaunchStoryboardName: "LaunchScreen"
         NSPrincipalClass: "UIApplication"
         NSAppTransportSecurity: