Merge pull request #90 from crowi/fix-validators

Fix password validator

lib/form/index.js

@@ -1,19 +1,21 @@
-exports.login = require('./login');
-exports.register = require('./register');
-exports.invited = require('./invited');
-exports.revision = require('./revision');
-exports.comment = require('./comment');
-exports.me = {
-  user: require('./me/user'),
-  password: require('./me/password'),
-  apiToken: require('./me/apiToken'),
-};
-exports.admin = {
-  app: require('./admin/app'),
-  sec: require('./admin/sec'),
-  mail: require('./admin/mail'),
-  aws: require('./admin/aws'),
-  google: require('./admin/google'),
-  userInvite: require('./admin/userInvite'),
-  slackSetting: require('./admin/slackSetting'),
+module.exports = {
+  login: require('./login'),
+  register: require('./register'),
+  invited: require('./invited'),
+  revision: require('./revision'),
+  comment: require('./comment'),
+  me: {
+    user: require('./me/user'),
+    password: require('./me/password'),
+    apiToken: require('./me/apiToken'),
+  },
+  admin: {
+    app: require('./admin/app'),
+    sec: require('./admin/sec'),
+    mail: require('./admin/mail'),
+    aws: require('./admin/aws'),
+    google: require('./admin/google'),
+    userInvite: require('./admin/userInvite'),
+    slackSetting: require('./admin/slackSetting'),
+  },
 };

lib/form/invited.js

@@ -6,6 +6,6 @@ var form = require('express-form')
 module.exports = form(
   field('invitedForm.username').required().is(/^[\da-zA-Z\-_]+$/),
   field('invitedForm.name').required(),
-  field('invitedForm.password').required().is(/^[\da-zA-Z@#$%-_&\+\*\?]{6,64}$/)
+  field('invitedForm.password').required().is(/^[\x20-\x7F]{6,}$/)
 );
 

lib/form/login.js

@@ -5,5 +5,5 @@ var form = require('express-form')
 
 module.exports = form(
   field('loginForm.email').required(),
-  field('loginForm.password').required().is(/^[\x20-\x7F]{6,40}$/)
+  field('loginForm.password').required().is(/^[\x20-\x7F]{6,}$/)
 );

lib/form/me/password.js

@@ -5,7 +5,6 @@ var form = require('express-form')
 
 module.exports = form(
   field('mePassword.oldPassword'),
-  field('mePassword.newPassword').required().is(/^[\x20-\x7F]{6,40}$/),
+  field('mePassword.newPassword').required().is(/^[\x20-\x7F]{6,}$/),
   field('mePassword.newPasswordConfirm').required()
 );
-  //[}m943&T^x7.2kB%98;9CD2Kx[kr{/v!4

lib/form/register.js

@@ -7,7 +7,7 @@ module.exports = form(
   field('registerForm.username').required().is(/^[\da-zA-Z\-_\.]+$/),
   field('registerForm.name').required(),
   field('registerForm.email').required(),
-  field('registerForm.password').required().is(/^[\x20-\x7F]{6,40}$/),
+  field('registerForm.password').required().is(/^[\x20-\x7F]{6,}$/),
   field('registerForm.googleId'),
   field('registerForm.googleImage')
 );