diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex
index 4819bc780..566899762 100644
--- a/lib/plausible_web/controllers/auth_controller.ex
+++ b/lib/plausible_web/controllers/auth_controller.ex
@@ -194,12 +194,12 @@ defmodule PlausibleWeb.AuthController do
end
end
- def password_reset_form(conn, %{"token" => token}) do
- case Auth.Token.verify_password_reset(token) do
- {:ok, _} ->
+ def password_reset_form(conn, params) do
+ case Auth.Token.verify_password_reset(params["token"]) do
+ {:ok, %{email: email}} ->
render(conn, "password_reset_form.html",
connect_live_socket: true,
- token: token,
+ email: email,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
diff --git a/lib/plausible_web/live/reset_password_form.ex b/lib/plausible_web/live/reset_password_form.ex
index 33ac98fec..50794a58d 100644
--- a/lib/plausible_web/live/reset_password_form.ex
+++ b/lib/plausible_web/live/reset_password_form.ex
@@ -11,11 +11,9 @@ defmodule PlausibleWeb.Live.ResetPasswordForm do
alias Plausible.Auth
alias Plausible.Repo
- def mount(_params, %{"reset_token" => reset_token}, socket) do
+ def mount(_params, %{"email" => email}, socket) do
socket =
assign_new(socket, :user, fn ->
- # by that point token should be already verified
- {:ok, %{email: email}} = Auth.Token.verify_password_reset(reset_token)
Repo.get_by!(Auth.User, email: email)
end)
@@ -24,7 +22,6 @@ defmodule PlausibleWeb.Live.ResetPasswordForm do
{:ok,
assign(socket,
form: to_form(changeset),
- reset_token: reset_token,
password_strength: Auth.User.password_strength(changeset),
trigger_submit: false
)}
@@ -60,7 +57,6 @@ defmodule PlausibleWeb.Live.ResetPasswordForm do
class="transition bg-gray-100 dark:bg-gray-900 outline-none appearance-none border border-transparent rounded w-full p-2 text-gray-700 dark:text-gray-300 leading-normal appearance-none focus:outline-none focus:bg-white dark:focus:bg-gray-800 focus:border-gray-300 dark:focus:border-gray-500"
/>
-
diff --git a/lib/plausible_web/templates/auth/password_reset_form.html.eex b/lib/plausible_web/templates/auth/password_reset_form.html.eex
index e069e6d79..cc41f4719 100644
--- a/lib/plausible_web/templates/auth/password_reset_form.html.eex
+++ b/lib/plausible_web/templates/auth/password_reset_form.html.eex
@@ -1,4 +1,4 @@
<%= live_render(@conn, PlausibleWeb.Live.ResetPasswordForm,
container: {:div, class: "contents"},
- session: %{"reset_token" => @token}
+ session: %{"email" => @email}
) %>
diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exs
index 7bd010523..eb9e3b7da 100644
--- a/test/plausible_web/controllers/auth_controller_test.exs
+++ b/test/plausible_web/controllers/auth_controller_test.exs
@@ -409,16 +409,17 @@ defmodule PlausibleWeb.AuthControllerTest do
assert html_response(conn, 401) =~ "Your token is invalid"
end
+
+ test "without token - shows error page", %{conn: conn} do
+ conn = get(conn, "/password/reset", %{})
+
+ assert html_response(conn, 401) =~ "Your token is invalid"
+ end
end
describe "POST /password/reset" do
- alias Plausible.Auth.Token
-
test "redirects the user to login and shows success message", %{conn: conn} do
- user = insert(:user)
- token = Token.sign_password_reset(user.email)
-
- conn = post(conn, "/password/reset", %{token: token})
+ conn = post(conn, "/password/reset", %{})
assert location = "/login" = redirected_to(conn, 302)
diff --git a/test/plausible_web/live/reset_password_form_test.exs b/test/plausible_web/live/reset_password_form_test.exs
index c8fd5560f..e2502aacd 100644
--- a/test/plausible_web/live/reset_password_form_test.exs
+++ b/test/plausible_web/live/reset_password_form_test.exs
@@ -18,9 +18,8 @@ defmodule PlausibleWeb.Live.ResetPasswordFormTest do
type_into_passowrd(lv, "very-secret-and-very-long-123")
html = lv |> element("form") |> render_submit()
- assert [csrf_input, password_input, token_input | _] = find(html, "input")
+ assert [csrf_input, password_input | _] = find(html, "input")
assert String.length(text_of_attr(csrf_input, "value")) > 0
- assert text_of_attr(token_input, "value") == token
assert text_of_attr(password_input, "value") == "very-secret-and-very-long-123"
assert %{password_hash: new_hash} = Repo.one(User)
assert new_hash != user.password_hash