DEV: Add external_id to notification payload

If sso is enabled the notification payload will now include the
external_id for the user.

This was requested on meta: https://meta.discourse.org/t/-/129052/10
This commit is contained in:
Blake Erickson 2020-07-13 12:07:39 -06:00
parent 33554e5cbc
commit a900c99993
2 changed files with 30 additions and 0 deletions

View File

@ -4,6 +4,7 @@ class NotificationSerializer < ApplicationSerializer
attributes :id,
:user_id,
:external_id,
:notification_type,
:read,
:created_at,
@ -38,4 +39,12 @@ class NotificationSerializer < ApplicationSerializer
object.data_hash
end
def external_id
object.user&.single_sign_on_record&.external_id
end
def include_external_id?
SiteSetting.enable_sso
end
end

View File

@ -13,5 +13,26 @@ describe NotificationSerializer do
expect(json[:notification][:user_id]).to eq(user.id)
end
it "does not include external_id when sso is disabled" do
expect(json[:notification].key?(:external_id)).to eq(false)
end
end
describe '#sso_enabled' do
let :user do
user = Fabricate(:user)
SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
user
end
let(:notification) { Fabricate(:notification, user: user) }
let(:serializer) { NotificationSerializer.new(notification) }
let(:json) { serializer.as_json }
it "should include the external_id" do
SiteSetting.sso_url = "http://example.com/discourse_sso"
SiteSetting.sso_secret = "12345678910"
SiteSetting.enable_sso = true
expect(json[:notification][:external_id]).to eq("12345")
end
end
end