lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Correctly redirect to the referring page when logging in

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-21 14:38:18 +01:00
parent 26fa9ea0ea
commit 767cab6cd2
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Controller/Root.pm
View file

@ -43,7 +43,7 @@ sub login :Local {
my $username = $c->request->params->{username} || ""; my $username = $c->request->params->{username} || "";
my $password = $c->request->params->{password} || ""; my $password = $c->request->params->{password} || "";
if ($username eq "" && $password eq "" && ! defined $c->flash->{referer}) { if ($username eq "" && $password eq "" && !defined $c->flash->{referer}) {
my $baseurl = $c->uri_for('/'); my $baseurl = $c->uri_for('/');
my $refurl = $c->request->referer; my $refurl = $c->request->referer;
$c->flash->{referer} = $refurl if $refurl =~ m/^($baseurl)/; $c->flash->{referer} = $refurl if $refurl =~ m/^($baseurl)/;
@ -58,6 +58,8 @@ sub login :Local {
$c->stash->{errorMsg} = "Bad username or password."; $c->stash->{errorMsg} = "Bad username or password.";
} }
$c->keep_flash("referer");
$c->stash->{template} = 'login.tt'; $c->stash->{template} = 'login.tt';
} }

1
src/lib/Hydra/Helper/CatalystUtils.pm
View file

@ -97,7 +97,6 @@ sub notFound {
sub requireLogin { sub requireLogin {
my ($c) = @_; my ($c) = @_;
$c->flash->{afterLogin} = $c->request->uri;
$c->response->redirect($c->uri_for('/login')); $c->response->redirect($c->uri_for('/login'));
$c->detach; # doesn't return $c->detach; # doesn't return
} }

3
src/root/login.tt
View file

@ -10,7 +10,7 @@ You can <a href="[% c.uri_for('/logout') %]">logout</a> here.
<form class="form-horizontal" method="post" action="[% c.uri_for('/login') %]"> <form class="form-horizontal" method="post" action="[% c.uri_for('/login') %]">
<fieldset> <fieldset>
<div class="control-group"> <div class="control-group">
<label class="control-label">User name</label> <label class="control-label">User name</label>
<div class="controls"> <div class="controls">
@ -28,6 +28,7 @@ You can <a href="[% c.uri_for('/logout') %]">logout</a> here.
<div class="form-actions"> <div class="form-actions">
<input type="submit" name="login" value="Sign in" class="btn btn-primary" /> <input type="submit" name="login" value="Sign in" class="btn btn-primary" />
</div> </div>
</fieldset>
</form> </form>