diff options
author | Marko Pušnik <marko.pusnik@guru.si> | 2015-11-06 15:21:30 +0100 |
---|---|---|
committer | Marko Pušnik <marko.pusnik@guru.si> | 2015-11-06 15:21:30 +0100 |
commit | b81864469dc5f72c87f2765f82f28101c9bcf34c (patch) | |
tree | ea2ec3fb41e340c3ba84317c38d20d26eb1c3d50 /js/codeq/aaiLogin.js | |
parent | 6dfd1ecab43c512197cc0c2a62f3ad5cbeef5e19 (diff) |
Gui support for SAML account merge/upgrade upon first SAML-type login of an existing user.
Diffstat (limited to 'js/codeq/aaiLogin.js')
-rw-r--r-- | js/codeq/aaiLogin.js | 14 |
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){ |