maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable all providers when providers_to_enable param is blank (#15260)

Browse source 
* Disable all providers when providers_to_enable param is blank

* Remove guard, a couple more spec examples

* Update app/services/settings/authentication/upsert.rb

Co-authored-by: Fernando Valverde <fernando@visualcosita.com>

Co-authored-by: Fernando Valverde <fernando@visualcosita.com>
This commit is contained in:
Lewis Sparlin 2021-11-02 20:20:26 -05:00 • committed by GitHub
parent 87244c345c
commit 71e90a41f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 78 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/settings/authentication/upsert.rb
View file

@ -11,9 +11,7 @@ module Settings
end
def self.update_enabled_providers(value)
return if value.blank?
enabled_providers = value.split(",").filter_map do |entry|
enabled_providers = value.to_s.split(",").filter_map do |entry|
entry unless invalid_provider_entry(entry)
end
return if email_login_disabled_with_one_or_less_auth_providers(enabled_providers)

77
spec/services/settings/authentication/upsert_spec.rb Normal file
View file

@ -0,0 +1,77 @@
require "rails_helper"
RSpec.describe Settings::Authentication::Upsert, type: :service do
before { Settings::Authentication.providers = %w[github] }
it "assigns enabled providers from parameters" do
expect do
described_class.call(
{
"auth_providers_to_enable" => "github,facebook,twitter",
"github_key" => "asdf",
"github_secret" => "asdf_secret",
"twitter_key" => "asdf",
"twitter_secret" => "asdf_secret",
"facebook_key" => "asdf",
"facebook_secret" => "asdf_secret"
},
)
end.to change {
Settings::Authentication.providers
}.from(%w[github]).to(%w[github facebook twitter])
end
it "disables providers that are not present" do
expect do
described_class.call(
{
"auth_providers_to_enable" => "twitter",
"twitter_key" => "asdf",
"twitter_secret" => "asdf_secret"
},
)
end.to change {
Settings::Authentication.providers
}.from(%w[github]).to(%w[twitter])
end
it "does not save 1 or fewer providers when email_password login is not allowed" do
expect do
Settings::Authentication.allow_email_password_login = false
described_class.call(
{
"auth_providers_to_enable" => "twitter",
"twitter_key" => "asdf",
"twitter_secret" => "asdf_secret"
},
)
end.not_to change {
Settings::Authentication.providers
}
end
it "will save with 1 or providers providers when email_password login is not allowed" do
expect do
Settings::Authentication.allow_email_password_login = false
described_class.call(
{
"auth_providers_to_enable" => "twitter,github",
"twitter_key" => "asdf",
"twitter_secret" => "asdf_secret",
"github_key" => "asdf",
"github_secret" => "asdf_secret"
},
)
end.to change {
Settings::Authentication.providers
}.from(%w[github]).to(%w[twitter github])
end
it "disables providers even when provider parameter is blank" do
expect do
described_class.call({ "auth_providers_to_enable" => "" })
end.to change {
Settings::Authentication.providers
}.from(%w[github]).to([])
end
end