Skip to content

Fix request headers not fowarded in fetch_upstream #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jdyn wants to merge 4 commits into from
Closed

Fix request headers not fowarded in fetch_upstream #106

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
641be24
Add request header merging in fetch_upstream
Jdyn Sep 6, 2025
9b6aac1
handle header array values
Jdyn Sep 6, 2025
bd9c0c2
update header helper function names
Jdyn Sep 6, 2025
fea774e
Merge remote-tracking branch 'upstream/main' into fix-fowarding-reque…
Jdyn Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions lib/phoenix/sync/electric/client_adapter.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,30 @@ defmodule Phoenix.Sync.Electric.ClientAdapter do
defp live?(live), do: live == "true"

defp fetch_upstream(sync_client, conn, request) do
request = put_req_headers(request, conn.req_headers)

response =
case Client.Fetch.request(sync_client.client, request) do
%Client.Fetch.Response{} = response -> response
{:error, %Client.Fetch.Response{} = response} -> response
end

conn
|> put_headers(response.headers)
|> put_resp_headers(response.headers)
|> Plug.Conn.send_resp(response.status, response.body)
end

defp put_headers(conn, headers) do
defp put_req_headers(request, headers) do
Enum.reduce(headers, request.headers, fn {header, value}, acc ->
Map.update(acc, header, value, fn
existing when is_binary(existing) -> [existing, value]
existing when is_list(existing) -> existing ++ [value]
end)
end)
|> then(&Map.put(request, :headers, &1))
end

defp put_resp_headers(conn, headers) do
headers
|> Map.delete("transfer-encoding")
|> Enum.reduce(conn, fn {header, values}, conn ->
Expand Down