gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use config_for for VAPID key storage (#34845)

Browse source
This commit is contained in:
Matt Jankowski 2025-05-30 03:00:33 -04:00 • committed by GitHub
parent a1c260696f
commit f7a3dd0e38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/requests/api/v1/apps/credentials_spec.rb
View file

@ -29,7 +29,7 @@ RSpec.describe 'Credentials' do
redirect_uris: token.application.redirect_uris,
# Deprecated properties as of 4.3:
redirect_uri: token.application.redirect_uri.split.first,
vapid_key: Rails.configuration.x.vapid_public_key
vapid_key: Rails.configuration.x.vapid.public_key
)
)
end
@ -69,7 +69,7 @@ RSpec.describe 'Credentials' do
redirect_uris: token.application.redirect_uris,
# Deprecated properties as of 4.3:
redirect_uri: token.application.redirect_uri.split.first,
vapid_key: Rails.configuration.x.vapid_public_key
vapid_key: Rails.configuration.x.vapid.public_key
)
)
end

2
spec/requests/api/v1/apps_spec.rb
View file

@ -49,7 +49,7 @@ RSpec.describe 'Apps' do
redirect_uris: redirect_uris,
# Deprecated properties as of 4.3:
redirect_uri: redirect_uri,
vapid_key: Rails.configuration.x.vapid_public_key
vapid_key: Rails.configuration.x.vapid.public_key
)
)
end

2
spec/serializers/rest/instance_serializer_spec.rb
View file

@ -15,7 +15,7 @@ RSpec.describe REST::InstanceSerializer do
describe 'configuration' do
it 'returns the VAPID public key' do
expect(serialization['configuration']['vapid']).to eq({
'public_key' => Rails.configuration.x.vapid_public_key,
'public_key' => Rails.configuration.x.vapid.public_key,
})
end

12
spec/workers/web/push_notification_worker_spec.rb
View file

@ -38,13 +38,13 @@ RSpec.describe Web::PushNotificationWorker do
describe 'perform' do
around do |example|
original_private = Rails.configuration.x.vapid_private_key
original_public = Rails.configuration.x.vapid_public_key
Rails.configuration.x.vapid_private_key = vapid_private_key
Rails.configuration.x.vapid_public_key = vapid_public_key
original_private = Rails.configuration.x.vapid.private_key
original_public = Rails.configuration.x.vapid.public_key
Rails.configuration.x.vapid.private_key = vapid_private_key
Rails.configuration.x.vapid.public_key = vapid_public_key
example.run
Rails.configuration.x.vapid_private_key = original_private
Rails.configuration.x.vapid_public_key = original_public
Rails.configuration.x.vapid.private_key = original_private
Rails.configuration.x.vapid.public_key = original_public
end
before do