Add storekit 2 functions to mullvad api

2 files changed, 37 insertions, 13 deletions

diff --git a/ios/MullvadREST/MullvadAPI/APIRequest/APIRequest.swift b/ios/MullvadREST/MullvadAPI/APIRequest/APIRequest.swift
index ab1087fe5e..f2ecafdbf6 100644
--- a/ios/MullvadREST/MullvadAPI/APIRequest/APIRequest.swift
+++ b/ios/MullvadREST/MullvadAPI/APIRequest/APIRequest.swift
@@ -18,6 +18,12 @@ public enum APIRequest: Codable, Sendable {
     case createAccount(_ retryStrategy: REST.RetryStrategy)
     case getAccount(_ retryStrategy: REST.RetryStrategy, accountNumber: String)
     case deleteAccount(_ retryStrategy: REST.RetryStrategy, accountNumber: String)
+    case initStorekitPayment(retryStrategy: REST.RetryStrategy, accountNumber: String)
+    case checkStorekitPayment(
+        retryStrategy: REST.RetryStrategy,
+        accountNumber: String,
+        transaction: StorekitTransaction
+    )
 
     // Device Proxy
     case getDevice(_ retryStrategy: REST.RetryStrategy, accountNumber: String, identifier: String)
@@ -55,6 +61,10 @@ public enum APIRequest: Codable, Sendable {
             "rotate-device-key"
         case .createDevice:
             "create-device"
+        case .initStorekitPayment:
+            "init-storekit-payment"
+        case .checkStorekitPayment:
+            "check-storekit-payment"
         }
     }
 
@@ -70,8 +80,10 @@ public enum APIRequest: Codable, Sendable {
              let .getDevice(strategy, _, _),
              let .getDevices(strategy, _),
              let .deleteDevice(strategy, _, _),
-             let .rotateDeviceKey(strategy, _, _, _):
-            return strategy
+             let .rotateDeviceKey(strategy, _, _, _),
+             let .initStorekitPayment(strategy, _),
+             let .checkStorekitPayment(strategy, _, _):
+            strategy
         }
     }
 }
diff --git a/ios/MullvadREST/MullvadAPI/APIRequest/APIRequestProxy.swift b/ios/MullvadREST/MullvadAPI/APIRequest/APIRequestProxy.swift
index 8e2ac4fad2..d204165c0d 100644
--- a/ios/MullvadREST/MullvadAPI/APIRequest/APIRequestProxy.swift
+++ b/ios/MullvadREST/MullvadAPI/APIRequest/APIRequestProxy.swift
@@ -45,20 +45,32 @@ public final class APIRequestProxy: APIRequestProxyProtocol, @unchecked Sendable
                 completion(ProxyAPIResponse(data: nil, error: nil))
                 return
             }
+            do {
+                let cancellable = try transport.sendRequest(proxyRequest.request) { [weak self] response in
+                    guard let self else { return }
 
-            let cancellable = transport.sendRequest(proxyRequest.request) { [weak self] response in
-                guard let self else { return }
-
-                // Use `dispatchQueue` to guarantee thread safe access to `proxiedRequests`
-                dispatchQueue.async {
-                    _ = self.removeRequest(identifier: proxyRequest.id)
-                    completion(response)
+                    // Use `dispatchQueue` to guarantee thread safe access to `proxiedRequests`
+                    dispatchQueue.async {
+                        _ = self.removeRequest(identifier: proxyRequest.id)
+                        completion(response)
+                    }
                 }
-            }
 
-            // Cancel old task, if there's one scheduled.
-            let oldTask = self.addRequest(identifier: proxyRequest.id, task: cancellable)
-            oldTask?.cancel()
+                // Cancel old task, if there's one scheduled.
+                let oldTask = self.addRequest(identifier: proxyRequest.id, task: cancellable)
+                oldTask?.cancel()
+            } catch {
+                completion(
+                    ProxyAPIResponse(
+                        data: nil,
+                        error: APIError(
+                            statusCode: 0,
+                            errorDescription: error.localizedDescription,
+                            serverResponseCode: nil
+                        )
+                    )
+                )
+            }
         }
     }