mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix #8785
pull/918/head
Eugen Rochko 2019-02-16 05:27:05 +01:00 committed by GitHub
parent a006d4afbe
commit cc84a407f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/apps/credentials_controller.rb
View File

@ -6,6 +6,6 @@ class Api::V1::Apps::CredentialsController < Api::BaseController
respond_to :json respond_to :json
def show 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
end end

6
app/serializers/rest/application_serializer.rb
View File

@ -2,7 +2,7 @@
class REST::ApplicationSerializer < ActiveModel::Serializer class REST::ApplicationSerializer < ActiveModel::Serializer
attributes :id, :name, :website, :redirect_uri, attributes :id, :name, :website, :redirect_uri,
:client_id, :client_secret :client_id, :client_secret, :vapid_key
def id def id
object.id.to_s object.id.to_s
@ -19,4 +19,8 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
def website def website
object.website.presence object.website.presence
end end
def vapid_key
Rails.configuration.x.vapid_public_key
end
end end