diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-12-12 08:16:10 -0500 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2016-12-12 10:16:10 -0300 |
commit | 30a10d35a8406f4af96fcc8200c4e2173856837d (patch) | |
tree | a2cc82592b3c7f6b6901d64fb4a3003180b7b154 /webapp/client/client.jsx | |
parent | f0d71d87899967335210b9130a7e2b8d180bef46 (diff) | |
download | chat-30a10d35a8406f4af96fcc8200c4e2173856837d.tar.gz chat-30a10d35a8406f4af96fcc8200c4e2173856837d.tar.bz2 chat-30a10d35a8406f4af96fcc8200c4e2173856837d.zip |
PLT-4767 Implement MFA Enforcement (#4662)
* Create MFA setup page and remove MFA setup from account settings modal
* Add enforce MFA to system console and force redirect
* Lockdown mfa required API routes, add localization, other changes
* Minor fixes
* Fix typo
* Fix some unit tests
* Fix more unit tests
* Minor fix
* Updating UI for MFA screen (#4670)
* Updating UI for MFA screen
* Updating styles for MFA page
* Add the ability to switch between email/sso with MFA enabled
* Added mfa change email
* Minor UI updates for MFA enforcement
* Fix unit test
* Fix client unit test
* Allow switching email to ldap and back when MFA is enabled
* Fix unit test
* Revert config.json
Diffstat (limited to 'webapp/client/client.jsx')
-rw-r--r-- | webapp/client/client.jsx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 88f910d46..c2db8a275 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -840,18 +840,13 @@ export default class Client { this.track('api', 'api_users_reset_password'); } - emailToOAuth(email, password, service, success, error) { - var data = {}; - data.password = password; - data.email = email; - data.service = service; - + emailToOAuth(email, password, token, service, success, error) { request. post(`${this.getUsersRoute()}/claim/email_to_oauth`). set(this.defaultHeaders). type('application/json'). accept('application/json'). - send(data). + send({password, email, token, service}). end(this.handleResponse.bind(this, 'emailToOAuth', success, error)); this.track('api', 'api_users_email_to_oauth'); @@ -873,12 +868,13 @@ export default class Client { this.track('api', 'api_users_oauth_to_email'); } - emailToLdap(email, password, ldapId, ldapPassword, success, error) { + emailToLdap(email, password, token, ldapId, ldapPassword, success, error) { var data = {}; data.email_password = password; data.email = email; data.ldap_id = ldapId; data.ldap_password = ldapPassword; + data.token = token; request. post(`${this.getUsersRoute()}/claim/email_to_ldap`). @@ -891,11 +887,12 @@ export default class Client { this.track('api', 'api_users_email_to_ldap'); } - ldapToEmail(email, emailPassword, ldapPassword, success, error) { + ldapToEmail(email, emailPassword, token, ldapPassword, success, error) { var data = {}; data.email = email; data.ldap_password = ldapPassword; data.email_password = emailPassword; + data.token = token; request. post(`${this.getUsersRoute()}/claim/ldap_to_email`). |