From b81864469dc5f72c87f2765f82f28101c9bcf34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Pu=C5=A1nik?= Date: Fri, 6 Nov 2015 15:21:30 +0100 Subject: Gui support for SAML account merge/upgrade upon first SAML-type login of an existing user. --- js/codeq/comms.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/codeq/comms.js') 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(){ -- cgit v1.2.1