1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-19 05:22:13 +03:00

Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg

Remove 3PID binding during registration
This commit is contained in:
J. Ryan Stinnett
2019-08-08 17:48:50 +01:00
committed by GitHub

View File

@@ -403,14 +403,9 @@ module.exports = React.createClass({
// clicking the email link. // clicking the email link.
let inhibitLogin = Boolean(this.state.formVals.email); let inhibitLogin = Boolean(this.state.formVals.email);
// Only send the bind params if we're sending username / pw params // Only send inhibitLogin if we're sending username / pw params
// (Since we need to send no params at all to use the ones saved in the // (Since we need to send no params at all to use the ones saved in the
// session). // session).
const bindThreepids = this.state.formVals.password ? {
email: true,
msisdn: true,
} : {};
// Likewise inhibitLogin
if (!this.state.formVals.password) inhibitLogin = null; if (!this.state.formVals.password) inhibitLogin = null;
return this.state.matrixClient.register( return this.state.matrixClient.register(
@@ -418,7 +413,7 @@ module.exports = React.createClass({
this.state.formVals.password, this.state.formVals.password,
undefined, // session id: included in the auth dict already undefined, // session id: included in the auth dict already
auth, auth,
bindThreepids, null,
null, null,
inhibitLogin, inhibitLogin,
); );