mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 17:56:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove id_server param for password reset

Browse source 
For HSes that no longer need it, remove the id_server param from password reset.

Part of https://github.com/vector-im/riot-web/issues/10941
This commit is contained in:
J. Ryan Stinnett 2019-09-24 14:47:08 +01:00
parent 7113772f9d
commit 0c51e41ea4
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/PasswordReset.js
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -72,15 +73,21 @@ class PasswordReset {
* with a "message" property which contains a human-readable message detailing why * with a "message" property which contains a human-readable message detailing why
* the reset failed, e.g. "There is no mapped matrix user ID for the given email address". * the reset failed, e.g. "There is no mapped matrix user ID for the given email address".
*/ */
checkEmailLinkClicked() { async checkEmailLinkClicked() {
return this.client.setPassword({ const creds = {
type: "m.login.email.identity",
threepid_creds: {
sid: this.sessionId, sid: this.sessionId,
client_secret: this.clientSecret, client_secret: this.clientSecret,
id_server: this.identityServerDomain, };
}, if (await this.doesServerRequireIdServerParam()) {
}, this.password).catch(function(err) { creds.id_server = this.identityServerDomain;
}
try {
await this.client.setPassword({
type: "m.login.email.identity",
threepid_creds: creds,
}, this.password);
} catch (err) {
if (err.httpStatus === 401) { if (err.httpStatus === 401) {
err.message = _t('Failed to verify email address: make sure you clicked the link in the email'); err.message = _t('Failed to verify email address: make sure you clicked the link in the email');
} else if (err.httpStatus === 404) { } else if (err.httpStatus === 404) {
@ -90,7 +97,7 @@ class PasswordReset {
err.message += ` (Status ${err.httpStatus})`; err.message += ` (Status ${err.httpStatus})`;
} }
throw err; throw err;
}); }
} }
} }

9
src/components/structures/auth/ForgotPassword.js
View file

@ -117,17 +117,18 @@ module.exports = createReactClass({
}); });
}, },
onVerify: function(ev) { onVerify: async function(ev) {
ev.preventDefault(); ev.preventDefault();
if (!this.reset) { if (!this.reset) {
console.error("onVerify called before submitPasswordReset!"); console.error("onVerify called before submitPasswordReset!");
return; return;
} }
this.reset.checkEmailLinkClicked().done((res) => { try {
await this.reset.checkEmailLinkClicked();
this.setState({ phase: PHASE_DONE }); this.setState({ phase: PHASE_DONE });
}, (err) => { } catch (err) {
this.showErrorDialog(err.message); this.showErrorDialog(err.message);
}); }
}, },
onSubmitForm: async function(ev) { onSubmitForm: async function(ev) {