Add a button to Admin::Users#show to disable 2FA for that user
This commit is contained in:
parent
800df45db2
commit
db8f4c0606
3 changed files with 35 additions and 0 deletions
|
@ -43,6 +43,7 @@ v 7.13.0 (unreleased)
|
||||||
- Redesign project page. Show README as default instead of activity. Move project activity to separate page
|
- Redesign project page. Show README as default instead of activity. Move project activity to separate page
|
||||||
- Make left menu more hierarchical and less contextual by adding back item at top
|
- Make left menu more hierarchical and less contextual by adding back item at top
|
||||||
- A fork can’t have a visibility level that is greater than the original project.
|
- A fork can’t have a visibility level that is greater than the original project.
|
||||||
|
- Allow administrators to disable 2FA for a specific user
|
||||||
|
|
||||||
v 7.12.2
|
v 7.12.2
|
||||||
- Correctly show anonymous authorized applications under Profile > Applications.
|
- Correctly show anonymous authorized applications under Profile > Applications.
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
%strong{class: @user.two_factor_enabled? ? 'cgreen' : 'cred'}
|
%strong{class: @user.two_factor_enabled? ? 'cgreen' : 'cred'}
|
||||||
- if @user.two_factor_enabled?
|
- if @user.two_factor_enabled?
|
||||||
Enabled
|
Enabled
|
||||||
|
= link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn btn-xs btn-remove pull-right', title: 'Disable Two-factor Authentication'
|
||||||
- else
|
- else
|
||||||
Disabled
|
Disabled
|
||||||
|
|
||||||
|
|
33
spec/features/admin/admin_disables_two_factor_spec.rb
Normal file
33
spec/features/admin/admin_disables_two_factor_spec.rb
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
feature 'Admin disables 2FA for a user', feature: true do
|
||||||
|
scenario 'successfully', js: true do
|
||||||
|
login_as(:admin)
|
||||||
|
user = create(:user, :two_factor)
|
||||||
|
|
||||||
|
edit_user(user)
|
||||||
|
page.within('.two-factor-status') do
|
||||||
|
click_link 'Disable'
|
||||||
|
end
|
||||||
|
|
||||||
|
page.within('.two-factor-status') do
|
||||||
|
expect(page).to have_content 'Disabled'
|
||||||
|
expect(page).not_to have_button 'Disable'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
scenario 'for a user without 2FA enabled' do
|
||||||
|
login_as(:admin)
|
||||||
|
user = create(:user)
|
||||||
|
|
||||||
|
edit_user(user)
|
||||||
|
|
||||||
|
page.within('.two-factor-status') do
|
||||||
|
expect(page).not_to have_button 'Disable'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def edit_user(user)
|
||||||
|
visit admin_user_path(user)
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue