+
+
+
+ <%= icon_div @socket, "bi-shield-lock", [class: "icon baseline"] %>
+ Reset password
+
+
Hi <%= @user.email %> — What new word of passage will confirm you are who you say you are?
+
+ <%= form_for @changeset, "#", [phx_change: :validate, phx_submit: :save, novalidate: true, id: "pw_reset_form"], fn f -> %>
+
+
+ <%= label f, :password, "New password", class: "form-label" %>
+
+
+ <%= icon_div @socket, "bi-key", [class: "icon fs-5"] %>
+
+ <%= password_input f, :password,
+ value: input_value(f, :password),
+ class: input_class(f, :password, "form-control"),
+ maxlength: User.max_password,
+ autofocus: true,
+ aria_describedby: error_id(f, :password)
+ %>
+ <%= error_tag f, :password %>
+
+
+
+
+ <%= label f, :password_confirmation, "Confirm new password", class: "form-label" %>
+
+
+ <%= icon_div @socket, "bi-key-fill", [class: "icon fs-5"] %>
+
+ <%= password_input f, :password_confirmation,
+ value: input_value(f, :password_confirmation),
+ class: input_class(f, :password_confirmation, "form-control"),
+ maxlength: User.max_password,
+ aria_describedby: error_id(f, :password_confirmation)
+ %>
+ <%= error_tag f, :password_confirmation %>
+
+
+
+
+ <%= submit "Reset password", disabled: !@changeset.valid?, class: "btn btn-primary", phx_disable_with: "Saving..." %>
+
+
+ <% end %>
+
+
+ <%= link "Register", to: Routes.user_registration_path(@socket, :new) %> |
+ <%= link "Log in", to: Routes.user_session_path(@socket, :new) %>
+
+
+
+
We'll send you another email with a link to confirm your email address.
+ We'll send you another email with instructions to confirm your email address.
<%= form_for :user, Routes.user_confirmation_path(@conn, :create), [class: "needs-validation", novalidate: true], fn f -> %>
diff --git a/lib/bones73k_web/templates/user_reset_password/edit.html.eex b/lib/bones73k_web/templates/user_reset_password/edit.html.eex
deleted file mode 100644
index 94a550a4..00000000
--- a/lib/bones73k_web/templates/user_reset_password/edit.html.eex
+++ /dev/null
@@ -1,26 +0,0 @@
-
- <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
- <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
-
diff --git a/lib/bones73k_web/templates/user_reset_password/new.html.eex b/lib/bones73k_web/templates/user_reset_password/new.html.eex
index 619c535c..891b97af 100644
--- a/lib/bones73k_web/templates/user_reset_password/new.html.eex
+++ b/lib/bones73k_web/templates/user_reset_password/new.html.eex
@@ -1,15 +1,38 @@
-
+
-<%= form_for :user, Routes.user_reset_password_path(@conn, :create), fn f -> %>
- <%= label f, :email %>
- <%= email_input f, :email, required: true %>
+
+ <%= icon_div @conn, "mdi-head-question-outline", [class: "icon baseline"] %>
+ Forgot your password?
+
+
We'll send you an email with instructions to reset your password.
+
+ <%= form_for :user, Routes.user_reset_password_path(@conn, :create), [class: "needs-validation", novalidate: true], fn f -> %>
+
+ <%= label f, :email, class: "form-label" %>
+
+
+ <%= icon_div @conn, "bi-at", [class: "icon fs-5"] %>
+
+ <%= email_input f, :email,
+ placeholder: "e.g., babka@73k.us",
+ class: "form-control",
+ maxlength: User.max_email,
+ required: true,
+ autofocus: true
+ %>
+ must be a valid email address
+
+
+
+ <%= submit "Send instructions to reset password", class: "btn btn-primary" %>
+
+ <% end %>
+
+
+ <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
+ <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
+
-
- <%= submit "Send instructions to reset password" %>
-<% end %>
-
-
- <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
- <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
-
+
diff --git a/lib/bones73k_web/templates/user_session/new.html.eex b/lib/bones73k_web/templates/user_session/new.html.eex
index 995a0be8..f251bf39 100644
--- a/lib/bones73k_web/templates/user_session/new.html.eex
+++ b/lib/bones73k_web/templates/user_session/new.html.eex
@@ -2,7 +2,7 @@
- <%= icon_div @conn, "bi-box-arrow-in-left", [class: "icon baseline"] %>
+ <%= icon_div @conn, "bi-door-open", [class: "icon baseline"] %>
Log in
Who goes there?
@@ -32,7 +32,7 @@
<%= label f, :password, class: "form-label" %>
- <%= icon_div @conn, "bi-shield-lock", [class: "icon fs-5"] %>
+ <%= icon_div @conn, "bi-lock", [class: "icon fs-5"] %>
<%= password_input f, :password,
class: "form-control",
diff --git a/lib/bones73k_web/views/user_reset_password_view.ex b/lib/bones73k_web/views/user_reset_password_view.ex
index c8a1f908..a2c1d190 100644
--- a/lib/bones73k_web/views/user_reset_password_view.ex
+++ b/lib/bones73k_web/views/user_reset_password_view.ex
@@ -1,3 +1,4 @@
defmodule Bones73kWeb.UserResetPasswordView do
use Bones73kWeb, :view
+ alias Bones73k.Accounts.User
end
diff --git a/test/bones73k_web/controllers/user_reset_password_controller_test.exs b/test/bones73k_web/controllers/user_reset_password_controller_test.exs
index 1b429b8e..9a7de0ec 100644
--- a/test/bones73k_web/controllers/user_reset_password_controller_test.exs
+++ b/test/bones73k_web/controllers/user_reset_password_controller_test.exs
@@ -13,7 +13,7 @@ defmodule Bones73kWeb.UserResetPasswordControllerTest do
test "renders the reset password page", %{conn: conn} do
conn = get(conn, Routes.user_reset_password_path(conn, :new))
response = html_response(conn, 200)
- assert response =~ "
Forgot your password?
"
+ assert response =~ "Forgot your password?\n "
end
end
@@ -52,9 +52,10 @@ defmodule Bones73kWeb.UserResetPasswordControllerTest do
%{token: token}
end
- test "renders reset password", %{conn: conn, token: token} do
+ test "renders reset password with user_id in session", %{conn: conn, token: token, user: user} do
conn = get(conn, Routes.user_reset_password_path(conn, :edit, token))
- assert html_response(conn, 200) =~ "Reset password
"
+ assert get_session(conn, "user_id") == user.id
+ assert html_response(conn, 200) =~ "Reset password\n "
end
test "does not render reset password with invalid token", %{conn: conn} do
@@ -73,41 +74,5 @@ defmodule Bones73kWeb.UserResetPasswordControllerTest do
%{token: token}
end
-
- test "resets password once", %{conn: conn, user: user, token: token} do
- conn =
- put(conn, Routes.user_reset_password_path(conn, :update, token), %{
- "user" => %{
- "password" => "new valid password",
- "password_confirmation" => "new valid password"
- }
- })
-
- assert redirected_to(conn) == Routes.user_session_path(conn, :new)
- refute get_session(conn, :user_token)
- assert get_flash(conn, :info) =~ "Password reset successfully"
- assert Accounts.get_user_by_email_and_password(user.email, "new valid password")
- end
-
- test "does not reset password on invalid data", %{conn: conn, token: token} do
- conn =
- put(conn, Routes.user_reset_password_path(conn, :update, token), %{
- "user" => %{
- "password" => "too short",
- "password_confirmation" => "does not match"
- }
- })
-
- response = html_response(conn, 200)
- assert response =~ "Reset password
"
- assert response =~ "should be at least 12 character(s)"
- assert response =~ "does not match password"
- end
-
- test "does not reset password with invalid token", %{conn: conn} do
- conn = put(conn, Routes.user_reset_password_path(conn, :update, "oops"))
- assert redirected_to(conn) == "/"
- assert get_flash(conn, :error) =~ "Reset password link is invalid or it has expired"
- end
end
end
diff --git a/test/bones73k_web/live/user/registration_test.ex b/test/bones73k_web/live/user/registration_test.exs
similarity index 94%
rename from test/bones73k_web/live/user/registration_test.ex
rename to test/bones73k_web/live/user/registration_test.exs
index 06f3a6a1..76b72a2a 100644
--- a/test/bones73k_web/live/user/registration_test.ex
+++ b/test/bones73k_web/live/user/registration_test.exs
@@ -1,8 +1,6 @@
defmodule Bones73kWeb.UserLive.RegistrationTest do
use Bones73kWeb.ConnCase
- # import Plug.Conn
- # import Phoenix.ConnTest
import Phoenix.LiveViewTest
import Bones73k.AccountsFixtures
@@ -34,10 +32,11 @@ defmodule Bones73kWeb.UserLive.RegistrationTest do
assert html =~ "Register\n "
assert html =~ "must be a valid email address"
assert html =~ "should be at least #{User.min_password()} character(s)"
+ assert html =~ "type=\"submit\" disabled=\"disabled\""
end
@tag :capture_log
- test "creates account and sets login params_token and phx-trigger-action", %{
+ test "creates account, sets login token & phx-trigger-action", %{
conn: conn,
user_return_to: user_return_to
} do
diff --git a/test/bones73k_web/live/user/reset_password_test.exs b/test/bones73k_web/live/user/reset_password_test.exs
new file mode 100644
index 00000000..afab58d1
--- /dev/null
+++ b/test/bones73k_web/live/user/reset_password_test.exs
@@ -0,0 +1,57 @@
+defmodule Bones73kWeb.UserLive.ResetPasswordTest do
+ use Bones73kWeb.ConnCase
+
+ import Phoenix.LiveViewTest
+ import Bones73k.AccountsFixtures
+
+ alias Bones73k.Repo
+ alias Bones73k.Accounts
+ alias Bones73k.Accounts.User
+ alias Bones73k.Accounts.UserToken
+
+ setup %{conn: conn} do
+ user = user_fixture()
+ conn = init_test_session(conn, %{"user_id" => user.id})
+ %{conn: conn, user: user}
+ end
+
+ test "displays registration form", %{conn: conn, user: user} do
+ {:ok, _view, html} = live_isolated(conn, Bones73kWeb.UserLive.ResetPassword)
+
+ assert html =~ "Reset password\n "
+ assert html =~ user.email
+ assert html =~ "New password"
+ end
+
+ test "render errors for invalid data", %{conn: conn} do
+ {:ok, view, _html} = live_isolated(conn, Bones73kWeb.UserLive.ResetPassword)
+
+ form_data = %{"user" => %{"password" => "abc", "password_confirmation" => "def"}}
+ html = form(view, "#pw_reset_form", form_data) |> render_change()
+
+ assert html =~ "Reset password\n "
+ assert html =~ "should be at least #{User.min_password()} character(s)"
+ assert html =~ "does not match password"
+ assert html =~ "type=\"submit\" disabled=\"disabled\""
+ end
+
+ @tag :capture_log
+ test "saves new password once", %{conn: conn, user: user} do
+ {:ok, view, _html} = live_isolated(conn, Bones73kWeb.UserLive.ResetPassword)
+
+ # Render submitting a new password
+ new_pw = "valid_new_pass_123"
+ form_data = %{"user" => %{"password" => new_pw, "password_confirmation" => new_pw}}
+ _html = form(view, "#pw_reset_form", form_data) |> render_submit()
+
+ # Confirm redirected
+ flash = assert_redirected(view, Routes.user_session_path(conn, :new))
+ assert flash["success"] == "Password reset successfully."
+
+ # Confirm password was updated
+ assert Accounts.get_user_by_email_and_password(user.email, new_pw)
+
+ # Tokens have been deleted
+ assert [] == Repo.all(UserToken.user_and_contexts_query(user, :all))
+ end
+end