Merge pull request #3526 from matrix-org/travis/recaptcha-fix

Null-guard the recaptcha setup
2019-10-07 13:05:52 +01:00
parent c547367b62 495513028c
commit 9200c55ce0
2 changed files with 14 additions and 3 deletions
@@ -190,14 +190,24 @@ export const RecaptchaAuthEntry = createReactClass({
            return <Loader />;
        }

+        let errorText = this.props.errorText;
+
        const CaptchaForm = sdk.getComponent("views.auth.CaptchaForm");
-        const sitePublicKey = this.props.stageParams.public_key;
+        let sitePublicKey;
+        if (!this.props.stageParams || !this.props.stageParams.public_key) {
+            errorText = _t(
+                "Missing captcha public key in homeserver configuration. Please report " +
+                "this to your homeserver administrator.",
+            );
+        } else {
+            sitePublicKey = this.props.stageParams.public_key;
+        }

        let errorSection;
-        if (this.props.errorText) {
+        if (errorText) {
            errorSection = (
                <div className="error" role="alert">
-                    { this.props.errorText }
+                    { errorText }
                </div>
            );
        }