Merge 2.7.3 #8
|
@ -6,6 +6,6 @@ class Api::V1::Apps::CredentialsController < Api::BaseController
|
|||
respond_to :json
|
||||
|
||||
def show
|
||||
render json: doorkeeper_token.application, serializer: REST::StatusSerializer::ApplicationSerializer
|
||||
render json: doorkeeper_token.application, serializer: REST::ApplicationSerializer, fields: %i(name website vapid_key)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
class REST::ApplicationSerializer < ActiveModel::Serializer
|
||||
attributes :id, :name, :website, :redirect_uri,
|
||||
:client_id, :client_secret
|
||||
:client_id, :client_secret, :vapid_key
|
||||
|
||||
def id
|
||||
object.id.to_s
|
||||
|
@ -19,4 +19,8 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
|
|||
def website
|
||||
object.website.presence
|
||||
end
|
||||
|
||||
def vapid_key
|
||||
Rails.configuration.x.vapid_public_key
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue