requested changes to mongoose_im_controller.ex

This commit is contained in:
fence 2020-04-27 19:11:03 +02:00
parent 5c7cc10917
commit cc1e2e8d0f
1 changed files with 13 additions and 32 deletions

View File

@ -14,7 +14,7 @@ defmodule Pleroma.Web.MongooseIM.MongooseIMController do
plug(RateLimiter, [name: :authentication, params: ["user"]] when action == :check_password)
def user_exists(conn, %{"user" => username}) do
with %User{} <- Repo.get_by(User, nickname: username, local: true) do
with %User{} <- Repo.get_by(User, nickname: username, local: true, deactivated: false) do
conn
|> json(true)
else
@ -26,27 +26,8 @@ def user_exists(conn, %{"user" => username}) do
end
def check_password(conn, %{"user" => username, "pass" => password}) do
user = Repo.get_by(User, nickname: username, local: true)
state = case user do
nil -> nil
_ -> User.account_status(user)
end
case state do
:deactivated ->
conn
|> put_status(:not_found)
|> json(false)
:confirmation_pending ->
conn
|> put_status(:not_found)
|> json(false)
_ ->
with %User{password_hash: password_hash} <-
user,
with %User{password_hash: password_hash, deactivated: false} <-
Repo.get_by(User, nickname: username, local: true),
true <- Pbkdf2.checkpw(password, password_hash) do
conn
|> json(true)
@ -63,4 +44,4 @@ def check_password(conn, %{"user" => username, "pass" => password}) do
end
end
end
end