parent
d8cab3314c
commit
9e1bf8e08b
@ -15,7 +15,7 @@ module Admin
|
|||||||
|
|
||||||
if user && user.authenticate(auth_params[:password])
|
if user && user.authenticate(auth_params[:password])
|
||||||
session[:user] = user.to_i
|
session[:user] = user.to_i
|
||||||
redirect_to admin_path
|
redirect_to session[:request] || admin_path
|
||||||
else
|
else
|
||||||
redirect_to admin_login_path,
|
redirect_to admin_login_path,
|
||||||
flash: { error: "Sorry, incorrect email or password. Please try again." }
|
flash: { error: "Sorry, incorrect email or password. Please try again." }
|
||||||
|
@ -17,6 +17,7 @@ class AdminController < ApplicationController
|
|||||||
private
|
private
|
||||||
|
|
||||||
def authorize_user
|
def authorize_user
|
||||||
|
session[:request] = request.fullpath
|
||||||
redirect_to admin_login_path unless current_user
|
redirect_to admin_login_path unless current_user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -26,6 +26,18 @@ module Admin
|
|||||||
assert_redirected_to admin_url
|
assert_redirected_to admin_url
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "should auth to original request" do
|
||||||
|
elsie = candidates(:elsie)
|
||||||
|
|
||||||
|
get admin_result_url(test_hash: elsie.test_hash)
|
||||||
|
|
||||||
|
assert_redirected_to admin_login_url
|
||||||
|
post admin_auth_url, params: { auth:
|
||||||
|
{ email: 'fed.reviewer@mailinator.com', password: 'password' } }
|
||||||
|
|
||||||
|
assert_redirected_to admin_result_url(test_hash: elsie.test_hash)
|
||||||
|
end
|
||||||
|
|
||||||
test "should FAIL auth" do
|
test "should FAIL auth" do
|
||||||
post admin_auth_url, params: { auth:
|
post admin_auth_url, params: { auth:
|
||||||
{ email: 'alan.admin@mailinator.com', password: 'b@d9a$$werD' } }
|
{ email: 'alan.admin@mailinator.com', password: 'b@d9a$$werD' } }
|
||||||
|
Loading…
Reference in New Issue
Block a user