REST: obsolete old API methods

1 files changed, 0 insertions, 247 deletions

diff --git a/ios/MullvadVPN/REST/RESTAPIProxy.swift b/ios/MullvadVPN/REST/RESTAPIProxy.swift
index 1271422be1..1d7f259b4b 100644
--- a/ios/MullvadVPN/REST/RESTAPIProxy.swift
+++ b/ios/MullvadVPN/REST/RESTAPIProxy.swift
@@ -25,33 +25,6 @@ extension REST {
             )
         }
 
-        func createAccount(
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<AccountResponse>
-        ) -> Cancellable
-        {
-            let requestHandler = AnyRequestHandler { endpoint in
-                return try self.requestFactory.createRequest(
-                    endpoint: endpoint,
-                    method: .post,
-                    pathTemplate: "accounts"
-                )
-            }
-
-            let responseHandler = REST.defaultResponseHandler(
-                decoding: AccountResponse.self,
-                with: responseDecoder
-            )
-
-            return addOperation(
-                name: "create-account",
-                retryStrategy: retryStrategy,
-                requestHandler: requestHandler,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
         func getAddressList(
             retryStrategy: REST.RetryStrategy,
             completionHandler: @escaping CompletionHandler<[AnyIPEndpoint]>
@@ -136,205 +109,6 @@ extension REST {
             )
         }
 
-        func getAccountExpiry(
-            accountNumber: String,
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<AccountResponse>
-        ) -> Cancellable
-        {
-            let requestHandler = AnyRequestHandler { endpoint in
-                var requestBuilder = try self.requestFactory
-                    .createRequestBuilder(
-                        endpoint: endpoint,
-                        method: .get,
-                        pathTemplate: "me"
-                    )
-                requestBuilder.setAuthorization(.accountNumber(accountNumber))
-
-                return requestBuilder.getRequest()
-            }
-
-            let responseHandler = REST.defaultResponseHandler(
-                decoding: AccountResponse.self,
-                with: responseDecoder
-            )
-
-            return addOperation(
-                name: "get-account-expiry",
-                retryStrategy: retryStrategy,
-                requestHandler: requestHandler,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
-        func getWireguardKey(
-            accountNumber: String,
-            publicKey: PublicKey,
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<WireguardAddressesResponse>
-        ) -> Cancellable
-        {
-            let requestHandler = AnyRequestHandler { endpoint in
-                var path: URLPathTemplate = "wireguard-keys/{pubkey}"
-                try path.addPercentEncodedReplacement(
-                    name: "pubkey",
-                    value: publicKey.base64Key,
-                    allowedCharacters: .alphanumerics
-                )
-
-                var requestBuilder = try self.requestFactory
-                    .createRequestBuilder(
-                        endpoint: endpoint,
-                        method: .get,
-                        pathTemplate: path
-                    )
-                requestBuilder.setAuthorization(.accountNumber(accountNumber))
-
-                return requestBuilder.getRequest()
-            }
-
-            let responseHandler = REST.defaultResponseHandler(
-                decoding: WireguardAddressesResponse.self,
-                with: responseDecoder
-            )
-
-            return addOperation(
-                name: "get-wireguard-key",
-                retryStrategy: retryStrategy,
-                requestHandler: requestHandler,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
-        func pushWireguardKey(
-            accountNumber: String,
-            publicKey: PublicKey,
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<WireguardAddressesResponse>
-        ) -> Cancellable
-        {
-            let requestHandler = AnyRequestHandler { endpoint in
-                var requestBuilder = try self.requestFactory.createRequestBuilder(
-                    endpoint: endpoint,
-                    method: .post,
-                    pathTemplate: "wireguard-keys"
-                )
-                requestBuilder.setAuthorization(.accountNumber(accountNumber))
-
-                let body = PushWireguardKeyRequest(
-                    pubkey: publicKey.rawValue
-                )
-
-                try requestBuilder.setHTTPBody(value: body)
-
-                return requestBuilder.getRequest()
-            }
-
-            let responseHandler = REST.defaultResponseHandler(
-                decoding: WireguardAddressesResponse.self,
-                with: responseDecoder
-            )
-
-            return addOperation(
-                name: "push-wireguard-key",
-                retryStrategy: retryStrategy,
-                requestHandler: requestHandler,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
-        func replaceWireguardKey(
-            accountNumber: String,
-            oldPublicKey: PublicKey,
-            newPublicKey: PublicKey,
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<WireguardAddressesResponse>
-        ) -> Cancellable
-        {
-            let requestHandler = AnyRequestHandler { endpoint in
-                var requestBuilder = try self.requestFactory.createRequestBuilder(
-                    endpoint: endpoint,
-                    method: .post,
-                    pathTemplate: "replace-wireguard-key"
-                )
-                requestBuilder.setAuthorization(.accountNumber(accountNumber))
-
-                let body = ReplaceWireguardKeyRequest(
-                    old: oldPublicKey.rawValue,
-                    new: newPublicKey.rawValue
-                )
-
-                try requestBuilder.setHTTPBody(value: body)
-
-                return requestBuilder.getRequest()
-            }
-
-            let responseHandler = REST.defaultResponseHandler(
-                decoding: WireguardAddressesResponse.self,
-                with: responseDecoder
-            )
-
-            return addOperation(
-                name: "replace-wireguard-key",
-                retryStrategy: retryStrategy,
-                requestHandler: requestHandler,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
-        func deleteWireguardKey(
-            accountNumber: String,
-            publicKey: PublicKey,
-            retryStrategy: REST.RetryStrategy,
-            completionHandler: @escaping CompletionHandler<Void>
-        ) -> Cancellable
-        {
-            let requestHandler = AnyRequestHandler { endpoint in
-                var path: URLPathTemplate = "wireguard-keys/{pubkey}"
-
-                try path.addPercentEncodedReplacement(
-                    name: "pubkey",
-                    value: publicKey.base64Key,
-                    allowedCharacters: .alphanumerics
-                )
-
-                var requestBuilder = try self.requestFactory
-                    .createRequestBuilder(
-                        endpoint: endpoint,
-                        method: .delete,
-                        pathTemplate: path
-                    )
-                requestBuilder.setAuthorization(.accountNumber(accountNumber))
-
-                return requestBuilder.getRequest()
-            }
-
-            let responseHandler = AnyResponseHandler { response, data -> ResponseHandlerResult<Void> in
-                if HTTPStatus.isSuccess(response.statusCode) {
-                    return .success(())
-                } else {
-                    return .unhandledResponse(
-                        try? self.responseDecoder.decode(
-                            ServerErrorResponse.self,
-                            from: data
-                        )
-                    )
-                }
-            }
-
-            return addOperation(
-                name: "delete-wireguard-key",
-                retryStrategy: retryStrategy,
-                requestHandler: requestHandler,
-                responseHandler: responseHandler,
-                completionHandler: completionHandler
-            )
-        }
-
         func createApplePayment(
             accountNumber: String,
             receiptString: Data,
@@ -434,32 +208,11 @@ extension REST {
 
     // MARK: - Response types
 
-    struct AccountResponse: Decodable {
-        let token: String
-        let expires: Date
-    }
-
     enum ServerRelaysCacheResponse {
         case notModified
         case newContent(_ etag: String?, _ value: ServerRelaysResponse)
     }
 
-    struct WireguardAddressesResponse: Decodable {
-        let id: String
-        let pubkey: Data
-        let ipv4Address: IPAddressRange
-        let ipv6Address: IPAddressRange
-    }
-
-    fileprivate struct PushWireguardKeyRequest: Encodable {
-        let pubkey: Data
-    }
-
-    fileprivate struct ReplaceWireguardKeyRequest: Encodable {
-        let old: Data
-        let new: Data
-    }
-
     fileprivate struct CreateApplePaymentRequest: Encodable {
         let receiptString: Data
     }