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 stable
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
o_auth_scopes_plug.ex
diff --git
a/lib/pleroma/web/plugs/o_auth_scopes_plug.ex
b/lib/pleroma/web/plugs/o_auth_scopes_plug.ex
index e6d398b149e81aa4554eb942a24adb27e8c697a0..f017c8bc7abd627bcb61a2042eedd1b13dc8b551 100644
(file)
--- a/
lib/pleroma/web/plugs/o_auth_scopes_plug.ex
+++ b/
lib/pleroma/web/plugs/o_auth_scopes_plug.ex
@@
-1,12
+1,11
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
import Plug.Conn
import Pleroma.Web.Gettext
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
import Plug.Conn
import Pleroma.Web.Gettext
- alias Pleroma.Config
alias Pleroma.Helpers.AuthHelper
use Pleroma.Web, :plug
alias Pleroma.Helpers.AuthHelper
use Pleroma.Web, :plug
@@
-18,7
+17,6
@@
defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
op = options[:op] || :|
token = assigns[:token]
op = options[:op] || :|
token = assigns[:token]
- scopes = transform_scopes(scopes, options)
matched_scopes = (token && filter_descendants(scopes, token.scopes)) || []
cond do
matched_scopes = (token && filter_descendants(scopes, token.scopes)) || []
cond do
@@
-57,13
+55,4
@@
defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
end
)
end
end
)
end
-
- @doc "Transforms scopes by applying supported options (e.g. :admin)"
- def transform_scopes(scopes, options) do
- if options[:admin] do
- Config.oauth_admin_scopes(scopes)
- else
- scopes
- end
- end
end
end