mullvad · buggmagnet · Oct 16, 2023 · Sep 26, 2023
diff --git a/ios/MullvadREST/RESTAPIProxy.swift b/ios/MullvadREST/RESTAPIProxy.swift
@@ -11,8 +11,46 @@ import MullvadTypes
 import struct WireGuardKitTypes.IPAddressRange
 import class WireGuardKitTypes.PublicKey
 
+public protocol APIQuerying {
+    func getAddressList(
+        retryStrategy: REST.RetryStrategy,
+        completionHandler: @escaping ProxyCompletionHandler<[AnyIPEndpoint]>
+    ) -> Cancellable
+
+    func getRelays(
+        etag: String?,
+        retryStrategy: REST.RetryStrategy,
+        completionHandler: @escaping ProxyCompletionHandler<REST.ServerRelaysCacheResponse>
+    ) -> Cancellable
+
+    func createApplePayment(
+        accountNumber: String,
+        receiptString: Data
+    ) -> any RESTRequestExecutor<REST.CreateApplePaymentResponse>
+
+    func createApplePayment(
+        accountNumber: String,
+        receiptString: Data,
+        retryStrategy: REST.RetryStrategy,
+        completionHandler: @escaping ProxyCompletionHandler<REST.CreateApplePaymentResponse>
+    ) -> Cancellable
+
+    func sendProblemReport(
+        _ body: REST.ProblemReportRequest,
+        retryStrategy: REST.RetryStrategy,
+        completionHandler: @escaping ProxyCompletionHandler<Void>
+    ) -> Cancellable
+
+    func submitVoucher(
+        voucherCode: String,
+        accountNumber: String,
+        retryStrategy: REST.RetryStrategy,
+        completionHandler: @escaping ProxyCompletionHandler<REST.SubmitVoucherResponse>
+    ) -> Cancellable
+}
+
 extension REST {
-    public final class APIProxy: Proxy<AuthProxyConfiguration> {
+    public final class APIProxy: Proxy<AuthProxyConfiguration>, APIQuerying {
         public init(configuration: AuthProxyConfiguration) {
             super.init(
                 name: "APIProxy",
@@ -27,7 +65,7 @@ extension REST {
 
         public func getAddressList(
             retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<[AnyIPEndpoint]>
+            completionHandler: @escaping ProxyCompletionHandler<[AnyIPEndpoint]>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler { endpoint in
                 try self.requestFactory.createRequest(
@@ -54,7 +92,7 @@ extension REST {
         public func getRelays(
             etag: String?,
             retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<ServerRelaysCacheResponse>
+            completionHandler: @escaping ProxyCompletionHandler<ServerRelaysCacheResponse>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler { endpoint in
                 var requestBuilder = try self.requestFactory.createRequestBuilder(
@@ -170,7 +208,7 @@ extension REST {
             accountNumber: String,
             receiptString: Data,
             retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<CreateApplePaymentResponse>
+            completionHandler: @escaping ProxyCompletionHandler<CreateApplePaymentResponse>
         ) -> Cancellable {
             return createApplePayment(accountNumber: accountNumber, receiptString: receiptString).execute(
                 retryStrategy: retryStrategy,
@@ -181,7 +219,7 @@ extension REST {
         public func sendProblemReport(
             _ body: ProblemReportRequest,
             retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<Void>
+            completionHandler: @escaping ProxyCompletionHandler<Void>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler { endpoint in
                 var requestBuilder = try self.requestFactory.createRequestBuilder(
@@ -222,7 +260,7 @@ extension REST {
             voucherCode: String,
             accountNumber: String,
             retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<SubmitVoucherResponse>
+            completionHandler: @escaping ProxyCompletionHandler<SubmitVoucherResponse>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(
                 createURLRequest: { endpoint, authorization in

diff --git a/ios/MullvadREST/RESTAccessTokenManager.swift b/ios/MullvadREST/RESTAccessTokenManager.swift
@@ -11,8 +11,17 @@ import MullvadLogging
 import MullvadTypes
 import Operations
 
+public protocol RESTAccessTokenManagement {
+    func getAccessToken(
+        accountNumber: String,
+        completionHandler: @escaping ProxyCompletionHandler<REST.AccessTokenData>
+    ) -> Cancellable
+
+    func invalidateAllTokens()
+}
+
 extension REST {
-    public final class AccessTokenManager {
+    public final class AccessTokenManager: RESTAccessTokenManagement {
         private let logger = Logger(label: "REST.AccessTokenManager")
         private let operationQueue = AsyncOperationQueue.makeSerial()
         private let dispatchQueue = DispatchQueue(label: "REST.AccessTokenManager.dispatchQueue")
@@ -23,9 +32,9 @@ extension REST {
             proxy = authenticationProxy
         }
 
-        func getAccessToken(
+        public func getAccessToken(
             accountNumber: String,
-            completionHandler: @escaping (Result<REST.AccessTokenData, Swift.Error>) -> Void
+            completionHandler: @escaping ProxyCompletionHandler<REST.AccessTokenData>
         ) -> Cancellable {
             let operation =
                 ResultBlockOperation<REST.AccessTokenData>(dispatchQueue: dispatchQueue) { finish -> Cancellable in

diff --git a/ios/MullvadREST/RESTAccountsProxy.swift b/ios/MullvadREST/RESTAccountsProxy.swift
@@ -9,8 +9,29 @@
 import Foundation
 import MullvadTypes
 
+public protocol RESTAccountHandling {
+    func createAccount(
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<REST.NewAccountData>
+    ) -> Cancellable
+
+    func getAccountData(accountNumber: String) -> any RESTRequestExecutor<Account>
+
+    func getAccountData(
+        accountNumber: String,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<Account>
+    ) -> Cancellable
+
+    func deleteAccount(
+        accountNumber: String,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<Void>
+    ) -> Cancellable
+}
+
 extension REST {
-    public final class AccountsProxy: Proxy<AuthProxyConfiguration> {
+    public final class AccountsProxy: Proxy<AuthProxyConfiguration>, RESTAccountHandling {
         public init(configuration: AuthProxyConfiguration) {
             super.init(
                 name: "AccountsProxy",
@@ -25,7 +46,7 @@ extension REST {
 
         public func createAccount(
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<NewAccountData>
+            completion: @escaping ProxyCompletionHandler<NewAccountData>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler { endpoint in
                 try self.requestFactory.createRequest(
@@ -81,7 +102,7 @@ extension REST {
         public func getAccountData(
             accountNumber: String,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<Account>
+            completion: @escaping ProxyCompletionHandler<Account>
         ) -> Cancellable {
             return getAccountData(accountNumber: accountNumber).execute(
                 retryStrategy: retryStrategy,
@@ -92,7 +113,7 @@ extension REST {
         public func deleteAccount(
             accountNumber: String,
             retryStrategy: RetryStrategy,
-            completion: @escaping CompletionHandler<Void>
+            completion: @escaping ProxyCompletionHandler<Void>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(createURLRequest: { endpoint, authorization in
                 var requestBuilder = try self.requestFactory.createRequestBuilder(

diff --git a/ios/MullvadREST/RESTAuthenticationProxy.swift b/ios/MullvadREST/RESTAuthenticationProxy.swift
@@ -23,10 +23,10 @@ extension REST {
             )
         }
 
-        func getAccessToken(
+        public func getAccessToken(
             accountNumber: String,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<AccessTokenData>
+            completion: @escaping ProxyCompletionHandler<AccessTokenData>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler { endpoint in
                 var requestBuilder = try self.requestFactory.createRequestBuilder(
@@ -57,7 +57,7 @@ extension REST {
         }
     }
 
-    struct AccessTokenData: Decodable {
+    public struct AccessTokenData: Decodable {
         let accessToken: String
         let expiry: Date
     }

diff --git a/ios/MullvadREST/RESTDevicesProxy.swift b/ios/MullvadREST/RESTDevicesProxy.swift
@@ -11,8 +11,45 @@ import MullvadTypes
 import struct WireGuardKitTypes.IPAddressRange
 import class WireGuardKitTypes.PublicKey
 
+public protocol DeviceHandling {
+    func getDevice(
+        accountNumber: String,
+        identifier: String,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<Device>
+    ) -> Cancellable
+
+    func getDevices(
+        accountNumber: String,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<[Device]>
+    ) -> Cancellable
+
+    func createDevice(
+        accountNumber: String,
+        request: REST.CreateDeviceRequest,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<Device>
+    ) -> Cancellable
+
+    func deleteDevice(
+        accountNumber: String,
+        identifier: String,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<Bool>
+    ) -> Cancellable
+
+    func rotateDeviceKey(
+        accountNumber: String,
+        identifier: String,
+        publicKey: PublicKey,
+        retryStrategy: REST.RetryStrategy,
+        completion: @escaping ProxyCompletionHandler<Device>
+    ) -> Cancellable
+}
+
 extension REST {
-    public final class DevicesProxy: Proxy<AuthProxyConfiguration> {
+    public final class DevicesProxy: Proxy<AuthProxyConfiguration>, DeviceHandling {
         public init(configuration: AuthProxyConfiguration) {
             super.init(
                 name: "DevicesProxy",
@@ -31,7 +68,7 @@ extension REST {
             accountNumber: String,
             identifier: String,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<Device>
+            completion: @escaping ProxyCompletionHandler<Device>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(
                 createURLRequest: { endpoint, authorization in
@@ -87,7 +124,7 @@ extension REST {
         public func getDevices(
             accountNumber: String,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<[Device]>
+            completion: @escaping ProxyCompletionHandler<[Device]>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(
                 createURLRequest: { endpoint, authorization in
@@ -125,7 +162,7 @@ extension REST {
             accountNumber: String,
             request: CreateDeviceRequest,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<Device>
+            completion: @escaping ProxyCompletionHandler<Device>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(
                 createURLRequest: { endpoint, authorization in
@@ -164,7 +201,7 @@ extension REST {
             accountNumber: String,
             identifier: String,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<Bool>
+            completion: @escaping ProxyCompletionHandler<Bool>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(
                 createURLRequest: { endpoint, authorization in
@@ -226,7 +263,7 @@ extension REST {
             identifier: String,
             publicKey: PublicKey,
             retryStrategy: REST.RetryStrategy,
-            completion: @escaping CompletionHandler<Device>
+            completion: @escaping ProxyCompletionHandler<Device>
         ) -> Cancellable {
             let requestHandler = AnyRequestHandler(
                 createURLRequest: { endpoint, authorization in

diff --git a/ios/MullvadREST/RESTProxy.swift b/ios/MullvadREST/RESTProxy.swift
@@ -10,10 +10,10 @@ import Foundation
 import MullvadTypes
 import Operations
 
+public typealias ProxyCompletionHandler<Success> = (Result<Success, Swift.Error>) -> Void
+
 extension REST {
     public class Proxy<ConfigurationType: ProxyConfiguration> {
-        public typealias CompletionHandler<Success> = (Result<Success, Swift.Error>) -> Void
-
         /// Synchronization queue used by network operations.
         let dispatchQueue: DispatchQueue
 
@@ -49,7 +49,7 @@ extension REST {
             retryStrategy: REST.RetryStrategy,
             requestHandler: RESTRequestHandler,
             responseHandler: some RESTResponseHandler<Success>,
-            completionHandler: @escaping CompletionHandler<Success>
+            completionHandler: @escaping ProxyCompletionHandler<Success>
         ) -> Cancellable {
             let executor = makeRequestExecutor(
                 name: name,
@@ -89,7 +89,7 @@ extension REST {
         /// Creates new network operation but does not schedule it for execution.
         func makeOperation(
             retryStrategy: REST.RetryStrategy,
-            completionHandler: ((Result<Success, Swift.Error>) -> Void)? = nil
+            completionHandler: ProxyCompletionHandler<Success>? = nil
         ) -> NetworkOperation<Success> {
             return NetworkOperation(
                 name: getTaskIdentifier(name: name),
@@ -110,7 +110,7 @@ extension REST {
 
         func execute(
             retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping (Result<Success, Swift.Error>) -> Void
+            completionHandler: @escaping ProxyCompletionHandler<Success>
         ) -> Cancellable {
             let operation = operationFactory.makeOperation(
                 retryStrategy: retryStrategy,
@@ -137,7 +137,7 @@ extension REST {
             }
         }
 
-        func execute(completionHandler: @escaping (Result<Success, Swift.Error>) -> Void) -> Cancellable {
+        func execute(completionHandler: @escaping ProxyCompletionHandler<Success>) -> Cancellable {
             return execute(retryStrategy: .noRetry, completionHandler: completionHandler)
         }
 

diff --git a/ios/MullvadREST/RESTProxyFactory.swift b/ios/MullvadREST/RESTProxyFactory.swift
@@ -40,15 +40,15 @@ extension REST {
             self.configuration = configuration
         }
 
-        public func createAPIProxy() -> REST.APIProxy {
+        public func createAPIProxy() -> APIQuerying {
             REST.APIProxy(configuration: configuration)
         }
 
-        public func createAccountsProxy() -> REST.AccountsProxy {
+        public func createAccountsProxy() -> RESTAccountHandling {
             REST.AccountsProxy(configuration: configuration)
         }
 
-        public func createDevicesProxy() -> REST.DevicesProxy {
+        public func createDevicesProxy() -> DeviceHandling {
             REST.DevicesProxy(configuration: configuration)
         }
     }

diff --git a/ios/MullvadTransport/TransportProvider.swift b/ios/MullvadTransport/TransportProvider.swift
@@ -15,7 +15,7 @@ import RelaySelector
 
 public final class TransportProvider: RESTTransportProvider {
     private let urlSessionTransport: URLSessionTransport
-    private let relayCache: RelayCache
+    private let relayCache: RelayCacheProtocol
     private let logger = Logger(label: "TransportProvider")
     private let addressCache: REST.AddressCache
     private let shadowsocksCache: ShadowsocksConfigurationCache
@@ -28,7 +28,7 @@ public final class TransportProvider: RESTTransportProvider {
 
     public init(
         urlSessionTransport: URLSessionTransport,
-        relayCache: RelayCache,
+        relayCache: RelayCacheProtocol,
         addressCache: REST.AddressCache,
         shadowsocksCache: ShadowsocksConfigurationCache,
         transportStrategy: TransportStrategy,