projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
oauth_scopes_plug.ex
diff --git
a/lib/pleroma/plugs/oauth_scopes_plug.ex
b/lib/pleroma/plugs/oauth_scopes_plug.ex
index b09e1bb4dd118686fc7aa908525ea098c7495ef8..66f48c28c600f8fda50dea5c326edf47027125cc 100644
(file)
--- a/
lib/pleroma/plugs/oauth_scopes_plug.ex
+++ b/
lib/pleroma/plugs/oauth_scopes_plug.ex
@@
-10,13
+10,13
@@
defmodule Pleroma.Plugs.OAuthScopesPlug do
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.PlugHelper
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.PlugHelper
+ use Pleroma.Web, :plug
+
@behaviour Plug
def init(%{scopes: _} = options), do: options
@behaviour Plug
def init(%{scopes: _} = options), do: options
- def call(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
- conn = PlugHelper.append_to_called_plugs(conn, __MODULE__)
-
+ def perform(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
op = options[:op] || :|
token = assigns[:token]
op = options[:op] || :|
token = assigns[:token]