FEATURE: add website field to SSO
This commit is contained in:
parent
329c94a354
commit
4644d777bd
|
@ -92,6 +92,11 @@ class DiscourseSingleSignOn < SingleSignOn
|
||||||
user.user_profile.save!
|
user.user_profile.save!
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if website
|
||||||
|
user.user_profile.website = website
|
||||||
|
user.user_profile.save!
|
||||||
|
end
|
||||||
|
|
||||||
unless admin.nil? && moderator.nil?
|
unless admin.nil? && moderator.nil?
|
||||||
Group.refresh_automatic_groups!(:admins, :moderators, :staff)
|
Group.refresh_automatic_groups!(:admins, :moderators, :staff)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
class SingleSignOn
|
class SingleSignOn
|
||||||
ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
|
ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
|
||||||
:bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
|
:bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
|
||||||
:add_groups, :remove_groups, :groups, :profile_background_url, :card_background_url]
|
:add_groups, :remove_groups, :groups, :profile_background_url, :card_background_url, :website]
|
||||||
FIXNUMS = []
|
FIXNUMS = []
|
||||||
BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
|
BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
|
||||||
NONCE_EXPIRY_TIME = 10.minutes
|
NONCE_EXPIRY_TIME = 10.minutes
|
||||||
|
|
|
@ -30,6 +30,7 @@ describe DiscourseSingleSignOn do
|
||||||
sso.title = "user title"
|
sso.title = "user title"
|
||||||
sso.custom_fields["a"] = "Aa"
|
sso.custom_fields["a"] = "Aa"
|
||||||
sso.custom_fields["b.b"] = "B.b"
|
sso.custom_fields["b.b"] = "B.b"
|
||||||
|
sso.website = "https://www.discourse.org/"
|
||||||
sso
|
sso
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -49,6 +50,7 @@ describe DiscourseSingleSignOn do
|
||||||
expect(parsed.title).to eq sso.title
|
expect(parsed.title).to eq sso.title
|
||||||
expect(parsed.custom_fields["a"]).to eq "Aa"
|
expect(parsed.custom_fields["a"]).to eq "Aa"
|
||||||
expect(parsed.custom_fields["b.b"]).to eq "B.b"
|
expect(parsed.custom_fields["b.b"]).to eq "B.b"
|
||||||
|
expect(parsed.website).to eq sso.website
|
||||||
end
|
end
|
||||||
|
|
||||||
it "can do round trip parsing correctly" do
|
it "can do round trip parsing correctly" do
|
||||||
|
|
Loading…
Reference in New Issue