[#515] Add asyn await to network layer

nimblehq · Oct 2, 2023 · 670ef6b · 670ef6b
1 parent 3dcd29b
commit 670ef6b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/Tuist/Interfaces/UIKit/Sources/Data/NetworkAPI/Core/NetworkAPIProtocol.swift b/Tuist/Interfaces/UIKit/Sources/Data/NetworkAPI/Core/NetworkAPIProtocol.swift
@@ -3,14 +3,13 @@
 //
 
 import Alamofire
-import Combine
 
 protocol NetworkAPIProtocol {
 
     func performRequest<T: Decodable>(
         _ configuration: RequestConfiguration,
         for type: T.Type
-    ) -> AnyPublisher<T, AFError>
+    ) async throws -> T
 }
 
 extension NetworkAPIProtocol {
@@ -19,16 +18,29 @@ extension NetworkAPIProtocol {
         session: Session,
         configuration: RequestConfiguration,
         decoder: JSONDecoder
-    ) -> AnyPublisher<T, AFError> {
-        return session.request(
-            configuration.url,
-            method: configuration.method,
-            parameters: configuration.parameters,
-            encoding: configuration.encoding,
-            headers: configuration.headers,
-            interceptor: configuration.interceptor
-        )
-        .publishDecodable(type: T.self, decoder: decoder)
-        .value()
+    ) async throws -> T {
+        try await withCheckedThrowingContinuation { continuation in
+            session.request(
+                configuration.url,
+                method: configuration.method,
+                parameters: configuration.parameters,
+                encoding: configuration.encoding,
+                headers: configuration.headers,
+                interceptor: configuration.interceptor
+            )
+            .response { response in
+                switch response.result {
+                case let .success(data):
+                    do {
+                        let decodedData = try decoder.decode(T.self, from: data ?? Data())
+                        continuation.resume(returning: decodedData)
+                    } catch {
+                        continuation.resume(throwing: error)
+                    }
+                case let .failure(error):
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
     }
 }
diff --git a/Tuist/Interfaces/UIKit/Sources/Data/NetworkAPI/NetworkAPI.swift b/Tuist/Interfaces/UIKit/Sources/Data/NetworkAPI/NetworkAPI.swift
@@ -3,7 +3,6 @@
 //
 
 import Alamofire
-import Combine
 
 final class NetworkAPI: NetworkAPIProtocol {
 
@@ -16,8 +15,8 @@ final class NetworkAPI: NetworkAPIProtocol {
     func performRequest<T: Decodable>(
         _ configuration: RequestConfiguration,
         for type: T.Type
-    ) -> AnyPublisher<T, AFError> {
-        request(
+    ) async throws -> T {
+        try await request(
             session: Session(),
             configuration: configuration,
             decoder: decoder