From fbcca83fc33f3a622364ae90c5d82bbbdc9a9dc6 Mon Sep 17 00:00:00 2001
From: Robert Zorko <robertz@gurucue.com>
Date: Wed, 21 Oct 2015 13:57:43 +0200
Subject: global saml_logout has been disabled. A bug with the saml login
 timeout has been fixed (if the user entered the saml login screen and went
 back he would later get the timeout error)

---
 js/codeq/navigation.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'js/codeq/navigation.js')

diff --git a/js/codeq/navigation.js b/js/codeq/navigation.js
index 9483e05..7fc3697 100644
--- a/js/codeq/navigation.js
+++ b/js/codeq/navigation.js
@@ -107,7 +107,6 @@
         e.preventDefault();
     });
     $('#navigation-logout').on('click', function(e){
-        codeq.globalStateMachine.transition('login');
 
         codeq.comms.logout()
             .then(function (data) {
@@ -119,6 +118,31 @@
             })
             .done();
 
+        /*leaving this here if we later decide to enable saml_logout
+        if(codeq.samlLogin){
+            codeq.comms.samlLogout()
+                .then(function (data) {
+                    console.log(data);
+                    codeq.comms.disconnect();
+                })
+                .fail(function (reason) {
+                    console.log(reason);
+                })
+                .done();
+        }else{
+            codeq.comms.logout()
+                .then(function (data) {
+                    console.log(data);
+                    codeq.comms.disconnect();
+                })
+                .fail(function (reason) {
+                    console.log(reason);
+                })
+                .done();
+        }*/
+
+        codeq.globalStateMachine.transition('login');
+
         //codeq.globalStateMachine.transition('login');
         e.preventDefault();//prevent this since we'll trigger a page reload otherwise
     });
-- 
cgit v1.2.1