add username field, make it main log-in method
This commit is contained in:
@@ -7,8 +7,8 @@ defmodule PokemonCoutureWeb.UserConfirmationController do
|
||||
render(conn, "new.html")
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => %{"email" => email}}) do
|
||||
if user = Accounts.get_user_by_email(email) do
|
||||
def create(conn, %{"user" => %{"username" => username}}) do
|
||||
if user = Accounts.get_user_by_username(username) do
|
||||
Accounts.deliver_user_confirmation_instructions(
|
||||
user,
|
||||
&Routes.user_confirmation_url(conn, :confirm, &1)
|
||||
|
||||
@@ -9,8 +9,8 @@ defmodule PokemonCoutureWeb.UserResetPasswordController do
|
||||
render(conn, "new.html")
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => %{"email" => email}}) do
|
||||
if user = Accounts.get_user_by_email(email) do
|
||||
def create(conn, %{"user" => %{"username" => username}}) do
|
||||
if user = Accounts.get_user_by_username(username) do
|
||||
Accounts.deliver_user_reset_password_instructions(
|
||||
user,
|
||||
&Routes.user_reset_password_url(conn, :edit, &1)
|
||||
|
||||
@@ -9,12 +9,12 @@ defmodule PokemonCoutureWeb.UserSessionController do
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => user_params}) do
|
||||
%{"email" => email, "password" => password} = user_params
|
||||
%{"username" => username, "password" => password} = user_params
|
||||
|
||||
if user = Accounts.get_user_by_email_and_password(email, password) do
|
||||
if user = Accounts.get_user_by_username_and_password(username, password) do
|
||||
UserAuth.log_in_user(conn, user, user_params)
|
||||
else
|
||||
render(conn, "new.html", error_message: "Invalid email or password")
|
||||
render(conn, "new.html", error_message: "Invalid username or password")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user