diff --git a/src/components/views/elements/Validation.js b/src/components/views/elements/Validation.js
new file mode 100644
index 0000000000..31363b87c8
--- /dev/null
+++ b/src/components/views/elements/Validation.js
@@ -0,0 +1,131 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/* eslint-disable babel/no-invalid-this */
+
+import classNames from 'classnames';
+
+/**
+ * Creates a validation function from a set of rules describing what to validate.
+ *
+ * @param {Function} description
+ * Function that returns a string summary of the kind of value that will
+ * meet the validation rules. Shown at the top of the validation feedback.
+ * @param {Object} rules
+ * An array of rules describing how to check to input value. Each rule in an object
+ * and may have the following properties:
+ * - `key`: A unique ID for the rule. Required.
+ * - `test`: A function used to determine the rule's current validity. Required.
+ * - `valid`: Function returning text to show when the rule is valid. Only shown if set.
+ * - `invalid`: Function returning text to show when the rule is invalid. Only shown if set.
+ * @returns {Function}
+ * A validation function that takes in the current input value and returns
+ * the overall validity and a feedback UI that can be rendered for more detail.
+ */
+export default function withValidation({ description, rules }) {
+ return async function onValidate({ value, focused, allowEmpty = true }) {
+ if (!value && allowEmpty) {
+ return {
+ valid: null,
+ feedback: null,
+ };
+ }
+
+ const results = [];
+ let valid = true;
+ if (rules && rules.length) {
+ for (const rule of rules) {
+ if (!rule.key || !rule.test) {
+ continue;
+ }
+ // We're setting `this` to whichever component holds the validation
+ // function. That allows rules to access the state of the component.
+ const ruleValid = await rule.test.call(this, { value, allowEmpty });
+ valid = valid && ruleValid;
+ if (ruleValid && rule.valid) {
+ // If the rule's result is valid and has text to show for
+ // the valid state, show it.
+ const text = rule.valid.call(this);
+ if (!text) {
+ continue;
+ }
+ results.push({
+ key: rule.key,
+ valid: true,
+ text,
+ });
+ } else if (!ruleValid && rule.invalid) {
+ // If the rule's result is invalid and has text to show for
+ // the invalid state, show it.
+ const text = rule.invalid.call(this);
+ if (!text) {
+ continue;
+ }
+ results.push({
+ key: rule.key,
+ valid: false,
+ text,
+ });
+ }
+ }
+ }
+
+ // Hide feedback when not focused
+ if (!focused) {
+ return {
+ valid,
+ feedback: null,
+ };
+ }
+
+ let details;
+ if (results && results.length) {
+ details =
+ {results.map(result => {
+ const classes = classNames({
+ "mx_Validation_detail": true,
+ "mx_Validation_valid": result.valid,
+ "mx_Validation_invalid": !result.valid,
+ });
+ return -
+ {result.text}
+
;
+ })}
+
;
+ }
+
+ let summary;
+ if (description) {
+ // We're setting `this` to whichever component holds the validation
+ // function. That allows rules to access the state of the component.
+ const content = description.call(this);
+ summary =
{content}
;
+ }
+
+ let feedback;
+ if (summary || details) {
+ feedback =
+ {summary}
+ {details}
+
;
+ }
+
+ return {
+ valid,
+ feedback,
+ };
+ };
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a7fae2803f..d1ff8b2695 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1322,12 +1322,26 @@
"Change": "Change",
"Sign in with": "Sign in with",
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
+ "Use an email address to recover your account": "Use an email address to recover your account",
+ "Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
+ "Doesn't look like a valid email address": "Doesn't look like a valid email address",
+ "Enter password": "Enter password",
+ "Nice, strong password!": "Nice, strong password!",
+ "Keep going...": "Keep going...",
+ "Passwords don't match": "Passwords don't match",
+ "Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
+ "Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
+ "Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
+ "Use letters, numbers, dashes and underscores only": "Use letters, numbers, dashes and underscores only",
+ "Enter username": "Enter username",
+ "Some characters not allowed": "Some characters not allowed",
+ "Email (optional)": "Email (optional)",
+ "Confirm": "Confirm",
+ "Phone (optional)": "Phone (optional)",
"Create your Matrix account": "Create your Matrix account",
"Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
- "Email (optional)": "Email (optional)",
- "Phone (optional)": "Phone (optional)",
- "Confirm": "Confirm",
- "Use an email address to recover your account. Other users can invite you to rooms using your contact details.": "Use an email address to recover your account. Other users can invite you to rooms using your contact details.",
+ "Use an email address to recover your account.": "Use an email address to recover your account.",
+ "Other users can invite you to rooms using your contact details.": "Other users can invite you to rooms using your contact details.",
"Other servers": "Other servers",
"Enter custom server URLs
What does this mean?": "Enter custom server URLs
What does this mean?",
"Homeserver URL": "Homeserver URL",
@@ -1515,15 +1529,6 @@
"Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
"Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
"This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
- "Missing password.": "Missing password.",
- "Passwords don't match.": "Passwords don't match.",
- "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Password too short (min %(MIN_PASSWORD_LENGTH)s).",
- "This doesn't look like a valid email address.": "This doesn't look like a valid email address.",
- "This doesn't look like a valid phone number.": "This doesn't look like a valid phone number.",
- "An email address is required to register on this homeserver.": "An email address is required to register on this homeserver.",
- "A phone number is required to register on this homeserver.": "A phone number is required to register on this homeserver.",
- "You need to enter a username.": "You need to enter a username.",
- "An unknown error occurred.": "An unknown error occurred.",
"Create your account": "Create your account",
"Commands": "Commands",
"Results from DuckDuckGo": "Results from DuckDuckGo",
@@ -1562,7 +1567,6 @@
"File to import": "File to import",
"Import": "Import",
"Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
- "Keep going...": "Keep going...",
"We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
"For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
"Enter a passphrase...": "Enter a passphrase...",
diff --git a/src/utils/PasswordScorer.js b/src/utils/PasswordScorer.js
index 647436c131..3c366a73f8 100644
--- a/src/utils/PasswordScorer.js
+++ b/src/utils/PasswordScorer.js
@@ -67,7 +67,9 @@ export function scorePassword(password) {
if (password.length === 0) return null;
const userInputs = ZXCVBN_USER_INPUTS.slice();
- userInputs.push(MatrixClientPeg.get().getUserIdLocalpart());
+ if (MatrixClientPeg.get()) {
+ userInputs.push(MatrixClientPeg.get().getUserIdLocalpart());
+ }
let zxcvbnResult = zxcvbn(password, userInputs);
// Work around https://github.com/dropbox/zxcvbn/issues/216