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

Improve SSO UIA

Browse source 
Fixes Fallback UIA postmessage interface
Auto-closes SSO UIA tab when the user has completed the flow within it
Error for when auth stage is restarted because it failed
This commit is contained in:
Michael Telatynski 2021-01-28 10:45:29 +00:00
parent 34ae766893
commit 1761a4ec80
4 changed files with 62 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/InteractiveAuth.js
View file

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

6
src/components/structures/MatrixChat.tsx
View file

@ -325,9 +325,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
this.props.realQueryParams,
this.props.defaultDeviceDisplayName,
).then(async (loggedIn) => {
if (this.props.realQueryParams?.loginToken) {
// remove the loginToken from the URL regardless
this.props.onTokenLoginCompleted();
}
if (loggedIn) {
this.tokenLogin = true;
this.props.onTokenLoginCompleted();
// Create and start the client
await Lifecycle.restoreFromLocalStorage({