Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: revoke any api keys when suspending an user

This commit is contained in:
Régis Hanol 2015-08-23 22:33:03 +02:00
parent 91519fdfe7
commit 73624e63c5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/users_controller.rb
View File

@ -53,6 +53,7 @@ class Admin::UsersController < Admin::AdminController
@user.suspended_till = params[:duration].to_i.days.from_now @user.suspended_till = params[:duration].to_i.days.from_now
@user.suspended_at = DateTime.now @user.suspended_at = DateTime.now
@user.save! @user.save!
@user.revoke_api_key
StaffActionLogger.new(current_user).log_user_suspend(@user, params[:reason]) StaffActionLogger.new(current_user).log_user_suspend(@user, params[:reason])
MessageBus.publish "/logout", @user.id, user_ids: [@user.id] MessageBus.publish "/logout", @user.id, user_ids: [@user.id]
render nothing: true render nothing: true

12
spec/controllers/admin/users_controller_spec.rb
View File

@ -121,6 +121,17 @@ describe Admin::UsersController do
end end
context '.suspend' do
let(:evil_trout) { Fabricate(:evil_trout) }
it "also revoke any api keys" do
User.any_instance.expects(:revoke_api_key)
xhr :put, :suspend, user_id: evil_trout.id
end
end
context '.revoke_admin' do context '.revoke_admin' do
before do before do
@another_admin = Fabricate(:admin) @another_admin = Fabricate(:admin)
@ -501,7 +512,6 @@ describe Admin::UsersController do
user = DiscourseSingleSignOn.parse(sso.payload) user = DiscourseSingleSignOn.parse(sso.payload)
.lookup_or_create_user .lookup_or_create_user
sso.name = "Bill" sso.name = "Bill"
sso.username = "Hokli$$!!" sso.username = "Hokli$$!!"
sso.email = "bob2@bob.com" sso.email = "bob2@bob.com"