ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Don't redirect to /login if authentication is required

Browse Source 
We can just serve the login page in place.
This commit is contained in:
Eelco Dolstra
2013-07-09 12:02:15 +02:00
parent 13f0b54c49
commit 12ca755bea
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/Hydra/Helper/CatalystUtils.pm
View File

@ -89,7 +89,8 @@ sub getPreviousSuccessfulBuild {
sub error {
my ($c, $msg) = @_;
my ($c, $msg, $status) = @_;
$c->response->status($status) if defined $status;
$c->error($msg);
$c->detach; # doesn't return
}
@ -97,8 +98,7 @@ sub error {
sub notFound {
my ($c, $msg) = @_;
$c->response->status(404);
error($c, $msg);
error($c, $msg, 404);
}
@ -113,8 +113,7 @@ sub backToReferer {
sub requireLogin {
my ($c) = @_;
$c->session->{referer} = $c->request->uri;
$c->response->redirect($c->uri_for('/login'));
$c->detach; # doesn't return
error($c, "This page requires you to sign in.", 403);
}
@ -130,24 +129,21 @@ sub requireProjectOwner {
requireLogin($c) if !$c->user_exists;
error($c, "Only the project members or administrators can perform this operation.")
error($c, "Only the project members or administrators can perform this operation.", 403)
unless isProjectOwner($c, $project);
}
sub isAdmin {
my ($c) = @_;
return $c->user_exists && $c->check_user_roles('admin');
}
sub requireAdmin {
my ($c) = @_;
requireLogin($c) if !$c->user_exists;
error($c, "Only administrators can perform this operation.")
error($c, "Only administrators can perform this operation.", 403)
unless isAdmin($c);
}