projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into restrict-domain
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
authentication_plug.ex
diff --git
a/lib/pleroma/web/plugs/authentication_plug.ex
b/lib/pleroma/web/plugs/authentication_plug.ex
index 057ea42f152f5e098a05708ff5d3b8b3571a576f..e2a8b1b69366062b8571f861ed17db1e56fd403c 100644
(file)
--- a/
lib/pleroma/web/plugs/authentication_plug.ex
+++ b/
lib/pleroma/web/plugs/authentication_plug.ex
@@
-2,8
+2,7
@@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Plugs.AuthenticationPlug do
- alias Pleroma.Plugs.OAuthScopesPlug
+defmodule Pleroma.Web.Plugs.AuthenticationPlug do
alias Pleroma.User
import Plug.Conn
alias Pleroma.User
import Plug.Conn
@@
-65,7
+64,7
@@
defmodule Pleroma.Plugs.AuthenticationPlug do
conn
|> assign(:user, auth_user)
conn
|> assign(:user, auth_user)
- |> OAuthScopesPlug.skip_plug()
+ |>
Pleroma.Web.Plugs.
OAuthScopesPlug.skip_plug()
else
conn
end
else
conn
end