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 refactor/discoverable_user_field
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
legacy_authentication_plug.ex
diff --git
a/lib/pleroma/web/plugs/legacy_authentication_plug.ex
b/lib/pleroma/web/plugs/legacy_authentication_plug.ex
index d346e01a6fd515263239bc725a369bdd248fc8fd..2a54d0b5905c2a88841bce78015a2c3debc84415 100644
(file)
--- a/
lib/pleroma/web/plugs/legacy_authentication_plug.ex
+++ b/
lib/pleroma/web/plugs/legacy_authentication_plug.ex
@@
-2,10
+2,9
@@
# 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.LegacyAuthenticationPlug do
+defmodule Pleroma.
Web.
Plugs.LegacyAuthenticationPlug do
import Plug.Conn
import Plug.Conn
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
def init(options) do
alias Pleroma.User
def init(options) do
@@
-29,7
+28,7
@@
defmodule Pleroma.Plugs.LegacyAuthenticationPlug do
conn
|> assign(:auth_user, user)
|> assign(:user, user)
conn
|> assign(:auth_user, user)
|> assign(:user, user)
- |> OAuthScopesPlug.skip_plug()
+ |>
Pleroma.Web.Plugs.
OAuthScopesPlug.skip_plug()
else
_ ->
conn
else
_ ->
conn