no post login page
This commit is contained in:
parent
d16f105f15
commit
11bc5dec4a
2 changed files with 9 additions and 13 deletions
|
|
@ -13,17 +13,16 @@ defmodule ToweropsWeb.UserSessionController do
|
|||
|
||||
# magic link login
|
||||
def create(conn, %{"user" => %{"token" => token} = user_params} = params) do
|
||||
info =
|
||||
case params do
|
||||
%{"_action" => "confirmed"} -> "User confirmed successfully."
|
||||
_ -> "Welcome back!"
|
||||
end
|
||||
|
||||
case Accounts.login_user_by_magic_link(token) do
|
||||
{:ok, {user, _expired_tokens}} ->
|
||||
conn
|
||||
|> put_flash(:info, info)
|
||||
|> UserAuth.log_in_user(user, user_params)
|
||||
conn =
|
||||
if params["_action"] == "confirmed" do
|
||||
put_flash(conn, :info, "User confirmed successfully.")
|
||||
else
|
||||
conn
|
||||
end
|
||||
|
||||
UserAuth.log_in_user(conn, user, user_params)
|
||||
|
||||
{:error, :not_found} ->
|
||||
conn
|
||||
|
|
@ -35,9 +34,7 @@ defmodule ToweropsWeb.UserSessionController do
|
|||
# email + password login
|
||||
def create(conn, %{"user" => %{"email" => email, "password" => password} = user_params}) do
|
||||
if user = Accounts.get_user_by_email_and_password(email, password) do
|
||||
conn
|
||||
|> put_flash(:info, "Welcome back!")
|
||||
|> UserAuth.log_in_user(user, user_params)
|
||||
UserAuth.log_in_user(conn, user, user_params)
|
||||
else
|
||||
form = Phoenix.Component.to_form(user_params, as: "user")
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,6 @@ defmodule ToweropsWeb.UserSessionControllerTest do
|
|||
})
|
||||
|
||||
assert redirected_to(conn) == "/foo/bar"
|
||||
assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Welcome back!"
|
||||
end
|
||||
|
||||
test "emits error message with invalid credentials", %{conn: conn, user: user} do
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue