Add REST API for Web Push Notifications subscriptions (#7445)
- POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)
This commit is contained in:
parent
9a794067f7
commit
b4fb766b23
20 changed files with 258 additions and 81 deletions
|
@ -0,0 +1,83 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
describe Api::V1::Push::SubscriptionsController do
|
||||
render_views
|
||||
|
||||
let(:user) { Fabricate(:user) }
|
||||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'push') }
|
||||
|
||||
before do
|
||||
allow(controller).to receive(:doorkeeper_token) { token }
|
||||
end
|
||||
|
||||
let(:create_payload) do
|
||||
{
|
||||
subscription: {
|
||||
endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
|
||||
keys: {
|
||||
p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
|
||||
auth: 'eH_C8rq2raXqlcBVDa1gLg==',
|
||||
},
|
||||
}
|
||||
}.with_indifferent_access
|
||||
end
|
||||
|
||||
let(:alerts_payload) do
|
||||
{
|
||||
data: {
|
||||
alerts: {
|
||||
follow: true,
|
||||
favourite: false,
|
||||
reblog: true,
|
||||
mention: false,
|
||||
}
|
||||
}
|
||||
}.with_indifferent_access
|
||||
end
|
||||
|
||||
describe 'POST #create' do
|
||||
it 'saves push subscriptions' do
|
||||
post :create, params: create_payload
|
||||
|
||||
push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
|
||||
|
||||
expect(push_subscription.endpoint).to eq(create_payload[:subscription][:endpoint])
|
||||
expect(push_subscription.key_p256dh).to eq(create_payload[:subscription][:keys][:p256dh])
|
||||
expect(push_subscription.key_auth).to eq(create_payload[:subscription][:keys][:auth])
|
||||
expect(push_subscription.user_id).to eq user.id
|
||||
expect(push_subscription.access_token_id).to eq token.id
|
||||
end
|
||||
|
||||
it 'replaces old subscription on repeat calls' do
|
||||
post :create, params: create_payload
|
||||
post :create, params: create_payload
|
||||
|
||||
expect(Web::PushSubscription.where(endpoint: create_payload[:subscription][:endpoint]).count).to eq 1
|
||||
end
|
||||
end
|
||||
|
||||
describe 'PUT #update' do
|
||||
it 'changes alert settings' do
|
||||
post :create, params: create_payload
|
||||
put :update, params: alerts_payload
|
||||
|
||||
push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
|
||||
|
||||
expect(push_subscription.data.dig('alerts', 'follow')).to eq(alerts_payload[:data][:alerts][:follow].to_s)
|
||||
expect(push_subscription.data.dig('alerts', 'favourite')).to eq(alerts_payload[:data][:alerts][:favourite].to_s)
|
||||
expect(push_subscription.data.dig('alerts', 'reblog')).to eq(alerts_payload[:data][:alerts][:reblog].to_s)
|
||||
expect(push_subscription.data.dig('alerts', 'mention')).to eq(alerts_payload[:data][:alerts][:mention].to_s)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'DELETE #destroy' do
|
||||
it 'removes the subscription' do
|
||||
post :create, params: create_payload
|
||||
delete :destroy
|
||||
|
||||
expect(Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
|
@ -59,10 +59,10 @@ describe Api::Web::PushSubscriptionsController do
|
|||
|
||||
push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
|
||||
|
||||
expect(push_subscription.data['follow']).to eq(alerts_payload[:data][:follow])
|
||||
expect(push_subscription.data['favourite']).to eq(alerts_payload[:data][:favourite])
|
||||
expect(push_subscription.data['reblog']).to eq(alerts_payload[:data][:reblog])
|
||||
expect(push_subscription.data['mention']).to eq(alerts_payload[:data][:mention])
|
||||
expect(push_subscription.data['alerts']['follow']).to eq(alerts_payload[:data][:alerts][:follow].to_s)
|
||||
expect(push_subscription.data['alerts']['favourite']).to eq(alerts_payload[:data][:alerts][:favourite].to_s)
|
||||
expect(push_subscription.data['alerts']['reblog']).to eq(alerts_payload[:data][:alerts][:reblog].to_s)
|
||||
expect(push_subscription.data['alerts']['mention']).to eq(alerts_payload[:data][:alerts][:mention].to_s)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -81,10 +81,10 @@ describe Api::Web::PushSubscriptionsController do
|
|||
|
||||
push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
|
||||
|
||||
expect(push_subscription.data['follow']).to eq(alerts_payload[:data][:follow])
|
||||
expect(push_subscription.data['favourite']).to eq(alerts_payload[:data][:favourite])
|
||||
expect(push_subscription.data['reblog']).to eq(alerts_payload[:data][:reblog])
|
||||
expect(push_subscription.data['mention']).to eq(alerts_payload[:data][:mention])
|
||||
expect(push_subscription.data['alerts']['follow']).to eq(alerts_payload[:data][:alerts][:follow].to_s)
|
||||
expect(push_subscription.data['alerts']['favourite']).to eq(alerts_payload[:data][:alerts][:favourite].to_s)
|
||||
expect(push_subscription.data['alerts']['reblog']).to eq(alerts_payload[:data][:alerts][:reblog].to_s)
|
||||
expect(push_subscription.data['alerts']['mention']).to eq(alerts_payload[:data][:alerts][:mention].to_s)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,20 +2,8 @@ require 'rails_helper'
|
|||
|
||||
RSpec.describe Web::PushSubscription, type: :model do
|
||||
let(:alerts) { { mention: true, reblog: false, follow: true, follow_request: false, favourite: true } }
|
||||
let(:payload_no_alerts) { Web::PushSubscription.new(id: 1, endpoint: 'a', key_p256dh: 'c', key_auth: 'd').as_payload }
|
||||
let(:payload_alerts) { Web::PushSubscription.new(id: 1, endpoint: 'a', key_p256dh: 'c', key_auth: 'd', data: { alerts: alerts }).as_payload }
|
||||
let(:push_subscription) { Web::PushSubscription.new(data: { alerts: alerts }) }
|
||||
|
||||
describe '#as_payload' do
|
||||
it 'only returns id and endpoint' do
|
||||
expect(payload_no_alerts.keys).to eq [:id, :endpoint]
|
||||
end
|
||||
|
||||
it 'returns alerts if set' do
|
||||
expect(payload_alerts.keys).to eq [:id, :endpoint, :alerts]
|
||||
end
|
||||
end
|
||||
|
||||
describe '#pushable?' do
|
||||
it 'obeys alert settings' do
|
||||
expect(push_subscription.send(:pushable?, Notification.new(activity_type: 'Mention'))).to eq true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue