1
0
Fork 0
mirror of https://github.com/benbusby/farside.git synced 2025-04-29 23:20:03 +00:00

Include query params for all /_/ prefixed links

Query params were not included when using the "/_/" prefix for farside
links. This extracts the logic for parsing query params into a function
that is then used for both /_/ and non-/_/ links.
This commit is contained in:
Ben Busby 2022-06-13 10:20:39 -06:00
parent 213658ae6c
commit 6210ed56e7
No known key found for this signature in database
GPG key ID: B9B7231E01D924A1
2 changed files with 14 additions and 14 deletions

View file

@ -8,6 +8,16 @@ defmodule Farside.Router do
plug(:match)
plug(:dispatch)
def get_query_params(conn) do
cond do
String.length(conn.query_string) > 0 ->
"?#{conn.query_string}"
true ->
""
end
end
get "/" do
resp =
EEx.eval_file(
@ -31,8 +41,7 @@ defmodule Farside.Router do
resp =
EEx.eval_file(
@route,
service: service,
instance_url: r_path
instance_url: "#{r_path}#{get_query_params(conn)}"
)
send_resp(conn, 200, resp)
@ -62,21 +71,12 @@ defmodule Farside.Router do
|> Farside.pick_instance
end
params =
cond do
String.length(conn.query_string) > 0 ->
"?#{conn.query_string}"
true ->
""
end
# Redirect to the available instance
conn
|> Plug.Conn.resp(:found, "")
|> Plug.Conn.put_resp_header(
"location",
"#{instance}/#{path}#{params}"
"#{instance}/#{path}#{get_query_params(conn)}"
)
end
end