OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Matrix client is no longer returned by onLoggedIn 

It seems non-obvious that it should do, and the doc saying it should
do seems to have disappeared.
pull/21833/head
David Baker 2020-06-15 15:18:57 +01:00
parent 3d1ec9effb
commit b02e439b8b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/auth/Registration.js
View File

@ -378,7 +378,7 @@ export default createReactClass({
} }
if (response.access_token) { if (response.access_token) {
const cli = await this.props.onLoggedIn({ await this.props.onLoggedIn({
userId: response.user_id, userId: response.user_id,
deviceId: response.device_id, deviceId: response.device_id,
homeserverUrl: this.state.matrixClient.getHomeserverUrl(), homeserverUrl: this.state.matrixClient.getHomeserverUrl(),
@ -386,7 +386,7 @@ export default createReactClass({
accessToken: response.access_token, accessToken: response.access_token,
}, this.state.formVals.password); }, this.state.formVals.password);
this._setupPushers(cli); this._setupPushers();
// we're still busy until we get unmounted: don't show the registration form again // we're still busy until we get unmounted: don't show the registration form again
newState.busy = true; newState.busy = true;
} else { } else {
@ -397,10 +397,11 @@ export default createReactClass({
this.setState(newState); this.setState(newState);
}, },
_setupPushers: function(matrixClient) { _setupPushers: function() {
if (!this.props.brand) { if (!this.props.brand) {
return Promise.resolve(); return Promise.resolve();
} }
const matrixClient = MatrixClientPeg.get();
return matrixClient.getPushers().then((resp)=>{ return matrixClient.getPushers().then((resp)=>{
const pushers = resp.pushers; const pushers = resp.pushers;
for (let i = 0; i < pushers.length; ++i) { for (let i = 0; i < pushers.length; ++i) {