Add customizable user roles (#18641)
* Add customizable user roles * Various fixes and improvements * Add migration for old settings and fix tootctl role management
This commit is contained in:
		
							
								
								
									
										81
									
								
								spec/controllers/admin/users/roles_controller.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										81
									
								
								spec/controllers/admin/users/roles_controller.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,81 @@
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
describe Admin::Users::RolesController do
 | 
			
		||||
  render_views
 | 
			
		||||
 | 
			
		||||
  let(:current_role) { UserRole.create(name: 'Foo', permissions: UserRole::FLAGS[:manage_roles], position: 10) }
 | 
			
		||||
  let(:current_user) { Fabricate(:user, role: current_role) }
 | 
			
		||||
 | 
			
		||||
  let(:previous_role) { nil }
 | 
			
		||||
  let(:user) { Fabricate(:user, role: previous_role) }
 | 
			
		||||
 | 
			
		||||
  before do
 | 
			
		||||
    sign_in current_user, scope: :user
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'GET #show' do
 | 
			
		||||
    before do
 | 
			
		||||
      get :show, params: { user_id: user.id }
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'returns http success' do
 | 
			
		||||
      expect(response).to have_http_status(:success)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'when target user is higher ranked than current user' do
 | 
			
		||||
      let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) }
 | 
			
		||||
 | 
			
		||||
      it 'returns http forbidden' do
 | 
			
		||||
        expect(response).to have_http_status(:forbidden)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'PUT #update' do
 | 
			
		||||
    let(:selected_role) { UserRole.create(name: 'Bar', permissions: permissions, position: position) }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      put :update, params: { user_id: user.id, user: { role_id: selected_role.id } }
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context do
 | 
			
		||||
      let(:permissions) { UserRole::FLAGS[:manage_roles] }
 | 
			
		||||
      let(:position) { 1 }
 | 
			
		||||
 | 
			
		||||
      it 'updates user role' do
 | 
			
		||||
        expect(user.reload.role_id).to eq selected_role&.id
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'redirects back to account page' do
 | 
			
		||||
        expect(response).to redirect_to(admin_account_path(user.account_id))
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'when selected role has higher position than current user\'s role' do
 | 
			
		||||
      let(:permissions) { UserRole::FLAGS[:administrator] }
 | 
			
		||||
      let(:position) { 100 }
 | 
			
		||||
 | 
			
		||||
      it 'does not update user role' do
 | 
			
		||||
        expect(user.reload.role_id).to eq previous_role&.id
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'renders edit form' do
 | 
			
		||||
        expect(response).to render_template(:show)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'when target user is higher ranked than current user' do
 | 
			
		||||
      let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) }
 | 
			
		||||
      let(:permissions) { UserRole::FLAGS[:manage_roles] }
 | 
			
		||||
      let(:position) { 1 }
 | 
			
		||||
 | 
			
		||||
      it 'does not update user role' do
 | 
			
		||||
        expect(user.reload.role_id).to eq previous_role&.id
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'returns http forbidden' do
 | 
			
		||||
        expect(response).to have_http_status(:forbidden)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -0,0 +1,52 @@
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
require 'webauthn/fake_client'
 | 
			
		||||
 | 
			
		||||
describe Admin::Users::TwoFactorAuthenticationsController do
 | 
			
		||||
  render_views
 | 
			
		||||
 | 
			
		||||
  let(:user) { Fabricate(:user) }
 | 
			
		||||
 | 
			
		||||
  before do
 | 
			
		||||
    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'DELETE #destroy' do
 | 
			
		||||
    context 'when user has OTP enabled' do
 | 
			
		||||
      before do
 | 
			
		||||
        user.update(otp_required_for_login: true)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'redirects to admin account page' do
 | 
			
		||||
        delete :destroy, params: { user_id: user.id }
 | 
			
		||||
 | 
			
		||||
        user.reload
 | 
			
		||||
        expect(user.otp_enabled?).to eq false
 | 
			
		||||
        expect(response).to redirect_to(admin_account_path(user.account_id))
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'when user has OTP and WebAuthn enabled' do
 | 
			
		||||
      let(:fake_client) { WebAuthn::FakeClient.new('http://test.host') }
 | 
			
		||||
 | 
			
		||||
      before do
 | 
			
		||||
        user.update(otp_required_for_login: true, webauthn_id: WebAuthn.generate_user_id)
 | 
			
		||||
 | 
			
		||||
        public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
 | 
			
		||||
        Fabricate(:webauthn_credential,
 | 
			
		||||
                  user_id: user.id,
 | 
			
		||||
                  external_id: public_key_credential.id,
 | 
			
		||||
                  public_key: public_key_credential.public_key,
 | 
			
		||||
                  nickname: 'Security Key')
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'redirects to admin account page' do
 | 
			
		||||
        delete :destroy, params: { user_id: user.id }
 | 
			
		||||
 | 
			
		||||
        user.reload
 | 
			
		||||
        expect(user.otp_enabled?).to eq false
 | 
			
		||||
        expect(user.webauthn_enabled?).to eq false
 | 
			
		||||
        expect(response).to redirect_to(admin_account_path(user.account_id))
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user