diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-17 15:13:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 15:13:17 +0100 |
| commit | a2b4b82f0fdcae4757d169c706262926f4e53c6b (patch) | |
| tree | 67c9a6911be625bf3e10a65a1454f6631d08d93d /app/serializers/rest/application_serializer.rb | |
| parent | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (diff) | |
| parent | e31fc2b458579fea3602e25a798d1f3cfcac2807 (diff) | |
Merge pull request #918 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/application_serializer.rb')
| -rw-r--r-- | app/serializers/rest/application_serializer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/rest/application_serializer.rb b/app/serializers/rest/application_serializer.rb index a9316cd4b..ab68219ad 100644 --- a/app/serializers/rest/application_serializer.rb +++ b/app/serializers/rest/application_serializer.rb @@ -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 |