Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def suspend!
analytics.user_suspended(success: false, error_message: :user_already_suspended)
raise 'user_already_suspended'
end
OutOfBandSessionAccessor.new(unique_session_id).destroy
OutOfBandSessionAccessor.new(unique_session_id).destroy if unique_session_id
update!(suspended_at: Time.zone.now, unique_session_id: nil)
analytics.user_suspended(success: true)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/action_account_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
let(:config) { ScriptBase::Config.new(include_missing:) }
subject(:result) { subtask.run(args:, config:) }

it 'Suspend a user that is not suspended already', aggregate_failures: true do
it 'suspend a user that is not suspended already', aggregate_failures: true do
expect(result.table).to match_array(
[
['uuid', 'status'],
Expand Down
8 changes: 8 additions & 0 deletions spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,14 @@

expect(OutOfBandSessionAccessor.new(mock_session_id).exists?).to eq false
end

context 'user has a nil current session id' do
let(:mock_session_id) { nil }

it 'does not error' do
expect { user.suspend! }.to_not raise_error
end
end
end

it 'raises an error if the user is already suspended' do
Expand Down