mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 07:53:49 +08:00
FIX: Do not allow invite_only
and enable_sso
at the same time
This functionality was never supported but before the new review queue it didn't have any errors. Now the combination of settings is prevented and existing sites with sso enabled will be migrated to remove invite only.
This commit is contained in:
14
lib/validators/enable_invite_only_validator.rb
Normal file
14
lib/validators/enable_invite_only_validator.rb
Normal file
@ -0,0 +1,14 @@
|
||||
class EnableInviteOnlyValidator
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
def valid_value?(val)
|
||||
return true if val == 'f'
|
||||
!SiteSetting.enable_sso?
|
||||
end
|
||||
|
||||
def error_message
|
||||
I18n.t('site_settings.errors.sso_invite_only')
|
||||
end
|
||||
end
|
@ -5,10 +5,12 @@ class EnableSsoValidator
|
||||
|
||||
def valid_value?(val)
|
||||
return true if val == 'f'
|
||||
SiteSetting.sso_url.present?
|
||||
return false if SiteSetting.sso_url.blank? || SiteSetting.invite_only?
|
||||
true
|
||||
end
|
||||
|
||||
def error_message
|
||||
I18n.t('site_settings.errors.sso_url_is_empty')
|
||||
return I18n.t('site_settings.errors.sso_url_is_empty') if SiteSetting.sso_url.blank?
|
||||
return I18n.t('site_settings.errors.sso_invite_only') if SiteSetting.invite_only?
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user