Browse Source

Add vapid_key to the application entity in the REST API (#10058)

Fix #8785
pull/4/head
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
cc84a407f4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      app/controllers/api/v1/apps/credentials_controller.rb
  2. +5
    -1
      app/serializers/rest/application_serializer.rb

+ 1
- 1
app/controllers/api/v1/apps/credentials_controller.rb View File

@ -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

+ 5
- 1
app/serializers/rest/application_serializer.rb View File

@ -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…
Cancel
Save