projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma 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 174a8389c6789c6d06edc36f8e9bd380ba5878dc..07c0f7fdb16df5d2a55e9b7ad179ebf7e09c16e9 100644
(file)
--- a/
lib/pleroma/plugs/oauth_scopes_plug.ex
+++ b/
lib/pleroma/plugs/oauth_scopes_plug.ex
@@
-18,16
+18,13
@@
defmodule Pleroma.Plugs.OAuthScopesPlug do
token = assigns[:token]
scopes = transform_scopes(scopes, options)
token = assigns[:token]
scopes = transform_scopes(scopes, options)
- matched_scopes =
token && filter_descendants(scopes, token.scopes)
+ matched_scopes =
(token && filter_descendants(scopes, token.scopes)) || []
cond do
cond do
- is_nil(token) ->
- maybe_perform_instance_privacy_check(conn, options)
-
- op == :| && Enum.any?(matched_scopes) ->
+ token && op == :| && Enum.any?(matched_scopes) ->
conn
conn
- op == :& && matched_scopes == scopes ->
+
token &&
op == :& && matched_scopes == scopes ->
conn
options[:fallback] == :proceed_unauthenticated ->
conn
options[:fallback] == :proceed_unauthenticated ->