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

Pass in object of the right type

pull/21833/head
David Baker 2019-06-12 18:11:58 +01:00
parent 10377b42e9
commit 1139f68de8
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
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.
@ -219,18 +220,6 @@ export default React.createClass({
return {serverConfig: props}; return {serverConfig: props};
}, },
getRegisterServerProperties() {
const props = this.getServerProperties();
if (this.state.register_hs_url) {
props.hsUrl = this.state.register_hs_url;
}
if (this.state.register_is_url) {
props.isUrl = this.state.register_is_url;
}
return {serverConfig: props};
},
componentWillMount: function() { componentWillMount: function() {
SdkConfig.put(this.props.config); SdkConfig.put(this.props.config);
@ -688,7 +677,7 @@ export default React.createClass({
}); });
}, },
_startRegistration: function(params) { _startRegistration: async function(params) {
const newState = { const newState = {
view: VIEWS.REGISTER, view: VIEWS.REGISTER,
}; };
@ -701,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;
} }
@ -1883,7 +1874,7 @@ export default React.createClass({
onLoggedIn={this.onRegistered} onLoggedIn={this.onRegistered}
onLoginClick={this.onLoginClick} onLoginClick={this.onLoginClick}
onServerConfigChange={this.onServerConfigChange} onServerConfigChange={this.onServerConfigChange}
{...this.getRegisterServerProperties()} {...this.getServerProperties()}
/> />
); );
} }