Move Mullvad API functions to new file

Author: rablador

ios/MullvadMockData/MullvadREST/APIProxy+Stubs.swift

@@ -12,21 +12,6 @@ import MullvadTypes
 import WireGuardKitTypes
 
 struct APIProxyStub: APIQuerying {
-    func mullvadApiGetAddressList(
-        retryStrategy: REST.RetryStrategy,
-        completionHandler: @escaping ProxyCompletionHandler<[AnyIPEndpoint]>
-    ) -> Cancellable {
-        AnyCancellable()
-    }
-
-    func mullvadApiGetRelayList(
-        retryStrategy: REST.RetryStrategy,
-        etag: String?,
-        completionHandler: @escaping ProxyCompletionHandler<REST.ServerRelaysCacheResponse>)
-    -> Cancellable {
-        AnyCancellable()
-    }
-
     func getAddressList(
         retryStrategy: REST.RetryStrategy,
         completionHandler: @escaping ProxyCompletionHandler<[AnyIPEndpoint]>

ios/MullvadREST/ApiHandlers/RESTAPIProxy.swift

@@ -13,17 +13,6 @@ import Operations
 import WireGuardKitTypes
 
 public protocol APIQuerying: Sendable {
-    func mullvadApiGetAddressList(
-        retryStrategy: REST.RetryStrategy,
-        completionHandler: @escaping @Sendable ProxyCompletionHandler<[AnyIPEndpoint]>
-    ) -> Cancellable
-
-    func mullvadApiGetRelayList(
-        retryStrategy: REST.RetryStrategy,
-        etag: String?,
-        completionHandler: @escaping @Sendable ProxyCompletionHandler<REST.ServerRelaysCacheResponse>
-    ) -> Cancellable
-
     func getAddressList(
         retryStrategy: REST.RetryStrategy,
         completionHandler: @escaping @Sendable ProxyCompletionHandler<[AnyIPEndpoint]>
@@ -68,76 +57,6 @@ extension REST {
             )
         }
 
-        public func mullvadApiGetAddressList(
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping @Sendable ProxyCompletionHandler<[AnyIPEndpoint]>
-        ) -> Cancellable {
-            let responseHandler = rustResponseHandler(
-                decoding: [AnyIPEndpoint].self,
-                with: responseDecoder
-            )
-
-            return createNetworkOperation(
-                request: .getAddressList(retryStrategy),
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
-        public func mullvadApiGetRelayList(
-            retryStrategy: REST.RetryStrategy,
-            etag: String?,
-            completionHandler: @escaping @Sendable ProxyCompletionHandler<REST.ServerRelaysCacheResponse>
-        ) -> Cancellable {
-            if var etag {
-                // Enforce weak validator to account for some backend caching quirks.
-                if etag.starts(with: "\"") {
-                    etag.insert(contentsOf: "W/", at: etag.startIndex)
-                }
-            }
-
-            let responseHandler = rustCustomResponseHandler { [weak self] (data, responseEtag) in
-                // Discarding result since we're only interested in knowing that it's parseable.
-                let canDecodeResponse = (try? self?.responseDecoder.decode(REST.ServerRelaysResponse.self, from: data)) != nil
-
-                return if canDecodeResponse {
-                    if let responseEtag, responseEtag == etag {
-                        REST.ServerRelaysCacheResponse.notModified
-                    } else {
-                        REST.ServerRelaysCacheResponse.newContent(responseEtag, data)
-                    }
-                } else {
-                    nil
-                }
-            }
-
-            return createNetworkOperation(
-                request: .getRelayList(retryStrategy, etag: etag),
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
-        private func createNetworkOperation<Success: Decodable>(
-            request: APIRequest,
-            responseHandler: RustResponseHandler<Success>,
-            completionHandler: @escaping @Sendable ProxyCompletionHandler<Success>
-        ) -> MullvadApiNetworkOperation<Success> {
-            let networkOperation = MullvadApiNetworkOperation(
-                name: request.name,
-                dispatchQueue: dispatchQueue,
-                request: request,
-                transportProvider: configuration.apiTransportProvider,
-                responseDecoder: responseDecoder,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-
-            operationQueue.addOperation(networkOperation)
-
-            return networkOperation
-        }
-
         public func getAddressList(
             retryStrategy: REST.RetryStrategy,
             completionHandler: @escaping @Sendable ProxyCompletionHandler<[AnyIPEndpoint]>
@@ -366,64 +285,15 @@ extension REST {
 
     // MARK: - Response types
 
-    public enum ServerRelaysCacheResponse: Sendable, Decodable {
-        case notModified
-        case newContent(_ etag: String?, _ rawData: Data)
-    }
-
     private struct CreateApplePaymentRequest: Encodable, Sendable {
         let receiptString: Data
     }
 
-    public enum CreateApplePaymentResponse: Sendable {
-        case noTimeAdded(_ expiry: Date)
-        case timeAdded(_ timeAdded: Int, _ newExpiry: Date)
-
-        public var newExpiry: Date {
-            switch self {
-            case let .noTimeAdded(expiry), let .timeAdded(_, expiry):
-                return expiry
-            }
-        }
-
-        public var timeAdded: TimeInterval {
-            switch self {
-            case .noTimeAdded:
-                return 0
-            case let .timeAdded(timeAdded, _):
-                return TimeInterval(timeAdded)
-            }
-        }
-
-        /// Returns a formatted string for the `timeAdded` interval, i.e "30 days"
-        public var formattedTimeAdded: String? {
-            let formatter = DateComponentsFormatter()
-            formatter.allowedUnits = [.day, .hour]
-            formatter.unitsStyle = .full
-
-            return formatter.string(from: self.timeAdded)
-        }
-    }
-
     private struct CreateApplePaymentRawResponse: Decodable, Sendable {
         let timeAdded: Int
         let newExpiry: Date
     }
 
-    public struct ProblemReportRequest: Encodable, Sendable {
-        public let address: String
-        public let message: String
-        public let log: String
-        public let metadata: [String: String]
-
-        public init(address: String, message: String, log: String, metadata: [String: String]) {
-            self.address = address
-            self.message = message
-            self.log = log
-            self.metadata = metadata
-        }
-    }
-
     private struct SubmitVoucherRequest: Encodable, Sendable {
         let voucherCode: String
     }