Merge branch 'develop' into travis/is-account-data

src/components/structures/auth/ForgotPassword.js

@@ -62,10 +62,12 @@ module.exports = React.createClass({
             serverIsAlive: true,
             serverErrorIsFatal: false,
             serverDeadError: "",
+            serverRequiresIdServer: null,
         };
     },
 
     componentWillMount: function() {
+        this.reset = null;
         this._checkServerLiveliness(this.props.serverConfig);
     },
 
@@ -83,7 +85,14 @@ module.exports = React.createClass({
                 serverConfig.hsUrl,
                 serverConfig.isUrl,
             );
-            this.setState({serverIsAlive: true});
+
+            const pwReset = new PasswordReset(serverConfig.hsUrl, serverConfig.isUrl);
+            const serverRequiresIdServer = await pwReset.doesServerRequireIdServerParam();
+
+            this.setState({
+                serverIsAlive: true,
+                serverRequiresIdServer,
+            });
         } catch (e) {
             this.setState(AutoDiscoveryUtils.authComponentStateForError(e, "forgot_password"));
         }
@@ -256,7 +265,7 @@ module.exports = React.createClass({
             </a>;
         }
 
-        if (!this.props.serverConfig.isUrl) {
+        if (!this.props.serverConfig.isUrl && this.state.serverRequiresIdServer) {
             return <div>
                 <h3>
                     {yourMatrixAccountText}

src/components/structures/auth/Registration.js

@@ -98,6 +98,9 @@ module.exports = React.createClass({
             // component without it.
             matrixClient: null,
 
+            // whether the HS requires an ID server to register with a threepid
+            serverRequiresIdServer: null,
+
             // The user ID we've just registered
             registeredUsername: null,
 
@@ -204,13 +207,23 @@ module.exports = React.createClass({
         }
 
         const {hsUrl, isUrl} = serverConfig;
-        this.setState({
-            matrixClient: Matrix.createClient({
-                baseUrl: hsUrl,
-                idBaseUrl: isUrl,
-            }),
+        const cli = Matrix.createClient({
+            baseUrl: hsUrl,
+            idBaseUrl: isUrl,
+        });
+
+        let serverRequiresIdServer = true;
+        try {
+            serverRequiresIdServer = await cli.doesServerRequireIdServerParam();
+        } catch (e) {
+            console.log("Unable to determine is server needs id_server param", e);
+        }
+
+        this.setState({
+            matrixClient: cli,
+            serverRequiresIdServer,
+            busy: false,
         });
-        this.setState({busy: false});
         try {
             await this._makeRegisterRequest({});
             // This should never succeed since we specified an empty
@@ -550,6 +563,7 @@ module.exports = React.createClass({
                 flows={this.state.flows}
                 serverConfig={this.props.serverConfig}
                 canSubmit={!this.state.serverErrorIsFatal}
+                serverRequiresIdServer={this.state.serverRequiresIdServer}
             />;
         }
     },