IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 02:40:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/discourse/discourse

Browse Source
This commit is contained in:
Jeff Atwood 2015-05-21 15:54:42 -07:00
commit dc4907a65c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/single_sign_on.rb
View File

@ -2,7 +2,7 @@ class SingleSignOn
ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
:about_me, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message]
FIXNUMS = []
BOOLS = [:avatar_force_update, :admin, :moderator, :suppress_welcome_message]
BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
NONCE_EXPIRY_TIME = 10.minutes
attr_accessor(*ACCESSORS)

2
spec/models/discourse_single_sign_on_spec.rb
View File

@ -19,6 +19,7 @@ describe DiscourseSingleSignOn do
sso.username = "sam"
sso.name = "sam saffron"
sso.external_id = "100"
sso.require_activation = false
sso.custom_fields["a"] = "Aa"
sso.custom_fields["b.b"] = "B.b"
sso
@ -30,6 +31,7 @@ describe DiscourseSingleSignOn do
expect(parsed.username).to eq sso.username
expect(parsed.name).to eq sso.name
expect(parsed.external_id).to eq sso.external_id
expect(parsed.require_activation).to eq false
expect(parsed.custom_fields["a"]).to eq "Aa"
expect(parsed.custom_fields["b.b"]).to eq "B.b"
end