fix after rebase

supabase · May 8, 2024 · a3e04b0 · a3e04b0
1 parent 8337e36
commit a3e04b0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/Sources/Auth/Internal/APIClient.swift b/Sources/Auth/Internal/APIClient.swift
@@ -45,7 +45,7 @@ struct APIClient: Sendable {
         throw postgrestError
       }
 
-      throw HTTPError(data: response.data, response: response.response)
+      throw HTTPError(data: response.data, response: response.underlyingResponse)
     }
 
     return response

diff --git a/Sources/Functions/Types.swift b/Sources/Functions/Types.swift
@@ -88,16 +88,6 @@ public struct FunctionInvokeOptions: Sendable {
     case put = "PUT"
     case patch = "PATCH"
     case delete = "DELETE"
-
-    var httpMethod: Request.Method {
-      switch self {
-      case .get: .get
-      case .post: .post
-      case .put: .put
-      case .patch: .patch
-      case .delete: .delete
-      }
-    }
   }
 
   var httpMethod: HTTPMethod? {

diff --git a/Sources/PostgREST/PostgrestBuilder.swift b/Sources/PostgREST/PostgrestBuilder.swift
@@ -120,7 +120,7 @@ public class PostgrestBuilder: @unchecked Sendable {
         throw error
       }
 
-      throw HTTPError(data: response.data, response: response.response)
+      throw HTTPError(data: response.data, response: response.underlyingResponse)
     }
 
     let value = try decode(response.data)

diff --git a/Sources/Storage/StorageApi.swift b/Sources/Storage/StorageApi.swift
@@ -40,7 +40,7 @@ public class StorageApi: @unchecked Sendable {
         throw error
       }
 
-      throw HTTPError(data: response.data, response: response.response)
+      throw HTTPError(data: response.data, response: response.underlyingResponse)
     }
 
     return response

diff --git a/Tests/FunctionsTests/FunctionsClientTests.swift b/Tests/FunctionsTests/FunctionsClientTests.swift
@@ -58,6 +58,22 @@ final class FunctionsClientTests: XCTestCase {
     XCTAssertEqual(request?.headers["X-Client-Info"], "functions-swift/\(Functions.version)")
   }
 
+  func testInvokeWithCustomMethod() async throws {
+    let http = HTTPClientMock().any { _ in try .stub(body: Empty()) }
+
+    let sut = FunctionsClient(
+      url: self.url,
+      headers: ["Apikey": apiKey],
+      region: nil,
+      http: http
+    )
+
+    try await sut.invoke("hello-world", options: .init(method: .delete))
+
+    let request = http.receivedRequests.last
+    XCTAssertEqual(request?.method, .delete)
+  }
+
   func testInvokeWithRegionDefinedInClient() async throws {
     let http = HTTPClientMock()
       .any { _ in try .stub(body: Empty()) }