projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/2036-part-2' into 'develop'
[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 78b7e388f955333925b885911a08c33ec08511af..d346e01a6fd515263239bc725a369bdd248fc8fd 100644
(file)
--- a/
lib/pleroma/plugs/legacy_authentication_plug.ex
+++ b/
lib/pleroma/plugs/legacy_authentication_plug.ex
@@
-1,9
+1,11
@@
# 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.Plugs.LegacyAuthenticationPlug do
import Plug.Conn
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.LegacyAuthenticationPlug do
import Plug.Conn
+
+ alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
def init(options) do
alias Pleroma.User
def init(options) do
@@
-27,6
+29,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()
else
_ ->
conn
else
_ ->
conn