projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
[akkoma]
/
lib
/
pleroma
/
plugs
/
legacy_authentication_plug.ex
diff --git
a/lib/pleroma/plugs/legacy_authentication_plug.ex
b/lib/pleroma/plugs/legacy_authentication_plug.ex
index 48c0aba8825989aed635062d62439c7e4046e209..78b7e388f955333925b885911a08c33ec08511af 100644
(file)
--- a/
lib/pleroma/plugs/legacy_authentication_plug.ex
+++ b/
lib/pleroma/plugs/legacy_authentication_plug.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Plugs.LegacyAuthenticationPlug do
import Plug.Conn
alias Pleroma.User
defmodule Pleroma.Plugs.LegacyAuthenticationPlug do
import Plug.Conn
alias Pleroma.User
@@
-17,11
+21,15
@@
defmodule Pleroma.Plugs.LegacyAuthenticationPlug do
} = conn,
_
) do
} = conn,
_
) do
- if :crypt.crypt(password, password_hash) == password_hash do
+ with ^password_hash <- :crypt.crypt(password, password_hash),
+ {:ok, user} <-
+ User.reset_password(auth_user, %{password: password, password_confirmation: password}) do
conn
conn
- |> assign(:user, auth_user)
+ |> assign(:auth_user, user)
+ |> assign(:user, user)
else
else
- conn
+ _ ->
+ conn
end
end
end
end