From b04ab83f120b91d4c1e3066b5be1d2b56d07e134 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 17 May 2016 17:31:34 +1000
Subject: [PATCH] FIX: refresh automatic group if SSO specifies admin/mod
---
app/models/discourse_single_sign_on.rb | 6 ++++++
spec/models/discourse_single_sign_on_spec.rb | 22 ++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index deffc33960c..19b3b77f50b 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -72,11 +72,17 @@ class DiscourseSingleSignOn < SingleSignOn
end
user.ip_address = ip_address
+
user.admin = admin unless admin.nil?
user.moderator = moderator unless moderator.nil?
# optionally save the user and sso_record if they have changed
user.save!
+
+ unless admin.nil? && moderator.nil?
+ Group.refresh_automatic_groups!(:admins, :moderators, :staff)
+ end
+
sso_record.save!
sso_record && sso_record.user
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 552682dde55..e9e41df1458 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -64,6 +64,28 @@ describe DiscourseSingleSignOn do
expect(user).to_not be_nil
end
+ it "can set admin and moderator" do
+ admin_group = Group[:admins]
+ mod_group = Group[:moderators]
+ staff_group = Group[:staff]
+
+ sso = DiscourseSingleSignOn.new
+ sso.username = "misteradmin"
+ sso.name = "Bob Admin"
+ sso.email = "admin@admin.com"
+ sso.external_id = "id"
+ sso.admin = true
+ sso.moderator = true
+
+ user = sso.lookup_or_create_user(ip_address)
+ staff_group.reload
+
+ expect(mod_group.users.where('users.id = ?', user.id).exists?).to eq(true)
+ expect(staff_group.users.where('users.id = ?', user.id).exists?).to eq(true)
+ expect(admin_group.users.where('users.id = ?', user.id).exists?).to eq(true)
+
+ end
+
it "can override name / email / username" do
admin = Fabricate(:admin)