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

Fixed formatting and test

This commit is contained in:
Syldexia 2018-05-13 14:56:59 +01:00
parent 5bfb7b4ce6
commit 98b36d359a
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/common_api/utils.ex
View File

@ -189,7 +189,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def confirm_current_password(user, params) do def confirm_current_password(user, params) do
with %User{local: true} = db_user <- Repo.get(User, user.id), with %User{local: true} = db_user <- Repo.get(User, user.id),
true <- Pbkdf2.checkpw(params["password"], db_user.password_hash) do true <- Pbkdf2.checkpw(params["password"], db_user.password_hash) do
{:ok, db_user} {:ok, db_user}
else else
_ -> {:error, "Invalid password."} _ -> {:error, "Invalid password."}

9
test/web/common_api/common_api_utils_test.exs
View File

@ -18,19 +18,14 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
end end
describe "it confirms the password given is the current users password" do describe "it confirms the password given is the current users password" do
test "with no credentials" do test "incorrect password given" do
assert Utils.confirm_current_password(nil, %{"password" => "test"}) ==
{:error, "Invalid credentials."}
end
test "with incorrect password given" do
{:ok, user} = UserBuilder.insert() {:ok, user} = UserBuilder.insert()
assert Utils.confirm_current_password(user, %{"password" => ""}) == assert Utils.confirm_current_password(user, %{"password" => ""}) ==
{:error, "Invalid password."} {:error, "Invalid password."}
end end
test "with correct password given" do test "correct password given" do
{:ok, user} = UserBuilder.insert() {:ok, user} = UserBuilder.insert()
assert Utils.confirm_current_password(user, %{"password" => "test"}) == {:ok, user} assert Utils.confirm_current_password(user, %{"password" => "test"}) == {:ok, user}
end end