zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 03:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix registrar area authenticated root path

Browse source
This commit is contained in:
Artur Beljajev 2018-07-19 21:40:01 +03:00
parent 97650e2a6a
commit c1066f12c6
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/registrar/sessions_controller.rb
View file

@ -171,8 +171,16 @@ class Registrar
render text: t('registrar.authorization.ip_not_allowed', ip: request.ip)
end
def current_ability
@current_ability ||= Ability.new(current_registrar_user, request.remote_ip)
end
def after_sign_in_path_for(_resource_or_scope)
registrar_root_path
if can?(:show, :poll)
registrar_poll_path
else
registrar_root_path
end
end
def after_sign_out_path_for(_resource_or_scope)

2
test/integration/registrar/login_test.rb
View file

@ -12,7 +12,7 @@ class RegistrarAreaLoginTest < ActionDispatch::IntegrationTest
click_button 'Login'
assert_text 'Log out'
assert_current_path registrar_root_path
assert_current_path registrar_poll_path
end
def test_wrong_password

2
test/integration/registrar/protected_area_test.rb
View file

@ -17,6 +17,6 @@ class RegistrarAreaProtectedAreaTest < ActionDispatch::IntegrationTest
sign_in users(:api_bestnames)
visit new_registrar_user_session_url
assert_text 'You are already signed in'
assert_current_path registrar_root_path
assert_current_path registrar_poll_path
end
end