Skip to content
This repository has been archived by the owner on Aug 3, 2020. It is now read-only.

Commit

Permalink
Remove unecessary user_ prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed May 6, 2020
1 parent 4113391 commit 2b92a22
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions lib/demo/accounts.ex
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ defmodule Demo.Accounts do
def update_user_email(user, token) do
context = "change:#{user.email}"

with {:ok, query} <- UserToken.verify_user_change_email_token_query(token, context),
with {:ok, query} <- UserToken.verify_change_email_token_query(token, context),
%UserToken{sent_to: email} <- Repo.one(query),
{:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
:ok
Expand Down Expand Up @@ -164,7 +164,7 @@ defmodule Demo.Accounts do
def deliver_update_email_instructions(%User{} = user, current_email, update_email_url_fun)
when is_function(update_email_url_fun, 1) do
{encoded_token, user_token} =
UserToken.build_user_email_token(user, "change:#{current_email}")
UserToken.build_email_token(user, "change:#{current_email}")

Repo.insert!(user_token)
UserNotifier.deliver_update_email_instructions(user, update_email_url_fun.(encoded_token))
Expand Down Expand Up @@ -257,7 +257,7 @@ defmodule Demo.Accounts do
if user.confirmed_at do
{:error, :already_confirmed}
else
{encoded_token, user_token} = UserToken.build_user_email_token(user, "confirm")
{encoded_token, user_token} = UserToken.build_email_token(user, "confirm")
Repo.insert!(user_token)
UserNotifier.deliver_confirmation_instructions(user, confirmation_url_fun.(encoded_token))
end
Expand All @@ -270,7 +270,7 @@ defmodule Demo.Accounts do
and the token is deleted.
"""
def confirm_user(token) do
with {:ok, query} <- UserToken.verify_user_email_token_query(token, "confirm"),
with {:ok, query} <- UserToken.verify_email_token_query(token, "confirm"),
%User{} = user <- Repo.one(query),
{:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do
{:ok, user}
Expand Down Expand Up @@ -298,7 +298,7 @@ defmodule Demo.Accounts do
"""
def deliver_user_reset_password_instructions(%User{} = user, reset_password_url_fun)
when is_function(reset_password_url_fun, 1) do
{encoded_token, user_token} = UserToken.build_user_email_token(user, "reset_password")
{encoded_token, user_token} = UserToken.build_email_token(user, "reset_password")
Repo.insert!(user_token)
UserNotifier.deliver_reset_password_instructions(user, reset_password_url_fun.(encoded_token))
end
Expand All @@ -316,7 +316,7 @@ defmodule Demo.Accounts do
"""
def get_user_by_reset_password_token(token) do
with {:ok, query} <- UserToken.verify_user_email_token_query(token, "reset_password"),
with {:ok, query} <- UserToken.verify_email_token_query(token, "reset_password"),
%User{} = user <- Repo.one(query) do
user
else
Expand Down
6 changes: 3 additions & 3 deletions lib/demo/accounts/user_token.ex
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ defmodule Demo.Accounts.UserToken do
The token is valid for a week as long as users don't change
their email.
"""
def build_user_email_token(user, context) do
def build_email_token(user, context) do
build_hashed_token(user, context, user.email)
end

Expand All @@ -76,7 +76,7 @@ defmodule Demo.Accounts.UserToken do
The query returns the user found by the token.
"""
def verify_user_email_token_query(token, context) do
def verify_email_token_query(token, context) do
case Base.url_decode64(token, padding: false) do
{:ok, decoded_token} ->
hashed_token = :crypto.hash(@hash_algorithm, decoded_token)
Expand All @@ -103,7 +103,7 @@ defmodule Demo.Accounts.UserToken do
The query returns the user found by the token.
"""
def verify_user_change_email_token_query(token, context) do
def verify_change_email_token_query(token, context) do
case Base.url_decode64(token, padding: false) do
{:ok, decoded_token} ->
hashed_token = :crypto.hash(@hash_algorithm, decoded_token)
Expand Down

0 comments on commit 2b92a22

Please sign in to comment.