From 0a684b889fbbd4ffcdb79e0e71033355af8a9200 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian@c9.io>
Date: Wed, 4 Nov 2015 15:26:27 +0000
Subject: [PATCH] configure secure redirect everywhere

---
 .../connect-architect/connect.redirect/redirect.js        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/node_modules/connect-architect/connect.redirect/redirect.js b/node_modules/connect-architect/connect.redirect/redirect.js
index 24b16ef1..7e072318 100644
--- a/node_modules/connect-architect/connect.redirect/redirect.js
+++ b/node_modules/connect-architect/connect.redirect/redirect.js
@@ -21,12 +21,14 @@ module.exports = function(options, imports, register) {
     });
     imports.connect.addResponseMethod("returnTo", function(req, defaultReturn) {
         var url = defaultReturn || "/";
-        if (req.session && req.session.returnTo) {
+        if (req.parsedUrl && req.parsedUrl.query.redirect) {
+            url = req.parsedUrl.query.redirect;
+        }
+        else if (req.session && req.session.returnTo) {
             url = req.session.returnTo;
             delete req.session.returnTo;
         }
-        
-        this.redirect(url);
+        this.secureRedirect(url);
     });
     imports.connect.addResponseMethod("moved", function(location) {
         this.writeHead(301, {Location: location});