test upload file with cache-control header

Author: grdsdev

Sources/Storage/StorageFileApi.swift

@@ -1,6 +1,6 @@
 import Foundation
-import Helpers
 import HTTPTypes
+import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
@@ -419,19 +419,21 @@ public class StorageFileApi: StorageApi, @unchecked Sendable {
   /// Downloads a file from a private bucket. For public buckets, make a request to the URL returned
   /// from ``StorageFileApi/getPublicURL(path:download:fileName:options:)`` instead.
   /// - Parameters:
-  ///   - path: The file path to be downloaded, including the path and file name. For example
-  /// `folder/image.png`.
+  ///   - path: The file path to be downloaded, including the path and file name. For example `folder/image.png`.
   ///   - options: Transform the asset before serving it to the client.
   @discardableResult
-  public func download(path: String, options: TransformOptions? = nil) async throws -> Data {
+  public func download(
+    path: String,
+    options: TransformOptions? = nil
+  ) async throws -> Data {
     let queryItems = options?.queryItems ?? []
-
     let renderPath = options != nil ? "render/image/authenticated" : "object"
+    let _path = _getFinalPath(path)
 
     return try await execute(
       HTTPRequest(
         url: configuration.url
-          .appendingPathComponent("\(renderPath)/\(bucketId)/\(path)"),
+          .appendingPathComponent("\(renderPath)/\(_path)"),
         method: .get,
         query: queryItems
       )

Tests/IntegrationTests/StorageFileIntegrationTests.swift

@@ -14,7 +14,7 @@ final class StorageFileIntegrationTests: XCTestCase {
     configuration: StorageClientConfiguration(
       url: URL(string: "\(DotEnv.SUPABASE_URL)/storage/v1")!,
       headers: [
-        "Authorization": "Bearer \(DotEnv.SUPABASE_SERVICE_ROLE_KEY)",
+        "Authorization": "Bearer \(DotEnv.SUPABASE_SERVICE_ROLE_KEY)"
       ],
       logger: nil
     )
@@ -56,7 +56,8 @@ final class StorageFileIntegrationTests: XCTestCase {
   }
 
   func testGetPublicURLWithCustomDownload() throws {
-    let publicURL = try storage.from(bucketName).getPublicURL(path: uploadPath, download: "test.jpg")
+    let publicURL = try storage.from(bucketName).getPublicURL(
+      path: uploadPath, download: "test.jpg")
     XCTAssertEqual(
       publicURL.absoluteString,
       "\(DotEnv.SUPABASE_URL)/storage/v1/object/public/\(bucketName)/\(uploadPath)?download=test.jpg"
@@ -68,26 +69,31 @@ final class StorageFileIntegrationTests: XCTestCase {
 
     let url = try await storage.from(bucketName).createSignedURL(path: uploadPath, expiresIn: 2000)
     XCTAssertTrue(
-      url.absoluteString.contains("\(DotEnv.SUPABASE_URL)/storage/v1/object/sign/\(bucketName)/\(uploadPath)")
+      url.absoluteString.contains(
+        "\(DotEnv.SUPABASE_URL)/storage/v1/object/sign/\(bucketName)/\(uploadPath)")
     )
   }
 
   func testSignURL_withDownloadQueryString() async throws {
     _ = try await storage.from(bucketName).upload(uploadPath, data: file)
 
-    let url = try await storage.from(bucketName).createSignedURL(path: uploadPath, expiresIn: 2000, download: true)
+    let url = try await storage.from(bucketName).createSignedURL(
+      path: uploadPath, expiresIn: 2000, download: true)
     XCTAssertTrue(
-      url.absoluteString.contains("\(DotEnv.SUPABASE_URL)/storage/v1/object/sign/\(bucketName)/\(uploadPath)")
+      url.absoluteString.contains(
+        "\(DotEnv.SUPABASE_URL)/storage/v1/object/sign/\(bucketName)/\(uploadPath)")
     )
     XCTAssertTrue(url.absoluteString.contains("&download="))
   }
 
   func testSignURL_withCustomFilenameForDownload() async throws {
     _ = try await storage.from(bucketName).upload(uploadPath, data: file)
 
-    let url = try await storage.from(bucketName).createSignedURL(path: uploadPath, expiresIn: 2000, download: "test.jpg")
+    let url = try await storage.from(bucketName).createSignedURL(
+      path: uploadPath, expiresIn: 2000, download: "test.jpg")
     XCTAssertTrue(
-      url.absoluteString.contains("\(DotEnv.SUPABASE_URL)/storage/v1/object/sign/\(bucketName)/\(uploadPath)")
+      url.absoluteString.contains(
+        "\(DotEnv.SUPABASE_URL)/storage/v1/object/sign/\(bucketName)/\(uploadPath)")
     )
     XCTAssertTrue(url.absoluteString.contains("&download=test.jpg"))
   }
@@ -192,15 +198,18 @@ final class StorageFileIntegrationTests: XCTestCase {
   func testCanUploadWithSignedURLForUpload() async throws {
     let res = try await storage.from(bucketName).createSignedUploadURL(path: uploadPath)
 
-    let uploadRes = try await storage.from(bucketName).uploadToSignedURL(res.path, token: res.token, data: file)
+    let uploadRes = try await storage.from(bucketName).uploadToSignedURL(
+      res.path, token: res.token, data: file)
     XCTAssertEqual(uploadRes.path, uploadPath)
   }
 
   func testCanUploadOverwritingFilesWithSignedURL() async throws {
     try await storage.from(bucketName).upload(uploadPath, data: file)
 
-    let res = try await storage.from(bucketName).createSignedUploadURL(path: uploadPath, options: CreateSignedUploadURLOptions(upsert: true))
-    let uploadRes = try await storage.from(bucketName).uploadToSignedURL(res.path, token: res.token, data: file)
+    let res = try await storage.from(bucketName).createSignedUploadURL(
+      path: uploadPath, options: CreateSignedUploadURLOptions(upsert: true))
+    let uploadRes = try await storage.from(bucketName).uploadToSignedURL(
+      res.path, token: res.token, data: file)
     XCTAssertEqual(uploadRes.path, uploadPath)
   }
 
@@ -353,6 +362,24 @@ final class StorageFileIntegrationTests: XCTestCase {
     XCTAssertFalse(exists)
   }
 
+  func testUploadWithCacheControl() async throws {
+    try await storage.from(bucketName).upload(
+      uploadPath,
+      data: file,
+      options: FileOptions(
+        cacheControl: "14400"
+      )
+    )
+
+    let publicURL = try storage.from(bucketName).getPublicURL(path: uploadPath)
+
+    let (_, response) = try await URLSession.shared.data(from: publicURL)
+    let httpResponse = try XCTUnwrap(response as? HTTPURLResponse)
+    let cacheControl = try XCTUnwrap(httpResponse.value(forHTTPHeaderField: "cache-control"))
+
+    XCTAssertEqual(cacheControl, "public, max-age=14400")
+  }
+
   private func newBucket(
     prefix: String = "",
     options: BucketOptions = BucketOptions(public: true)

Tests/StorageTests/SupabaseStorageClient+Test.swift

@@ -27,4 +27,3 @@ extension SupabaseStorageClient {
     )
   }
 }
-