review

Author: ethanndickson

Coder Desktop/Coder Desktop/Preview Content/PreviewClient.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import Alamofire
 
 struct PreviewClient: Client {
     init(url _: URL, token _: String? = nil) {}
@@ -22,7 +23,7 @@ struct PreviewClient: Client {
                 roles: []
             )
         } catch {
-            throw ClientError.badResponse
+            throw ClientError.reqError(AFError.explicitlyCancelled)
         }
     }
 }

Coder Desktop/Coder Desktop/SDK/Client.swift

@@ -35,14 +35,11 @@ struct CoderClient: Client {
             parameters: body,
             headers: headers
         ).serializingData().response
-        guard let response = out.response else {
-            throw ClientError.noResponse
-        }
         switch out.result {
         case .success(let data):
-            return HTTPResponse(resp: response, data: data, req: out.request)
-        case .failure:
-            throw ClientError.badResponse
+            return HTTPResponse(resp: out.response!, data: data, req: out.request)
+        case .failure(let error):
+            throw ClientError.reqError(error)
         }
     }
 
@@ -57,28 +54,26 @@ struct CoderClient: Client {
             method: method,
             headers: headers
         ).serializingData().response
-        guard let response = out.response else {
-            throw ClientError.noResponse
-        }
         switch out.result {
         case .success(let data):
-            return HTTPResponse(resp: response, data: data, req: out.request)
-        case .failure:
-            throw ClientError.badResponse
+            return HTTPResponse(resp: out.response!, data: data, req: out.request)
+        case .failure(let error):
+            throw ClientError.reqError(error)
         }
     }
 
-    func responseAsError(_ resp: HTTPResponse) throws(ClientError) -> APIError {
+    func responseAsError(_ resp: HTTPResponse) -> ClientError {
         do {
             let body = try CoderClient.decoder.decode(Response.self, from: resp.data)
-            return APIError(
+            let out = APIError(
                 response: body,
                 statusCode: resp.resp.statusCode,
                 method: resp.req?.httpMethod,
                 url: resp.req?.url
             )
+            return ClientError.apiError(out)
         } catch {
-            throw ClientError.badResponse
+            return ClientError.unexpectedResponse(resp.data[...1024])
         }
     }
 
@@ -130,17 +125,17 @@ struct ValidationError: Decodable {
 
 enum ClientError: Error {
     case apiError(APIError)
-    case badResponse
-    case noResponse
+    case reqError(AFError)
+    case unexpectedResponse(Data)
 
     var description: String {
         switch self {
         case .apiError(let error):
             return error.description
-        case .badResponse:
-            return "Bad response"
-        case .noResponse:
-            return "No response"
+        case .reqError(let error):
+            return error.localizedDescription
+        case .unexpectedResponse(let data):
+            return "Unexpected response: \(data)"
         }
     }
 }

Coder Desktop/Coder Desktop/SDK/User.swift

@@ -4,13 +4,12 @@ extension CoderClient {
     func user(_ ident: String) async throws(ClientError) -> User {
         let res = try await request("/api/v2/users/\(ident)", method: .get)
         guard res.resp.statusCode == 200 else {
-            let error = try responseAsError(res)
-            throw ClientError.apiError(error)
+            throw responseAsError(res)
         }
         do {
             return try CoderClient.decoder.decode(User.self, from: res.data)
         } catch {
-            throw ClientError.badResponse
+            throw ClientError.unexpectedResponse(res.data[...1024])
         }
     }
 }

Coder Desktop/Coder DesktopTests/Util.swift

@@ -69,7 +69,7 @@ struct MockClient: Client {
 struct MockErrorClient: Client {
     init(url: URL, token: String?) {}
     func user(_ ident: String) async throws(ClientError) -> Coder_Desktop.User {
-        throw ClientError.badResponse
+        throw ClientError.reqError(.explicitlyCancelled)
     }
 }