projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#468] Refactored OAuth scopes' defaults & missing selection handling.
[akkoma]
/
lib
/
pleroma
/
web
/
controller_helper.ex
diff --git
a/lib/pleroma/web/controller_helper.ex
b/lib/pleroma/web/controller_helper.ex
index ddf958811437a07e44dda313dbc6c5778efc7e03..5915ea40e76730ceaa8bb233b29ced4939312fca 100644
(file)
--- a/
lib/pleroma/web/controller_helper.ex
+++ b/
lib/pleroma/web/controller_helper.ex
@@
-1,6
+1,15
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.ControllerHelper do
use Pleroma.Web, :controller
defmodule Pleroma.Web.ControllerHelper do
use Pleroma.Web, :controller
+ def oauth_scopes(params, default) do
+ # Note: `scopes` is used by Mastodon — supporting it but sticking to OAuth's standard `scope` wherever we control it
+ Pleroma.Web.OAuth.parse_scopes(params["scope"] || params["scopes"], default)
+ end
+
def json_response(conn, status, json) do
conn
|> put_status(status)
def json_response(conn, status, json) do
conn
|> put_status(status)