Update secure storage

Sources/OversizeAppStoreServices/Auth/EnvAuthenticator.swift

@@ -4,19 +4,20 @@
 //
 
 import AppStoreConnect
+import Foundation
 
 public struct EnvAuthenticator: Authenticator {
-    public enum Error: Swift.Error {
-        case missingEnvironmentVariable(String)
-    }
-
-    var jwt: JWT
+    private let secureStorage: KeychainService = .init()
 
-    private let secureStorage: SecureStorageService = .init()
+    private var jwt: JWT
 
     public init() throws {
-        guard let appStoreCertificate = secureStorage.getAppStoreCertificate(with: "AppStore.KeyID") else {
-            throw Error.missingEnvironmentVariable("AppStore.KeyID")
+        guard let keyLabel = UserDefaults.standard.string(forKey: "AppStore.Account") else {
+            throw Error.missingEnvironmentVariable("AppStore.Account")
+        }
+
+        guard let appStoreCertificate = secureStorage.getAppStoreCertificate(with: keyLabel) else {
+            throw Error.missingEnvironmentVariable("AppStore.Key.Default")
         }
 
         let privateKey = try JWT.PrivateKey(pemRepresentation: appStoreCertificate.privateKey)
@@ -33,3 +34,9 @@ public struct EnvAuthenticator: Authenticator {
         try jwt.token()
     }
 }
+
+public extension EnvAuthenticator {
+    enum Error: Swift.Error {
+        case missingEnvironmentVariable(String)
+    }
+}

Sources/OversizeAppStoreServices/Auth/Keychain/AppStoreCertificatePropertyWrapper.swift

@@ -1,20 +1,20 @@
 //
 // Copyright © 2024 Alexander Romanov
 // AppStoreCertificate.swift, created on 12.09.2024
-//  
+//
 
 import SwiftUI
 
 @propertyWrapper
-public struct AppStoreCertificate: DynamicProperty {
+public struct AppStoreCertificateStorage: DynamicProperty {
     private let label: String
-    private let storage: SecureStorageService = .init()
+    private let storage: KeychainService = .init()
 
     public init(_ label: String) {
         self.label = label
     }
 
-    public var wrappedValue: SecureStorageService.AppStoreCertificate? {
+    public var wrappedValue: KeychainService.AppStoreCertificate? {
         get { storage.getAppStoreCertificate(with: label) }
         nonmutating set {
             if let newValue {

Sources/OversizeAppStoreServices/Auth/Keychain/SecureStorageService.swift → Sources/OversizeAppStoreServices/Auth/Keychain/KeychainService.swift

@@ -1,13 +1,13 @@
 //
 // Copyright © 2022 Alexander Romanov
-// SecureStorageService.swift
+// KeychainService.swift
 //
 
 import Foundation
 import OversizeCore
 import Security
 
-public final class SecureStorageService {
+public final class KeychainService {
     enum KeychainError: Error {
         case itemAlreadyExist
         case itemNotFound

Sources/OversizeAppStoreServices/Auth/Keychain/AppSroewCertificate.swift → Sources/OversizeAppStoreServices/Auth/Keychain/KeychainServiceCertificate.swift

@@ -3,59 +3,60 @@
 // AppStoreCertificate.swift, created on 12.09.2024
 //
 
-import Security
 import Foundation
+import Security
 
-public extension SecureStorageService {
+public extension KeychainService {
     struct AppStoreCertificate {
         public var issuerId: String
         public var keyId: String
         public var privateKey: String
-        
+
         public init(issuerId: String, keyId: String, privateKey: String) {
             self.issuerId = issuerId
             self.keyId = keyId
             self.privateKey = privateKey
         }
     }
-    
+
     func addAppStoreCertificate(_ certificate: AppStoreCertificate, with label: String) {
         var query: [CFString: Any] = [:]
         query[kSecClass] = kSecClassGenericPassword
         query[kSecAttrLabel] = label
         query[kSecAttrAccount] = certificate.issuerId
-        
+
         let combinedData = "\(certificate.keyId):\(certificate.privateKey)"
         query[kSecValueData] = combinedData.data(using: .utf8)
-        
+
         do {
             try addItem(query: query)
         } catch {
             return
         }
     }
-    
+
     func updateAppStoreCertificate(_ certificate: AppStoreCertificate, with label: String) {
         deleteAppStoreCertificate(with: label)
         addAppStoreCertificate(certificate, with: label)
     }
-    
+
     func getAppStoreCertificate(with label: String) -> AppStoreCertificate? {
         var query: [CFString: Any] = [:]
         query[kSecClass] = kSecClassGenericPassword
         query[kSecAttrLabel] = label
-        
+
         var result: [CFString: Any]?
-        
+
         do {
             result = try findItem(query: query)
         } catch {
             return nil
         }
-        
+
         if let issuerId = result?[kSecAttrAccount] as? String,
            let data = result?[kSecValueData] as? Data,
-           let combinedString = String(data: data, encoding: .utf8) {
+           let combinedString = String(data: data, encoding: .utf8)
+        {
             let components = combinedString.split(separator: ":")
             if components.count == 2 {
                 let keyId = String(components[0])
@@ -65,12 +66,12 @@ public extension SecureStorageService {
         }
         return nil
     }
-    
+
     func deleteAppStoreCertificate(with label: String) {
         var query: [CFString: Any] = [:]
         query[kSecClass] = kSecClassGenericPassword
         query[kSecAttrLabel] = label
-        
+
         do {
             try deleteItem(query: query)
         } catch {

Sources/OversizeAppStoreServices/ServiceRegistering.swift

@@ -6,6 +6,10 @@
 import Factory
 
 public extension Container {
+    var keychainService: Factory<KeychainService> {
+        self { KeychainService() }
+    }
+
     var appsService: Factory<AppsService> {
         self { AppsService() }
     }
@@ -21,4 +25,8 @@ public extension Container {
     var reviewService: Factory<ReviewService> {
         self { ReviewService() }
     }
+
+    var usersService: Factory<UsersService> {
+        self { UsersService() }
+    }
 }

Sources/OversizeAppStoreServices/Services/UsersService.swift

@@ -0,0 +1,30 @@
+//
+// Copyright © 2024 Alexander Romanov
+// UsersService.swift, created on 22.09.2024
+//
+
+import AppStoreConnect
+import OversizeModels
+
+public actor UsersService {
+    private let client: AppStoreConnectClient?
+
+    public init() {
+        do {
+            client = try AppStoreConnectClient(authenticator: EnvAuthenticator())
+        } catch {
+            client = nil
+        }
+    }
+
+    public func fetchCustomerReviews(versionId _: String) async -> Result<[User], AppError> {
+        guard let client = client else { return .failure(.network(type: .unauthorized)) }
+        let request = Resources.v1.users.get()
+        do {
+            let data = try await client.send(request).data
+            return .success(data)
+        } catch {
+            return .failure(.network(type: .noResponse))
+        }
+    }
+}