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

Merge remote-tracking branch 'origin/develop' into dbkr/add_threepid_ui_auth

Browse source
This commit is contained in:
David Baker 2019-10-08 19:11:00 +01:00
commit 4a56aa16b8
7 changed files with 63 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/AddThreepid.js
View file

@ -22,6 +22,10 @@ import Modal from './Modal';
import { _t } from './languageHandler';
import IdentityAuthClient from './IdentityAuthClient';
function getIdServerDomain() {
return MatrixClientPeg.get().idBaseUrl.split("://")[1];
}
/**
* Allows a user to add a third party identifier to their homeserver and,
* optionally, the identity servers.
@ -166,7 +170,7 @@ export default class AddThreepid {
await MatrixClientPeg.get().bindThreePid({
sid: this.sessionId,
client_secret: this.clientSecret,
id_server: identityServerDomain,
id_server: getIdServerDomain(),
id_access_token: identityAccessToken,
});
} else {
@ -198,7 +202,7 @@ export default class AddThreepid {
await MatrixClientPeg.get().addThreePid({
sid: this.sessionId,
client_secret: this.clientSecret,
id_server: identityServerDomain,
id_server: getIdServerDomain(),
}, this.bind);
}
} catch (err) {
@ -260,7 +264,7 @@ export default class AddThreepid {
await MatrixClientPeg.get().bindThreePid({
sid: this.sessionId,
client_secret: this.clientSecret,
id_server: identityServerDomain,
id_server: getIdServerDomain(),
id_access_token: await authClient.getAccessToken(),
});
} else {
@ -292,7 +296,7 @@ export default class AddThreepid {
await MatrixClientPeg.get().addThreePid({
sid: this.sessionId,
client_secret: this.clientSecret,
id_server: identityServerDomain,
id_server: getIdServerDomain(),
}, this.bind);
}
}