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

Apply suggestions from code review 

Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
pull/21833/head
Michael Telatynski 2021-01-29 13:05:09 +00:00 committed by GitHub
parent 0167c3cefb
commit 0eb0d242d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/InteractiveAuth.js
View File

@ -179,7 +179,8 @@ export default class InteractiveAuthComponent extends React.Component {
}, () => { }, () => {
if (oldStage !== stageType) { if (oldStage !== stageType) {
this._setFocus(); this._setFocus();
} else if (!stageState.error && this._stageComponent.current && } else if (
!stageState.error && this._stageComponent.current &&
this._stageComponent.current.attemptFailed this._stageComponent.current.attemptFailed
) { ) {
this._stageComponent.current.attemptFailed(); this._stageComponent.current.attemptFailed();

2
src/components/views/auth/InteractiveAuthEntryComponents.js
View File

@ -626,6 +626,7 @@ export class SSOAuthEntry extends React.Component {
window.removeEventListener("message", this._onReceiveMessage); window.removeEventListener("message", this._onReceiveMessage);
if (this._popupWindow) { if (this._popupWindow) {
this._popupWindow.close(); this._popupWindow.close();
this._popupWindow = null;
} }
} }
@ -639,6 +640,7 @@ export class SSOAuthEntry extends React.Component {
if (event.data === "authDone" && event.origin === this.props.matrixClient.getHomeserverUrl()) { if (event.data === "authDone" && event.origin === this.props.matrixClient.getHomeserverUrl()) {
if (this._popupWindow) { if (this._popupWindow) {
this._popupWindow.close(); this._popupWindow.close();
this._popupWindow = null;
} }
} }
}; };