fix: transform url minor changes

lib/supabase/client.ex

@@ -275,17 +275,10 @@ defmodule Supabase.Client do
   @spec put_storage_url(Ecto.Changeset.t()) :: Ecto.Changeset.t()
   defp put_storage_url(%Ecto.Changeset{} = changeset) do
     base_url = get_field(changeset, :base_url)
-    storage_config = get_field(changeset, :storage)
 
     if is_binary(base_url) and base_url != "" do
       default_storage_url = Path.join(base_url, "storage/v1")
-
-      storage_url =
-        if storage_config && storage_config.use_new_hostname do
-          Storage.Hostname.transform_storage_url(default_storage_url)
-        else
-          default_storage_url
-        end
+      storage_url = Storage.Hostname.transform_storage_url(default_storage_url)
 
       put_change(changeset, :storage_url, storage_url)
     else

test/supabase/client/storage/hostname_test.exs

@@ -6,34 +6,21 @@ defmodule Supabase.Client.Storage.HostnameTest do
   doctest Supabase.Client.Storage.Hostname
 
   describe "transform_storage_url/1" do
-    test "transforms .supabase.co domain to storage subdomain" do
-      assert Hostname.transform_storage_url("https://abc123.supabase.co/storage/v1") ==
-               "https://abc123.storage.supabase.co/storage/v1"
-    end
+    for {tld, project} <- [{"co", "abc123"}, {"in", "project"}, {"red", "xyz789"}] do
+      test "transforms .supabase.#{tld} domain to storage subdomain" do
+        tld = unquote(tld)
+        project = unquote(project)
 
-    test "transforms .supabase.in domain to storage subdomain" do
-      assert Hostname.transform_storage_url("https://project.supabase.in/storage/v1") ==
-               "https://project.storage.supabase.in/storage/v1"
-    end
+        assert Hostname.transform_storage_url("https://#{project}.supabase.#{tld}/storage/v1") ==
+                 "https://#{project}.storage.supabase.#{tld}/storage/v1"
+      end
 
-    test "transforms .supabase.red domain to storage subdomain" do
-      assert Hostname.transform_storage_url("https://xyz789.supabase.red/storage/v1") ==
-               "https://xyz789.storage.supabase.red/storage/v1"
-    end
-
-    test "skips URLs that already have storage subdomain (.co)" do
-      url = "https://abc123.storage.supabase.co/storage/v1"
-      assert Hostname.transform_storage_url(url) == url
-    end
-
-    test "skips URLs that already have storage subdomain (.in)" do
-      url = "https://project.storage.supabase.in/storage/v1"
-      assert Hostname.transform_storage_url(url) == url
-    end
-
-    test "skips URLs that already have storage subdomain (.red)" do
-      url = "https://xyz.storage.supabase.red/storage/v1"
-      assert Hostname.transform_storage_url(url) == url
+      test "skips URLs that already have storage subdomain (.#{tld})" do
+        tld = unquote(tld)
+        project = unquote(project)
+        url = "https://#{project}.storage.supabase.#{tld}/storage/v1"
+        assert Hostname.transform_storage_url(url) == url
+      end
     end
 
     test "leaves custom domains unchanged" do
@@ -85,22 +72,22 @@ defmodule Supabase.Client.Storage.HostnameTest do
       assert Hostname.transform_storage_url("") == ""
     end
 
-    test "handles URL without path" do
+    test "handles URL different semantics" do
+      # without path
       assert Hostname.transform_storage_url("https://test.supabase.co") ==
                "https://test.storage.supabase.co"
-    end
 
-    test "handles URL with only root path" do
+      # only root path
       assert Hostname.transform_storage_url("https://test.supabase.co/") ==
                "https://test.storage.supabase.co/"
     end
 
-    test "handles subdomain with hyphens" do
-      assert Hostname.transform_storage_url("https://my-project-123.supabase.co/storage/v1") ==
-               "https://my-project-123.storage.supabase.co/storage/v1"
-    end
+    test "handles subdomain alpha-numeric chars" do
+      # with hyphens
+      assert Hostname.transform_storage_url("https://my-project.supabase.co/storage/v1") ==
+               "https://my-project.storage.supabase.co/storage/v1"
 
-    test "handles subdomain with numbers" do
+      # with numbers
       assert Hostname.transform_storage_url("https://123project.supabase.co/storage/v1") ==
                "https://123project.storage.supabase.co/storage/v1"
     end

test/supabase/client_test.exs

@@ -7,7 +7,7 @@ defmodule Supabase.ClientTest do
   @valid_api_key "test_api_key"
 
   describe "Client struct defaults" do
-    test "has default values for db, global, auth, and storage fields" do
+    test "has default values for db, global and auth fields" do
       client = %Client{}
 
       assert client.db.schema == "public"
@@ -60,45 +60,19 @@ defmodule Supabase.ClientTest do
   end
 
   describe "Storage configuration" do
-    test "uses default storage URL when use_new_hostname is false" do
-      {:ok, client} = Supabase.init_client(@valid_base_url, @valid_api_key)
-
-      assert client.storage_url == "https://test.supabase.co/storage/v1"
-      assert client.storage.use_new_hostname == false
-    end
-
-    test "transforms storage URL when use_new_hostname is true (.co domain)" do
-      {:ok, client} =
-        Supabase.init_client(
-          "https://project.supabase.co",
-          @valid_api_key,
-          storage: %{use_new_hostname: true}
-        )
-
-      assert client.storage_url == "https://project.storage.supabase.co/storage/v1"
-      assert client.storage.use_new_hostname == true
-    end
-
-    test "transforms storage URL when use_new_hostname is true (.in domain)" do
-      {:ok, client} =
-        Supabase.init_client(
-          "https://project.supabase.in",
-          @valid_api_key,
-          storage: %{use_new_hostname: true}
-        )
-
-      assert client.storage_url == "https://project.storage.supabase.in/storage/v1"
-    end
-
-    test "transforms storage URL when use_new_hostname is true (.red domain)" do
-      {:ok, client} =
-        Supabase.init_client(
-          "https://project.supabase.red",
-          @valid_api_key,
-          storage: %{use_new_hostname: true}
-        )
-
-      assert client.storage_url == "https://project.storage.supabase.red/storage/v1"
+    for tld <- ~w(co in red) do
+      test "transforms storage URL (.#{tld} domain)" do
+        tld = unquote(tld)
+
+        {:ok, client} =
+          Supabase.init_client(
+            "https://project.supabase.#{tld}",
+            @valid_api_key,
+            storage: %{use_new_hostname: true}
+          )
+
+        assert client.storage_url == "https://project.storage.supabase.#{tld}/storage/v1"
+      end
     end
 
     test "accepts storage config as keyword list" do