projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
lib
/
pleroma
/
web
/
auth
/
pleroma_authenticator.ex
diff --git
a/lib/pleroma/web/auth/pleroma_authenticator.ex
b/lib/pleroma/web/auth/pleroma_authenticator.ex
index f4234b743c509909cc8c28cbe63dfe27aed7ce1f..a8f554aa39e8b5f30c2ef5abdaf7f955a404e5a7 100644
(file)
--- a/
lib/pleroma/web/auth/pleroma_authenticator.ex
+++ b/
lib/pleroma/web/auth/pleroma_authenticator.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Auth.PleromaAuthenticator do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Auth.PleromaAuthenticator do
@@
-19,8
+19,8
@@
defmodule Pleroma.Web.Auth.PleromaAuthenticator do
{_, true} <- {:checkpw, AuthenticationPlug.checkpw(password, user.password_hash)} do
{:ok, user}
else
{_, true} <- {:checkpw, AuthenticationPlug.checkpw(password, user.password_hash)} do
{:ok, user}
else
- error ->
-
{:error, error}
+ {:error, _reason} = error -> error
+
error ->
{:error, error}
end
end
end
end