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/comms.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/comms.js')
| -rw-r--r-- | js/codeq/comms.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/codeq/comms.js b/js/codeq/comms.js index 306263c..b5296a8 100644 --- a/js/codeq/comms.js +++ b/js/codeq/comms.js @@ -533,8 +533,10 @@ return ajaxGet(ajaxDataPrefix + 'resources.json'); }, - 'samlLogin': function(){ - return this.send({'action':'saml_login','gui_lang':codeq.getLang()}); + 'samlLogin': function(upgrade_account, upgrade_password){ + if (upgrade_account === undefined) return this.send({'action':'saml_login','gui_lang':codeq.getLang()}); + else if (upgrade_account) return this.send({'action':'saml_login','gui_lang':codeq.getLang(), 'upgrade_account': true, 'upgrade_password': upgrade_password}); + else return this.send({'action':'saml_login','gui_lang':codeq.getLang(), 'upgrade_account': false}); }, 'samlLogout': function(){ |