diff options
| author | lambda <lain@soykaf.club> | 2019-05-08 10:52:14 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-08 10:52:14 +0000 |
| commit | aa8a6e7becb7c8364b308ec16da636a0517b64b0 (patch) | |
| tree | c8bbc740fe7d536bff62082f5cef2396b00b4e7c /lib/pleroma/web/controller_helper.ex | |
| parent | 14deed7f7d0b88d5c8ac19bb3de467429c289746 (diff) | |
| parent | 799e1f48b52762f21f577269938bc037eba9e20f (diff) | |
| download | pleroma-aa8a6e7becb7c8364b308ec16da636a0517b64b0.tar.gz | |
Merge branch 'refactor/oauth_scopes' into 'develop'
Refactoring functions for dealing with oauth scopes.
See merge request pleroma/pleroma!1125
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 181483664..55706eeb8 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -10,12 +10,6 @@ defmodule Pleroma.Web.ControllerHelper do def truthy_param?(blank_value) when blank_value in [nil, ""], do: nil def truthy_param?(value), do: value not in @falsy_param_values - 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) |