From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Mon, 27 Mar 2017 13:53:47 +0000 (-0400)
Subject: NOTICKET: resolving with full response in session.delete now
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=aa95200177f42de39a102a559713bde13dedb30d;p=osm%2FUI.git

NOTICKET: resolving with full response in session.delete now

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
---

diff --git a/skyquake/framework/core/modules/api/sessions.js b/skyquake/framework/core/modules/api/sessions.js
index c8a02239c..2f5ace3dd 100644
--- a/skyquake/framework/core/modules/api/sessions.js
+++ b/skyquake/framework/core/modules/api/sessions.js
@@ -42,7 +42,7 @@ function logAndReject(mesg, reject) {
 
 function logAndRedirectToLogin(mesg, res, req) {
     console.log(mesg);
-    res.render('login.html?api_server=' + req.query['api_server']);
+    res.redirect('login.html?api_server=' + req.query['api_server']);
     res.end();
 }
 
@@ -153,8 +153,6 @@ sessionsAPI.addProjectToSession = function(req, res) {
 }
 
 sessionsAPI.delete = function(req, res) {
-    var reqRef = req;
-    var res = res;
     var api_server = req.query["api_server"];
     var uri = utils.confdPort(api_server);
     var url = uri + '/api/logout';
@@ -167,7 +165,8 @@ sessionsAPI.delete = function(req, res) {
                     'Authorization': req.session.authorization
                 }),
                 forever: constants.FOREVER_ON,
-                rejectUnauthorized: constants.REJECT_UNAUTHORIZED
+                rejectUnauthorized: constants.REJECT_UNAUTHORIZED,
+                resolveWithFullResponse: true
             }),
             new Promise(function(success, failure) {
                 req.session.destroy(function(err) {