Skip to content

Commit 575a845

Browse files
committed
Collapse cookie updates
1 parent 9f5edc1 commit 575a845

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

‎lib/plug/conn.ex‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ defmodule Plug.Conn do
17221722
{to_send_value, opts} = Plug.Conn.Cookies.sign_or_encrypt(conn, key, value, opts)
17231723
cookie = [{:value, to_send_value} | opts] |> Map.new() |> maybe_secure_cookie(scheme)
17241724
resp_cookies = Map.put(resp_cookies, key, cookie)
1725-
update_cookies(%{conn | resp_cookies: resp_cookies}, &Map.put(&1, key, value))
1725+
update_cookies(conn, resp_cookies, &Map.put(&1, key, value))
17261726
end
17271727

17281728
defp maybe_secure_cookie(cookie, :https), do: Map.put_new(cookie, :secure, true)
@@ -1741,7 +1741,7 @@ defmodule Plug.Conn do
17411741
opts = opts ++ [universal_time: @epoch, max_age: 0]
17421742
cookie = opts |> Map.new() |> maybe_secure_cookie(scheme)
17431743
resp_cookies = Map.put(resp_cookies, key, cookie)
1744-
update_cookies(%{conn | resp_cookies: resp_cookies}, &Map.delete(&1, key))
1744+
update_cookies(conn, resp_cookies, &Map.delete(&1, key))
17451745
end
17461746

17471747
@doc """
@@ -1953,12 +1953,15 @@ defmodule Plug.Conn do
19531953
validate_header_key_value!("set-cookie", cookie)
19541954
end
19551955

1956-
defp update_cookies(%Conn{state: state}, _fun) when state not in @unsent do
1956+
defp update_cookies(%Conn{state: state}, _resp_cookies, _fun) when state not in @unsent do
19571957
raise AlreadySentError
19581958
end
19591959

1960-
defp update_cookies(%Conn{cookies: %Unfetched{}} = conn, _fun), do: conn
1961-
defp update_cookies(%Conn{cookies: cookies} = conn, fun), do: %{conn | cookies: fun.(cookies)}
1960+
defp update_cookies(%Conn{cookies: %Unfetched{}} = conn, resp_cookies, _fun),
1961+
do: %{conn | resp_cookies: resp_cookies}
1962+
1963+
defp update_cookies(%Conn{cookies: cookies} = conn, resp_cookies, fun),
1964+
do: %{conn | resp_cookies: resp_cookies, cookies: fun.(cookies)}
19621965

19631966
defp session_key(binary) when is_binary(binary), do: binary
19641967
defp session_key(atom) when is_atom(atom), do: Atom.to_string(atom)

0 commit comments

Comments
 (0)