mirror of
https://github.com/discourse/discourse.git
synced 2024-12-12 05:23:51 +08:00
821bb1e8cb
The 'Discourse SSO' protocol is being rebranded to DiscourseConnect. This should help to reduce confusion when 'SSO' is used in the generic sense. This commit aims to: - Rename `sso_` site settings. DiscourseConnect specific ones are prefixed `discourse_connect_`. Generic settings are prefixed `auth_` - Add (server-side-only) backwards compatibility for the old setting names, with deprecation notices - Copy `site_settings` database records to the new names - Rename relevant translation keys - Update relevant translations This commit does **not** aim to: - Rename any Ruby classes or methods. This might be done in a future commit - Change any URLs. This would break existing integrations - Make any changes to the protocol. This would break existing integrations - Change any functionality. Further normalization across DiscourseConnect and other auth methods will be done separately The risks are: - There is no backwards compatibility for site settings on the client-side. Accessing auth-related site settings in Javascript is fairly rare, and an error on the client side would not be security-critical. - If a plugin is monkey-patching parts of the auth process, changes to locale keys could cause broken error messages. This should also be unlikely. The old site setting names remain functional, so security-related overrides will remain working. A follow-up commit will be made with a post-deploy migration to delete the old `site_settings` rows.
39 lines
1.2 KiB
Ruby
39 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe NotificationSerializer do
|
|
describe '#as_json' do
|
|
fab!(:user) { Fabricate(:user) }
|
|
let(:notification) { Fabricate(:notification, user: user) }
|
|
let(:serializer) { NotificationSerializer.new(notification) }
|
|
let(:json) { serializer.as_json }
|
|
|
|
it "returns the user_id" 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.discourse_connect_url = "http://example.com/discourse_sso"
|
|
SiteSetting.discourse_connect_secret = "12345678910"
|
|
SiteSetting.enable_discourse_connect = true
|
|
expect(json[:notification][:external_id]).to eq("12345")
|
|
end
|
|
end
|
|
end
|