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

Commit

Permalink
Add user prefix to session token functions
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed May 17, 2020
1 parent 83d5deb commit 78cb46e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions lib/demo/accounts.ex
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ defmodule Demo.Accounts do
@doc """
Generates a session token.
"""
def generate_session_token(user) do
def generate_user_session_token(user) do
{token, user_token} = UserToken.build_session_token(user)
Repo.insert!(user_token)
token
Expand All @@ -232,7 +232,7 @@ defmodule Demo.Accounts do
@doc """
Deletes the signed token with the given context.
"""
def delete_session_token(token) do
def delete_user_session_token(token) do
Repo.delete_all(UserToken.token_and_context_query(token, "session"))
:ok
end
Expand Down
4 changes: 2 additions & 2 deletions lib/demo_web/controllers/user_auth.ex
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ defmodule DemoWeb.UserAuth do
if you are not using LiveView.
"""
def login_user(conn, user, params \\ %{}) do
token = Accounts.generate_session_token(user)
token = Accounts.generate_user_session_token(user)
user_return_to = get_session(conn, :user_return_to)

conn
Expand Down Expand Up @@ -72,7 +72,7 @@ defmodule DemoWeb.UserAuth do
"""
def logout_user(conn) do
user_token = get_session(conn, :user_token)
user_token && Accounts.delete_session_token(user_token)
user_token && Accounts.delete_user_session_token(user_token)

if live_socket_id = get_session(conn, :live_socket_id) do
DemoWeb.Endpoint.broadcast(live_socket_id, "disconnect", %{})
Expand Down
16 changes: 8 additions & 8 deletions test/demo/accounts_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ defmodule Demo.AccountsTest do
end

test "deletes all tokens for the given user", %{user: user} do
_ = Accounts.generate_session_token(user)
_ = Accounts.generate_user_session_token(user)

{:ok, _} =
Accounts.update_user_password(user, valid_user_password(), %{
Expand All @@ -282,13 +282,13 @@ defmodule Demo.AccountsTest do
end
end

describe "generate_session_token/1" do
describe "generate_user_session_token/1" do
setup do
%{user: user_fixture()}
end

test "generates a token", %{user: user} do
token = Accounts.generate_session_token(user)
token = Accounts.generate_user_session_token(user)
assert user_token = Repo.get_by(UserToken, token: token)
assert user_token.context == "session"

Expand All @@ -306,7 +306,7 @@ defmodule Demo.AccountsTest do
describe "get_user_by_session_token/1" do
setup do
user = user_fixture()
token = Accounts.generate_session_token(user)
token = Accounts.generate_user_session_token(user)
%{user: user, token: token}
end

Expand All @@ -325,11 +325,11 @@ defmodule Demo.AccountsTest do
end
end

describe "delete_session_token/1" do
describe "delete_user_session_token/1" do
test "deletes the token" do
user = user_fixture()
token = Accounts.generate_session_token(user)
assert Accounts.delete_session_token(token) == :ok
token = Accounts.generate_user_session_token(user)
assert Accounts.delete_user_session_token(token) == :ok
refute Accounts.get_user_by_session_token(token)
end
end
Expand Down Expand Up @@ -466,7 +466,7 @@ defmodule Demo.AccountsTest do
end

test "deletes all tokens for the given user", %{user: user} do
_ = Accounts.generate_session_token(user)
_ = Accounts.generate_user_session_token(user)
{:ok, _} = Accounts.reset_user_password(user, %{password: "new valid password"})
refute Repo.get_by(UserToken, user_id: user.id)
end
Expand Down
6 changes: 3 additions & 3 deletions test/demo_web/controllers/user_auth_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ defmodule DemoWeb.UserAuthTest do

describe "logout_user/1" do
test "erases session and cookies", %{conn: conn, user: user} do
user_token = Accounts.generate_session_token(user)
user_token = Accounts.generate_user_session_token(user)

conn =
conn
Expand Down Expand Up @@ -85,7 +85,7 @@ defmodule DemoWeb.UserAuthTest do

describe "fetch_current_user/2" do
test "authenticates user from session", %{conn: conn, user: user} do
user_token = Accounts.generate_session_token(user)
user_token = Accounts.generate_user_session_token(user)
conn = conn |> put_session(:user_token, user_token) |> UserAuth.fetch_current_user([])
assert conn.assigns.current_user.id == user.id
end
Expand All @@ -107,7 +107,7 @@ defmodule DemoWeb.UserAuthTest do
end

test "does not authenticate if data is missing", %{conn: conn, user: user} do
_ = Accounts.generate_session_token(user)
_ = Accounts.generate_user_session_token(user)
conn = UserAuth.fetch_current_user(conn, [])
refute get_session(conn, :user_token)
refute conn.assigns.current_user
Expand Down
2 changes: 1 addition & 1 deletion test/support/conn_case.ex
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ defmodule DemoWeb.ConnCase do
It returns an updated `conn`.
"""
def login_user(conn, user) do
token = Demo.Accounts.generate_session_token(user)
token = Demo.Accounts.generate_user_session_token(user)

conn
|> Phoenix.ConnTest.init_test_session(%{})
Expand Down

0 comments on commit 78cb46e

Please sign in to comment.