From e0c767bc1ee7f5b701bdbfcc9f368bb4ca2bd5fc Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zachwass2000@gmail.com>
Date: Mon, 13 Feb 2017 15:34:24 -0800
Subject: [PATCH] Update JS password validation (#1213)

Fixes #1212
---
 .../components/forms/validators/valid_password/index.js  | 7 +------
 .../validators/valid_password/valid_password.tests.js    | 9 ++++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/components/forms/validators/valid_password/index.js b/frontend/components/forms/validators/valid_password/index.js
index 0f63673ee8..97af216836 100644
--- a/frontend/components/forms/validators/valid_password/index.js
+++ b/frontend/components/forms/validators/valid_password/index.js
@@ -1,14 +1,9 @@
 const LETTER_PRESENT = /[a-z]+/i;
 const NUMBER_PRESENT = /[0-9]+/;
-const SYMBOL_PRESENT = /[!@#\$%\^&\*\(\)]+/i;
-
-const noWhitespace = (password) => {
-  return password.indexOf(' ') === -1;
-};
+const SYMBOL_PRESENT = /\W+/;
 
 export default (password = '') => {
   return password.length >= 7 &&
-    noWhitespace(password) &&
     LETTER_PRESENT.test(password) &&
     NUMBER_PRESENT.test(password) &&
     SYMBOL_PRESENT.test(password);
diff --git a/frontend/components/forms/validators/valid_password/valid_password.tests.js b/frontend/components/forms/validators/valid_password/valid_password.tests.js
index 8659e2fc1f..ed2f08a363 100644
--- a/frontend/components/forms/validators/valid_password/valid_password.tests.js
+++ b/frontend/components/forms/validators/valid_password/valid_password.tests.js
@@ -11,9 +11,8 @@ describe('validPassword', () => {
     const allLetters = 'mypassword';
     const allNumbers = '123456789';
     const allSymbols = '!@#$%^&*()';
-    const containsSpace = 'p@ ssw0rd';
 
-    const invalidPasswords = [tooShort, noSymbols, noLetters, noNumbers, allLetters, allNumbers, allSymbols, containsSpace];
+    const invalidPasswords = [tooShort, noSymbols, noLetters, noNumbers, allLetters, allNumbers, allSymbols];
 
     invalidPasswords.map((password) => {
       return expect(validPassword(password)).toEqual(false, `expected ${password} to not be valid`);
@@ -21,6 +20,10 @@ describe('validPassword', () => {
   });
 
   it('is valid if the password is at least 7 characters and includes a number and a symbol', () => {
-    expect(validPassword('p@ssw0rd')).toEqual(true, 'expected p@ssw0rd to be valid');
+    const validPasswords = ['p@assw0rd', 'This should be v4lid!', 'admin123.', 'pRZ\'bW,6\'6o}HnpL62'];
+
+    validPasswords.map((password) => {
+      return expect(validPassword(password)).toEqual(true, `expected ${password} to be valid`);
+    });
   });
 });