fix: us normal storage/v1 prefix with storage zone

Author: itslenny

src/StorageClient.ts

@@ -2,12 +2,16 @@ import StorageFileApi from './packages/StorageFileApi'
 import StorageBucketApi from './packages/StorageBucketApi'
 import { Fetch } from './lib/fetch'
 
+export interface StorageClientOptions {
+  useNewHostname?: boolean
+}
+
 export class StorageClient extends StorageBucketApi {
   constructor(
     url: string,
     headers: { [key: string]: string } = {},
     fetch?: Fetch,
-    opts?: { useNewHostname?: boolean }
+    opts?: StorageClientOptions
   ) {
     super(url, headers, fetch, opts)
   }

src/packages/StorageBucketApi.ts

@@ -3,6 +3,7 @@ import { isStorageError, StorageError } from '../lib/errors'
 import { Fetch, get, post, put, remove } from '../lib/fetch'
 import { resolveFetch } from '../lib/helpers'
 import { Bucket, BucketType } from '../lib/types'
+import { StorageClientOptions } from '../StorageClient'
 
 export default class StorageBucketApi {
   protected url: string
@@ -13,21 +14,15 @@ export default class StorageBucketApi {
     url: string,
     headers: { [key: string]: string } = {},
     fetch?: Fetch,
-    opts?: { useNewHostname?: boolean }
+    opts?: StorageClientOptions
   ) {
     const baseUrl = new URL(url)
 
     // if legacy uri is used, replace with new storage host (disables request buffering to allow > 50GB uploads)
-    // "project-ref.supabase.co/storage/v1" becomes "project-ref.storage.supabase.co/v1"
+    // "project-ref.supabase.co" becomes "project-ref.storage.supabase.co"
     if (opts?.useNewHostname) {
       const isSupabaseHost = /supabase\.(co|in|red)$/.test(baseUrl.hostname)
-      const legacyStoragePrefix = '/storage'
-      if (
-        isSupabaseHost &&
-        !baseUrl.hostname.includes('storage.supabase.') &&
-        baseUrl.pathname.startsWith(legacyStoragePrefix)
-      ) {
-        baseUrl.pathname = baseUrl.pathname.substring(legacyStoragePrefix.length)
+      if (isSupabaseHost && !baseUrl.hostname.includes('storage.supabase.')) {
         baseUrl.hostname = baseUrl.hostname.replace('supabase.', 'storage.supabase.')
       }
     }

test/storageBucketApi.test.ts

@@ -37,17 +37,17 @@ describe('Bucket API Error Handling', () => {
     const urlTestCases = [
       [
         'https://blah.supabase.co/storage/v1',
-        'https://blah.storage.supabase.co/v1',
+        'https://blah.storage.supabase.co/storage/v1',
         'update legacy prod host to new host',
       ],
       [
         'https://blah.supabase.red/storage/v1',
-        'https://blah.storage.supabase.red/v1',
+        'https://blah.storage.supabase.red/storage/v1',
         'update legacy staging host to new host',
       ],
       [
-        'https://blah.storage.supabase.co/v1',
-        'https://blah.storage.supabase.co/v1',
+        'https://blah.storage.supabase.co/storage/v1',
+        'https://blah.storage.supabase.co/storage/v1',
         'accept new host without modification',
       ],
       [
@@ -63,16 +63,30 @@ describe('Bucket API Error Handling', () => {
     ]
 
     urlTestCases.forEach(([inputUrl, expectUrl, description]) => {
-      it('should ' + description, () => {
+      it('should ' + description + ' if useNewHostname is true', () => {
         const storage = new StorageClient(inputUrl, { apikey: KEY }, undefined, {
           useNewHostname: true,
         })
         expect(storage['url']).toBe(expectUrl)
       })
+      it('should not modify host if useNewHostname is false', () => {
+        const storage = new StorageClient(inputUrl, { apikey: KEY }, undefined, {
+          useNewHostname: false,
+        })
+        expect(storage['url']).toBe(inputUrl)
+      })
     })
   })
 
   describe('listBuckets', () => {
+    it('handles missing authorization errors if header is not provided', async () => {
+      const storage = new StorageClient(URL)
+      const { data, error } = await storage.listBuckets()
+      expect(data).toBeNull()
+      expect(error).not.toBeNull()
+      expect(error?.message).toBe(`headers must have required property 'authorization'`)
+    })
+
     it('handles network errors', async () => {
       const mockError = new Error('Network failure')
       global.fetch = jest.fn().mockImplementation(() => Promise.reject(mockError))