diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:13:56 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:15:40 -0500 |
| commit | bedc558809832ce6ef6063fe91656a0fff0e222c (patch) | |
| tree | f844a11ae25f1866bffb79d9eaf0d66aa2babcd6 /lib/pleroma/plugs/authentication_plug.ex | |
| parent | b54c8813d632cb44c7deb207e91bd32f01f33794 (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into accept-deletes
Diffstat (limited to 'lib/pleroma/plugs/authentication_plug.ex')
| -rw-r--r-- | lib/pleroma/plugs/authentication_plug.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex index 089028d77..0061c69dc 100644 --- a/lib/pleroma/plugs/authentication_plug.ex +++ b/lib/pleroma/plugs/authentication_plug.ex @@ -4,8 +4,11 @@ defmodule Pleroma.Plugs.AuthenticationPlug do alias Comeonin.Pbkdf2 - import Plug.Conn + alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.User + + import Plug.Conn + require Logger def init(options), do: options @@ -37,6 +40,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do if Pbkdf2.checkpw(password, password_hash) do conn |> assign(:user, auth_user) + |> OAuthScopesPlug.skip_plug() else conn end |