imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guard against misconfigured homeservers when adding / binding phone numbers

Browse source 
This ensures we only fallback to submitting MSISDN tokens to the identity server
when we expect to do. Unexpected cases will now throw an error.

Fixes https://github.com/vector-im/riot-web/issues/10936
This commit is contained in:
J. Ryan Stinnett 2019-10-31 14:50:21 +00:00
parent 54cea6a5e3
commit b38c7fc411
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/AddThreepid.js
View file

@ -236,6 +236,8 @@ export default class AddThreepid {
*/
async haveMsisdnToken(msisdnToken) {
const authClient = new IdentityAuthClient();
const supportsSeparateAddAndBind =
await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind();
let result;
if (this.submitUrl) {
@ -245,19 +247,21 @@ export default class AddThreepid {
this.clientSecret,
msisdnToken,
);
} else {
} else if (this.bind || !supportsSeparateAddAndBind) {
result = await MatrixClientPeg.get().submitMsisdnToken(
this.sessionId,
this.clientSecret,
msisdnToken,
await authClient.getAccessToken(),
);
} else {
throw new Error("The add / bind with MSISDN flow is misconfigured");
}
if (result.errcode) {
throw result;
}
if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
if (supportsSeparateAddAndBind) {
if (this.bind) {
await MatrixClientPeg.get().bindThreePid({
sid: this.sessionId,