Skip server details on registration with a default HS
If Riot has been configured with a `default_hs_url` (or `default_server_name`, which then sets a default HS URL), then skip the server details on registration by default. Fixes https://github.com/vector-im/riot-web/issues/8840pull/21833/head
							parent
							
								
									8b66b6bdb3
								
							
						
					
					
						commit
						fe141412b6
					
				|  | @ -245,6 +245,17 @@ export default React.createClass({ | |||
|         return this.state.defaultIsUrl || "https://vector.im"; | ||||
|     }, | ||||
| 
 | ||||
|     /** | ||||
|      * Whether to skip the server details phase of registration and start at the | ||||
|      * actual form. | ||||
|      * @return {boolean} | ||||
|      *     If there was a configured default HS or default server name, skip the | ||||
|      *     the server details. | ||||
|      */ | ||||
|     skipServerDetailsForRegistration() { | ||||
|         return !!this.state.defaultHsUrl; | ||||
|     }, | ||||
| 
 | ||||
|     componentWillMount: function() { | ||||
|         SdkConfig.put(this.props.config); | ||||
| 
 | ||||
|  | @ -1891,6 +1902,7 @@ export default React.createClass({ | |||
|                     defaultServerDiscoveryError={this.state.defaultServerDiscoveryError} | ||||
|                     defaultHsUrl={this.getDefaultHsUrl()} | ||||
|                     defaultIsUrl={this.getDefaultIsUrl()} | ||||
|                     skipServerDetails={this.skipServerDetailsForRegistration()} | ||||
|                     brand={this.props.config.brand} | ||||
|                     customHsUrl={this.getCurrentHsUrl()} | ||||
|                     customIsUrl={this.getCurrentIsUrl()} | ||||
|  |  | |||
|  | @ -60,6 +60,7 @@ module.exports = React.createClass({ | |||
|         customIsUrl: PropTypes.string, | ||||
|         defaultHsUrl: PropTypes.string, | ||||
|         defaultIsUrl: PropTypes.string, | ||||
|         skipServerDetails: PropTypes.bool, | ||||
|         brand: PropTypes.string, | ||||
|         email: PropTypes.string, | ||||
|         // registration shouldn't know or care how login is done.
 | ||||
|  | @ -75,8 +76,10 @@ module.exports = React.createClass({ | |||
|             // (they could come in from the URL params in a
 | ||||
|             // registration email link)
 | ||||
|             (this.props.clientSecret && this.props.sessionId) || | ||||
|             // or if custom URLs aren't allowed, skip them
 | ||||
|             !customURLsAllowed | ||||
|             // if custom URLs aren't allowed, skip to form
 | ||||
|             !customURLsAllowed || | ||||
|             // if other logic says to, skip to form
 | ||||
|             this.props.skipServerDetails | ||||
|         ) { | ||||
|             initialPhase = PHASE_REGISTRATION; | ||||
|         } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 J. Ryan Stinnett
						J. Ryan Stinnett