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

Null-guard the recaptcha setup 

Fixes https://github.com/vector-im/riot-web/issues/11069
pull/21833/head
Travis Ralston 2019-10-07 12:36:07 +01:00
parent 7d96517139
commit 082ebe636e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/auth/InteractiveAuthEntryComponents.js
View File

@ -190,14 +190,21 @@ export const RecaptchaAuthEntry = createReactClass({
return <Loader />; return <Loader />;
} }
let errorText = this.props.errorText;
const CaptchaForm = sdk.getComponent("views.auth.CaptchaForm"); 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 - check your server configuration");
} else {
sitePublicKey = this.props.stageParams.public_key;
}
let errorSection; let errorSection;
if (this.props.errorText) { if (errorText) {
errorSection = ( errorSection = (
<div className="error" role="alert"> <div className="error" role="alert">
{ this.props.errorText } { errorText }
</div> </div>
); );
} }

1
src/i18n/strings/en_EN.json
View File

@ -1478,6 +1478,7 @@
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.", "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
"To continue, please enter your password.": "To continue, please enter your password.", "To continue, please enter your password.": "To continue, please enter your password.",
"Missing captcha public key - check your server configuration": "Missing captcha public key - check your server configuration",
"Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies", "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",
"Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:", "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
"An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s", "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",