summaryrefslogtreecommitdiff
path: root/js/codeq
diff options
context:
space:
mode:
authorRobert Zorko <robertz@gurucue.com>2015-10-15 15:31:12 +0200
committerRobert Zorko <robertz@gurucue.com>2015-10-15 15:31:12 +0200
commit6381f087edf1c078aabf6a81ff8d72ebdca64e55 (patch)
tree7629055b91e608abc961872069082192ad8ef1bf /js/codeq
parent06d68b825159f99ac8356782d6656f52aa9d6c73 (diff)
fixed some bugs with the AAI login after testing
Diffstat (limited to 'js/codeq')
-rw-r--r--js/codeq/aaiLogin.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/js/codeq/aaiLogin.js b/js/codeq/aaiLogin.js
index 6ea49ea..fe7bfc8 100644
--- a/js/codeq/aaiLogin.js
+++ b/js/codeq/aaiLogin.js
@@ -15,9 +15,6 @@
'enter': function(){
jqDisabledOverlay.css('display', '');
- samlLoginUrl = baseSamlUrl + codeq.comms.getSid();
- jqAaiIframe.attr('src', samlLoginUrl);
-
jqNavigationHomeBtn.off('click');//remove the click listener of this element here
jqNavBarRight.css('display','none');//hide settings etc.
@@ -29,7 +26,12 @@
$('#signed-in-title').html('');
$('#screen_aai_login').css('display','');
- codeq.comms.samlLogin()
+ codeq.comms.connect()
+ .then(function(){
+ samlLoginUrl = baseSamlUrl + codeq.comms.getSid();
+ jqAaiIframe.attr('src', samlLoginUrl);
+ return codeq.comms.samlLogin();
+ })
.then(function(data){
codeq.log.debug(JSON.stringify(data));
if(data.code !== 0) throw new Error('SAML login failed, code: ' + data.code + ', message: ' + data.message);