summaryrefslogtreecommitdiff
path: root/js/codeq/aaiLogin.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/codeq/aaiLogin.js')
-rw-r--r--js/codeq/aaiLogin.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/js/codeq/aaiLogin.js b/js/codeq/aaiLogin.js
index 5d4f1c9..ced3b0c 100644
--- a/js/codeq/aaiLogin.js
+++ b/js/codeq/aaiLogin.js
@@ -3,7 +3,8 @@
*/
(function(){
- var jqNavBarRight = $('.nav.navbar-nav.navbar-right'),
+ var jqScreen = $('#screen_aai_login'),
+ jqNavBarRight = $('.nav.navbar-nav.navbar-right'),
jqNavigationHomeBtn = $('#navigation-home'),
jqCancelAaiLogin = $("#cancel_aai_login"),
jqDisabledOverlay = $('#disabled'),
@@ -25,7 +26,7 @@
});
$('#signed-in-title').html('');
- $('#screen_aai_login').css('display','');
+ jqScreen.css('display','');
codeq.comms.connect()
.then(function(){
@@ -33,7 +34,12 @@
jqAaiIframe.attr('src', samlLoginUrl);
return codeq.comms.samlLogin();
})
- .then(codeq.loginCallbackFunction)
+ .then(function(data){
+ //upgrade
+ if (data.code == 1) codeq.globalStateMachine.transition('upgradeToAAI');
+ //not upgrade
+ else codeq.loginCallbackFunction(data);
+ })
.fail(function(reason){
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);
@@ -52,7 +58,7 @@
jqCancelAaiLogin.off('click');
samlLoginUrl = '';
- $("#screen_aai_login").css('display', 'none');
+ jqScreen.css('display', 'none');
//re-enable the click listener of the logo
jqNavigationHomeBtn.on('click', function(e){