Skip to content

Commit 406611a

Browse files
authored
DEV: Add new Discourse Connect attributes (#245)
Discourse Connect has new attributes in core, so we need to add them in this gem. See core commit discourse/discourse@eb5a3cf.
1 parent b1feb79 commit 406611a

File tree

2 files changed

+43
-9
lines changed

2 files changed

+43
-9
lines changed

lib/discourse_api/single_sign_on.rb

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,46 @@
55

66
module DiscourseApi
77
class SingleSignOn
8-
ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :profile_background_url, :card_background_url, :avatar_force_update, :require_activation,
9-
:bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
10-
:add_groups, :remove_groups, :groups, :locale, :locale_force_update]
8+
ACCESSORS = [
9+
:add_groups,
10+
:admin,
11+
:avatar_force_update,
12+
:avatar_url,
13+
:bio,
14+
:card_background_url,
15+
:confirmed_2fa,
16+
:email,
17+
:external_id,
18+
:groups,
19+
:locale,
20+
:locale_force_update,
21+
:moderator,
22+
:name,
23+
:no_2fa_methods,
24+
:nonce,
25+
:profile_background_url,
26+
:remove_groups,
27+
:require_2fa,
28+
:require_activation,
29+
:return_sso_url,
30+
:suppress_welcome_message,
31+
:title,
32+
:username,
33+
]
34+
1135
FIXNUMS = []
12-
BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message,
13-
:locale_force_update]
36+
37+
BOOLS = [
38+
:admin,
39+
:avatar_force_update,
40+
:confirmed_2fa,
41+
:locale_force_update,
42+
:moderator,
43+
:no_2fa_methods,
44+
:require_2fa,
45+
:require_activation,
46+
:suppress_welcome_message,
47+
]
1448
ARRAYS = [:groups]
1549
#NONCE_EXPIRY_TIME = 10.minutes # minutes is a rails method and is causing an error. Is this needed in the api?
1650

spec/discourse_api/api/sso_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
}
2828
end
2929
let(:expected_unsigned_payload) do
30-
'name=Some+User&username=some_user&email=some%40email.com&'\
31-
'avatar_url=https%3A%2F%2Fwww.website.com&external_id=abc&title=ruby'\
32-
'&add_groups=a&add_groups=b&remove_groups=c&remove_groups=d&custom.field_2=potato&'\
33-
'custom.custom.field_1=tomato'
30+
'add_groups=a&add_groups=b&avatar_url=https%3A%2F%2Fwww.website.com'\
31+
'&email=some%40email.com&external_id=abc&name=Some+User&remove_groups=c'\
32+
'&remove_groups=d&title=ruby&username=some_user&custom.field_2=potato'\
33+
'&custom.custom.field_1=tomato'
3434
end
3535
let(:sso_double) { DiscourseApi::SingleSignOn.parse_hash(params) }
3636

0 commit comments

Comments
 (0)