Throw errors on HTTP errors

Author: piperswe

Sources/VehicleKit/APIs/VKBMWConnectedDriveAPI.swift

@@ -5,19 +5,13 @@ public class VKBMWConnectedDriveAPI: VKVehicleAPIBase<VKBMWConnectedDriveAPI.Cre
         case authenticatingWithoutCredentials
         case cantEncodeRequestBody
         case invalidAuthConfig
-        case authResponseNotHTTP
-        case authResponseMissingLocation(
-            status: Int,
-            headers: [AnyHashable: Any],
-            responseData: Data,
-            responseString: String?
-        )
         case cantDecodeAuthResponseLocation(location: String)
         case authResponseMissingToken(location: String)
         case authResponseMissingExpires(location: String)
         case invalidHost
         case responseInvalid
         case invalidURL
+        case invalidRedirectTo(redirectTo: String)
     }
 
     public struct Credentials: Codable {
@@ -107,7 +101,7 @@ public class VKBMWConnectedDriveAPI: VKVehicleAPIBase<VKBMWConnectedDriveAPI.Cre
             throw APIError.cantEncodeRequestBody
         }
         let url = try pathToURL(path: authConfig.endpoints.authenticate)
-        let response: AuthResponse = try await VKHTTP.request(
+        let response: VKHTTP.Response<AuthResponse> = try await VKHTTP.request(
             url,
             method: "POST",
             body: body.data(using: .utf8),
@@ -118,8 +112,12 @@ public class VKBMWConnectedDriveAPI: VKVehicleAPIBase<VKBMWConnectedDriveAPI.Cre
                 "Referer": "https://login.bmwusa.com/",
                 "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36"
             ]
-        ).data
-        return String(response.redirectTo.dropFirst("redirect_uri=".count))
+        )
+        let redirectTo = response.data.redirectTo
+        if !redirectTo.starts(with: "redirect_uri=") {
+            throw APIError.invalidRedirectTo(redirectTo: redirectTo)
+        }
+        return String(redirectTo.dropFirst("redirect_uri=".count))
     }
 
     private func authenticate() async throws -> Session {

Sources/VehicleKit/VKHTTP.swift

@@ -4,11 +4,12 @@ struct VKHTTP {
     enum HTTPError: Error {
         case incompleteResponse
         case invalidURL
+        case errorStatus(code: Int, body: String?, rawBody: Data)
     }
 
     struct Response<ResponseType: Codable> {
         let data: ResponseType
-        let response: URLResponse
+        let response: HTTPURLResponse
     }
 
     static let jsonDecoder = JSONDecoder()
@@ -25,18 +26,25 @@ struct VKHTTP {
             request.setValue(header.value, forHTTPHeaderField: header.key)
         }
         request.httpBody = body
-        let (data, response): (Data, URLResponse) = try await withCheckedThrowingContinuation { continuation in
+        let (data, response): (Data, HTTPURLResponse) = try await withCheckedThrowingContinuation { continuation in
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
                 if let error = error {
                     continuation.resume(throwing: error)
-                } else if let data = data, let response = response {
+                } else if let data = data, let response = response as? HTTPURLResponse {
                     continuation.resume(returning: (data, response))
                 } else {
                     continuation.resume(throwing: HTTPError.incompleteResponse)
                 }
             }
             task.resume()
         }
+        if response.statusCode >= 400 {
+            throw HTTPError.errorStatus(
+                code: response.statusCode,
+                body: String(decoding: data, as: UTF8.self),
+                rawBody: data
+            )
+        }
         return Response(data: data, response: response)
     }