From 9b42a94429d779f1fe68a3f98642f277e9f54542 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 4 Mar 2014 22:02:31 +0000
Subject: [PATCH] Fix Login and Logout that were broken with SSL

---
 Netdisco/Changes                       | 8 +++++++-
 Netdisco/lib/App/Netdisco/Web/AuthN.pm | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 29e68712..bbab54c1 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,4 +1,10 @@
-2.024004 - 2014-03-04
+2.024005 - 2014-03-04
+
+  [BUG FIXES]
+
+  * Fix Login and Logout that were broken with SSL
+
+2.024003_001 - 2014-03-03
 
   [ENHANCEMENTS]
 
diff --git a/Netdisco/lib/App/Netdisco/Web/AuthN.pm b/Netdisco/lib/App/Netdisco/Web/AuthN.pm
index d52ee121..b036c9f4 100644
--- a/Netdisco/lib/App/Netdisco/Web/AuthN.pm
+++ b/Netdisco/lib/App/Netdisco/Web/AuthN.pm
@@ -6,7 +6,7 @@ use Dancer::Plugin::Auth::Extensible;
 
 hook 'before' => sub {
     params->{return_url} ||= ((request->path ne uri_for('/')->path)
-      ? request->path : uri_for('/inventory'));
+      ? request->uri : uri_for('/inventory')->path);
 
     if (! session('logged_in_user') && request->path ne uri_for('/login')->path) {
         if (setting('trust_x_remote_user') and scalar request->header('X-REMOTE_USER')) {
@@ -85,7 +85,7 @@ any ['get', 'post'] => '/logout' => sub {
     });
 
     session->destroy;
-    redirect uri_for('/inventory');
+    redirect uri_for('/inventory')->path;
 };
 
 true;