matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' into travis/dispatcher-types

Browse Source
This commit is contained in:
Travis Ralston
2020-05-15 09:56:02 -06:00
parent e4835c4b03 07eed94b35
commit 798e7a1f86
38 changed files with 517 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,10 +243,15 @@ export default createReactClass({
});
};
try {
await this._makeRegisterRequest({});
// This should never succeed since we specified an empty
// auth object.
console.log("Expecting 401 from register request but got success!");
// We do the first registration request ourselves to discover whether we need to
// do SSO instead. If we've already started the UI Auth process though, we don't
// need to.
if (!this.state.doingUIAuth) {
await this._makeRegisterRequest({});
// This should never succeed since we specified an empty
// auth object.
console.log("Expecting 401 from register request but got success!");
}
} catch (e) {
if (e.httpStatus === 401) {
this.setState({