From ca1473b63f86a4758feb23ca87349ff7979a943b Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Tue, 28 Nov 2023 16:07:22 +0100 Subject: [PATCH] Extract 2FA cookie deletion --- lib/plausible_web/controllers/auth_controller.ex | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index bfadda8b3..a7299a1e6 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -372,7 +372,7 @@ defmodule PlausibleWeb.AuthController do case Auth.TOTP.disable(conn.assigns.current_user, password) do {:ok, _} -> conn - |> delete_resp_cookie(@remember_2fa_cookie, sign: true, max_age: @remember_2fa_seconds) + |> clear_remember_2fa() |> put_flash(:success, "Two-factor authentication is disabled") |> redirect(to: Routes.auth_path(conn, :user_settings) <> "#setup-2fa") @@ -528,6 +528,13 @@ defmodule PlausibleWeb.AuthController do defp maybe_set_remember_2fa(conn, _), do: conn + defp clear_remember_2fa(conn) do + delete_resp_cookie(conn, @remember_2fa_cookie, + sign: true, + max_age: @remember_2fa_seconds + ) + end + defp get_2fa_user_limited(conn) do case get_2fa_user(conn) do {:ok, user} ->