PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3476 from matrix-org/jryans/msisdn-reg-submit-url

Browse source 
Send MSISDN validation token to submit_url during registration
This commit is contained in:
J. Ryan Stinnett 2019-09-25 11:30:33 +01:00 committed by GitHub
commit b248918aca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/auth/InteractiveAuthEntryComponents.js
View file

@ -420,6 +420,7 @@ export const MsisdnAuthEntry = createReactClass({
},
componentWillMount: function() {
this._submitUrl = null;
this._sid = null;
this._msisdn = null;
this._tokenBox = null;
@ -442,6 +443,7 @@ export const MsisdnAuthEntry = createReactClass({
this.props.clientSecret,
1, // TODO: Multiple send attempts?
).then((result) => {
this._submitUrl = result.submit_url;
this._sid = result.sid;
this._msisdn = result.msisdn;
});
@ -462,9 +464,16 @@ export const MsisdnAuthEntry = createReactClass({
});
try {
const result = await this.props.matrixClient.submitMsisdnToken(
this._sid, this.props.clientSecret, this.state.token,
);
let result;
if (this._submitUrl) {
result = await this.props.matrixClient.submitMsisdnTokenOtherUrl(
this._submitUrl, this._sid, this.props.clientSecret, this.state.token,
);
} else {
result = await this.props.matrixClient.submitMsisdnToken(
this._sid, this.props.clientSecret, this.state.token,
);
}
if (result.success) {
const creds = {
sid: this._sid,