COmanage Developers List

Author: benno
Date: 2012-09-23 22:54:32 -0400 (Sun, 23 Sep 2012)
New Revision: 363

Modified:
   registry/trunk/app/Controller/UsersController.php
Log:
Return to current page when reauthenticating after session timeout (CO-341)

Modified: registry/trunk/app/Controller/UsersController.php
===================================================================
--- registry/trunk/app/Controller/UsersController.php   2012-09-15 14:20:37 
UTC (rev 362)
+++ registry/trunk/app/Controller/UsersController.php   2012-09-24 02:54:32 
UTC (rev 363)
@@ -149,18 +149,17 @@
           if(isset($orgIdentities[0]['Name'])) {
             $this->Session->write('Auth.User.name', 
$orgIdentities[0]['Name']);
           }
+          
+          $this->redirect($this->Auth->redirect());
         } else {
           // This is an API user. We don't do anything special at the moment.
         }
       } else {
         throw new RuntimeException("Found empty username at login");
       }
-      
-      $this->redirect("/");
     } else {
       // We're probably here because the session timed out
-      $this->Session->setFlash(_txt('er.timeout'), '', array(), 'error');
-      $this->redirect("/");
+      $this->redirect("/auth/login");
       //throw new RuntimeException("Failed to invoke Auth component login");
     }
   }