squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CookieAuthPlug code quality improvements

Browse Source
This commit is contained in:
Alex Gleason 2020-10-29 16:03:08 -05:00
parent e8b436e1af
commit b2e6dc2636
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/plugs/cookie_auth_plug.ex
View File

@ -11,14 +11,13 @@ defmodule Pleroma.Web.Plugs.CookieAuthPlug do
end end
# If the user is already assigned (by a bearer token, probably), skip ahead. # If the user is already assigned (by a bearer token, probably), skip ahead.
def call(%{assigns: %{user: _}} = conn, _), do: conn def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
# Authenticate with a session cookie, if available. # Authenticate with a session cookie, if available.
# For staticly-rendered pages (like the OAuth form) # For staticly-rendered pages (like the OAuth form)
# this is the only way it can authenticate. # this is the only way it can authenticate.
def call(conn, _) do def call(conn, _) do
with user_id <- get_session(conn, :user_id), with user_id when is_binary(user_id) <- get_session(conn, :user_id),
true <- is_binary(user_id),
%User{} = user <- User.get_by_id(user_id) do %User{} = user <- User.get_by_id(user_id) do
assign(conn, :user, user) assign(conn, :user, user)
else else