Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2023-10-19 19:14:04 +02:00
42 changed files with 476 additions and 169 deletions

View File

@@ -1,9 +1,9 @@
# frozen_string_literal: true
class Api::V1::Apps::CredentialsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
def show
render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key)
return doorkeeper_render_error unless valid_doorkeeper_token?
render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key client_id scopes)
end
end