Don't log in deactivated users.
This commit is contained in:
parent
e31a5ff4af
commit
0ec5aeb8a7
3 changed files with 30 additions and 1 deletions
|
|
@ -12,6 +12,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
|
|||
def call(conn, opts) do
|
||||
with {:ok, username, password} <- decode_header(conn),
|
||||
{:ok, user} <- opts[:fetcher].(username),
|
||||
false <- !!user.info["deactivated"],
|
||||
saved_user_id <- get_session(conn, :user_id),
|
||||
{:ok, verified_user} <- verify(user, password, saved_user_id)
|
||||
do
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ defmodule Pleroma.Plugs.OAuthPlug do
|
|||
end
|
||||
with token when not is_nil(token) <- token,
|
||||
%Token{user_id: user_id} <- Repo.get_by(Token, token: token),
|
||||
%User{} = user <- Repo.get(User, user_id) do
|
||||
%User{} = user <- Repo.get(User, user_id),
|
||||
false <- !!user.info["deactivated"] do
|
||||
conn
|
||||
|> assign(:user, user)
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue