mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Support UI auth on adding phone numbers

Browse source
This commit is contained in:
David Baker 2019-10-08 19:07:39 +01:00
parent 0b334c0bbc
commit f4a2d216c3
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/AddThreepid.js
View file

@ -254,9 +254,9 @@ export default class AddThreepid {
throw result; throw result;
} }
const identityServerDomain = MatrixClientPeg.get().idBaseUrl.split("://")[1];
if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) { if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
if (this.bind) { if (this.bind) {
const identityServerDomain = MatrixClientPeg.get().idBaseUrl.split("://")[1];
await MatrixClientPeg.get().bindThreePid({ await MatrixClientPeg.get().bindThreePid({
sid: this.sessionId, sid: this.sessionId,
client_secret: this.clientSecret, client_secret: this.clientSecret,
@ -264,12 +264,31 @@ export default class AddThreepid {
id_access_token: await authClient.getAccessToken(), id_access_token: await authClient.getAccessToken(),
}); });
} else { } else {
await MatrixClientPeg.get().addThreePidOnly({ try {
sid: this.sessionId, await this._makeAddThreepidOnlyRequest();
client_secret: this.clientSecret,
// The spec has always required this to use UI auth but synapse briefly
// implemented it without, so this may just succeed and that's OK.
return;
} catch (e) {
if (e.httpStatus !== 401 || !e.data || !e.data.flows) {
// doesn't look like an interactive-auth failure
throw e;
}
// pop up an interactive auth dialog
const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
Modal.createTrackedDialog('Add MSISDN', '', InteractiveAuthDialog, {
title: _t("Add Phone Number"),
matrixClient: MatrixClientPeg.get(),
authData: e.data,
makeRequest: this._makeAddThreepidOnlyRequest,
}); });
} }
}
} else { } else {
const identityServerDomain = MatrixClientPeg.get().idBaseUrl.split("://")[1];
await MatrixClientPeg.get().addThreePid({ await MatrixClientPeg.get().addThreePid({
sid: this.sessionId, sid: this.sessionId,
client_secret: this.clientSecret, client_secret: this.clientSecret,

1
src/i18n/strings/en_EN.json
View file

@ -3,6 +3,7 @@
"This phone number is already in use": "This phone number is already in use", "This phone number is already in use": "This phone number is already in use",
"Add Email Address": "Add Email Address", "Add Email Address": "Add Email Address",
"Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email", "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
"Add Phone Number": "Add Phone Number",
"The platform you're on": "The platform you're on", "The platform you're on": "The platform you're on",
"The version of Riot.im": "The version of Riot.im", "The version of Riot.im": "The version of Riot.im",
"Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)", "Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",