Changeset 1609 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

01/08/16 10:04:06 (9 years ago)

Author:

nanardon

Message:

Fix redirect when login

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -46 +46 @@
     } else {
         # No need to login for About section
-        $c->forward('login');
+        $c->forward('needlogin');
         return;
     }
@@ -60 +60 @@
 }
 
+sub needlogin : Private {
+    my ( $self, $c ) = @_;
+
+    $c->session->{redirurl} ||= $c->req->uri;
+    $c->session->{redirparam} ||= $c->req->params;
+
+    my $sslid = $c->config->{ssl}->{SSL_ID} || 'HTTP_SSL_CLIENT_S_DN_EMAIL';
+    $c->stash->{sslid} = $ENV{$sslid};
+
+    $c->stash->{template} = 'login.tt';
+}
+
 sub login : Local {
     my ( $self, $c ) = @_;
-
-    $c->stash->{redirurl} = $c->req->uri unless($c->req->path =~ /^login/); 
 
     my $sslid = $c->config->{ssl}->{SSL_ID} || 'HTTP_SSL_CLIENT_S_DN_EMAIL';
@@ -75 +85 @@
                 ssl      => $c->req->param('use_ssl')  || '',
         })) {
-            my $redirurl = $c->stash->{redirurl};
-            $c->stash->{redirurl} = undef;
-            $c->res->redirect($redirurl || $c->uri_for('/'));
+            my $redirurl = $c->session->{redirurl};
+            $redirurl->query_form(%{ $c->session->{redirparam} || {}});
+            $c->session->{redirurl} = undef;
+            $c->session->{redirparam} = undef;
+            $c->res->redirect($redirurl || $c->uri_for('/'), );
         } else {
             # invalid login...