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

Merge pull request #3096 from matrix-org/dbkr/use_server_urls_from_query_please 

Fix registration with email + non-default HS
pull/21833/head
David Baker 2019-06-12 19:19:40 +01:00 committed by GitHub
parent f981d72083 1139f68de8
commit c6b1bd4d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/structures/MatrixChat.js
View File

@ -51,7 +51,8 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
import { startAnyRegistrationFlow } from "../../Registration.js"; import { startAnyRegistrationFlow } from "../../Registration.js";
import { messageForSyncError } from '../../utils/ErrorUtils'; import { messageForSyncError } from '../../utils/ErrorUtils';
import ResizeNotifier from "../../utils/ResizeNotifier"; import ResizeNotifier from "../../utils/ResizeNotifier";
import {ValidatedServerConfig} from "../../utils/AutoDiscoveryUtils"; import { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
import AutoDiscoveryUtils from "../../utils/AutoDiscoveryUtils";
// Disable warnings for now: we use deprecated bluebird functions // Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings. // and need to migrate, but they spam the console with warnings.
@ -676,7 +677,7 @@ export default React.createClass({
}); });
}, },
_startRegistration: function(params) { _startRegistration: async function(params) {
const newState = { const newState = {
view: VIEWS.REGISTER, view: VIEWS.REGISTER,
}; };
@ -689,10 +690,12 @@ export default React.createClass({
params.is_url && params.is_url &&
params.sid params.sid
) { ) {
newState.serverConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
params.hs_url, params.is_url,
);
newState.register_client_secret = params.client_secret; newState.register_client_secret = params.client_secret;
newState.register_session_id = params.session_id; newState.register_session_id = params.session_id;
newState.register_hs_url = params.hs_url;
newState.register_is_url = params.is_url;
newState.register_id_sid = params.sid; newState.register_id_sid = params.sid;
} }