mirror of
https://github.com/discourse/discourse.git
synced 2025-02-06 11:28:18 +00: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.
69 lines
1.7 KiB
Ruby
69 lines
1.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
RSpec.describe EnableSsoValidator do
|
|
subject { described_class.new }
|
|
|
|
describe '#valid_value?' do
|
|
describe "when 'sso url' is empty" do
|
|
before do
|
|
SiteSetting.discourse_connect_url = ""
|
|
end
|
|
|
|
describe 'when val is false' do
|
|
it 'should be valid' do
|
|
expect(subject.valid_value?('f')).to eq(true)
|
|
end
|
|
end
|
|
|
|
describe 'when value is true' do
|
|
it 'should not be valid' do
|
|
expect(subject.valid_value?('t')).to eq(false)
|
|
|
|
expect(subject.error_message).to eq(I18n.t(
|
|
'site_settings.errors.discourse_connect_url_is_empty'
|
|
))
|
|
end
|
|
end
|
|
end
|
|
|
|
describe "when invite_only is set" do
|
|
before do
|
|
SiteSetting.invite_only = true
|
|
SiteSetting.discourse_connect_url = 'https://example.com/sso'
|
|
end
|
|
|
|
it 'allows a false value' do
|
|
expect(subject.valid_value?('f')).to eq(true)
|
|
end
|
|
|
|
it "doesn't allow true" do
|
|
expect(subject.valid_value?('t')).to eq(false)
|
|
expect(subject.error_message).to eq(I18n.t(
|
|
'site_settings.errors.discourse_connect_invite_only'
|
|
))
|
|
end
|
|
end
|
|
|
|
describe "when 'sso url' is present" do
|
|
before do
|
|
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
|
|
end
|
|
|
|
describe 'when value is false' do
|
|
it 'should be valid' do
|
|
expect(subject.valid_value?('f')).to eq(true)
|
|
end
|
|
end
|
|
|
|
describe 'when value is true' do
|
|
it 'should be valid' do
|
|
expect(subject.valid_value?('t')).to eq(true)
|
|
end
|
|
end
|
|
end
|
|
|
|
end
|
|
end
|