diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-05 18:31:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 18:31:35 +0200 |
| commit | 1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2 (patch) | |
| tree | c7f4668bc9e5fae31ea8dc8b7dd10edd0f2c1164 /app/controllers/api/v1/accounts_controller.rb | |
| parent | ca2cc556f1875e431ea9ceb2d3f4766366c76846 (diff) | |
| download | mastodon-1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2.tar mastodon-1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2.tar.gz mastodon-1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2.tar.bz2 mastodon-1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2.zip | |
Add more granular OAuth scopes (#7929)
* Add more granular OAuth scopes
* Add human-readable descriptions of the new scopes
* Ensure new scopes look good on the app UI
* Add tests
* Group scopes in screen and color-code dangerous ones
* Fix wrong extra scope
Diffstat (limited to 'app/controllers/api/v1/accounts_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index b7133ca8e..1d5372a8c 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -1,8 +1,11 @@ # frozen_string_literal: true class Api::V1::AccountsController < Api::BaseController - before_action -> { doorkeeper_authorize! :read }, except: [:follow, :unfollow, :block, :unblock, :mute, :unmute] - before_action -> { doorkeeper_authorize! :follow }, only: [:follow, :unfollow, :block, :unblock, :mute, :unmute] + before_action -> { authorize_if_got_token! :read, :'read:accounts' }, except: [:follow, :unfollow, :block, :unblock, :mute, :unmute] + before_action -> { doorkeeper_authorize! :follow, :'write:follows' }, only: [:follow, :unfollow] + before_action -> { doorkeeper_authorize! :follow, :'write:mutes' }, only: [:mute, :unmute] + before_action -> { doorkeeper_authorize! :follow, :'write:blocks' }, only: [:block, :unblock] + before_action :require_user!, except: [:show] before_action :set_account before_action :check_account_suspension, only: [:show] |