double slash check is now done in live_dashboard_prefix

phoenixframework · Oct 26, 2023 · 7abb707 · 7abb707
1 parent 67f36e1
commit 7abb707
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/phoenix/live_dashboard/layout_view.ex b/lib/phoenix/live_dashboard/layout_view.ex
@@ -27,7 +27,7 @@ defmodule Phoenix.LiveDashboard.LayoutView do
       Phoenix.VerifiedRoutes.unverified_path(
         conn,
         conn.private.phoenix_router,
-        Path.join([prefix, "#{asset}-#{hash}"])
+        "#{prefix}/#{asset}-#{hash}"
       )
     else
       apply(

diff --git a/lib/phoenix/live_dashboard/page_builder.ex b/lib/phoenix/live_dashboard/page_builder.ex
@@ -982,9 +982,9 @@ defmodule Phoenix.LiveDashboard.PageBuilder do
 
       path =
         if node == node() and is_nil(old_params["node"]) do
-          Path.join([prefix, to_string(route)])
+          "#{prefix}/#{route}"
         else
-          Path.join([prefix, URI.encode_www_form(to_string(node)), to_string(route)])
+          "#{prefix}/#{URI.encode_www_form(to_string(node))}/#{route}"
         end
 
       Phoenix.VerifiedRoutes.unverified_path(socket, socket.router, path, new_params)

diff --git a/lib/phoenix/live_dashboard/router.ex b/lib/phoenix/live_dashboard/router.ex
@@ -125,7 +125,9 @@ defmodule Phoenix.LiveDashboard.Router do
         unquote(scope)
 
         unless Module.get_attribute(__MODULE__, :live_dashboard_prefix) do
-          @live_dashboard_prefix Phoenix.Router.scoped_path(__MODULE__, path)
+          @live_dashboard_prefix if path == "/",
+                                   do: "",
+                                   else: Phoenix.Router.scoped_path(__MODULE__, path)
           def __live_dashboard_prefix__, do: @live_dashboard_prefix
         end
       end