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)

1 files changed, 6 insertions, 3 deletions

diff --git a/js/codeq/aaiLogin.js b/js/codeq/aaiLogin.js
index 7e48486..5d4f1c9 100644
--- a/js/codeq/aaiLogin.js
+++ b/js/codeq/aaiLogin.js
@@ -14,6 +14,7 @@
     codeq.globalStateMachine.register('aailogin',{
         'enter': function(){
             jqDisabledOverlay.css('display', '');
+            codeq.samlLogin = true;//set the flag
             $('.saml-login-hide').css('display','none');//hide the change password buttons, in the case we go back to the normal login page (cancel or error) they will be reset to being visible when we enter the normal login state
             jqNavigationHomeBtn.off('click');//remove the click listener of this element here
             jqNavBarRight.css('display','none');//hide settings etc.
@@ -34,9 +35,11 @@
                 })
                 .then(codeq.loginCallbackFunction)
                 .fail(function(reason){
-                    codeq.log.error('SAML login failed: ' + reason);
-                    alert('SAML login failed: ' + reason);
-                    codeq.globalStateMachine.transition('login');
+                    if(codeq.samlLogin){//if the user goes back to the normal login screen the timeout (which will happen) mustn't do anything
+                        codeq.log.error('SAML login failed: ' + reason);
+                        alert('SAML login failed: ' + reason);
+                        codeq.globalStateMachine.transition('login');
+                    }
                 })
                 .done();