Browse Source

Fix password validator

Sotaro KARASAWA 10 years ago
parent
commit
85ae851527
6 changed files with 13 additions and 4 deletions
  1. 2 0
      lib/form/index.js
  2. 1 1
      lib/form/invited.js
  3. 1 1
      lib/form/login.js
  4. 1 1
      lib/form/me/password.js
  5. 1 1
      lib/form/register.js
  6. 7 0
      lib/form/validator.js

+ 2 - 0
lib/form/index.js

@@ -1,3 +1,5 @@
+var validator = require('./validator');
+
 exports.login = require('./login');
 exports.register = require('./register');
 exports.invited = require('./invited');

+ 1 - 1
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]+$/)
 );
 

+ 1 - 1
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]+$/)
 );

+ 1 - 1
lib/form/me/password.js

@@ -5,7 +5,7 @@ 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]+$/),
   field('mePassword.newPasswordConfirm').required()
 );
   //[}m943&T^x7.2kB%98;9CD2Kx[kr{/v!4

+ 1 - 1
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]+$/),
   field('registerForm.googleId'),
   field('registerForm.googleImage')
 );

+ 7 - 0
lib/form/validator.js

@@ -0,0 +1,7 @@
+var Validator = {};
+
+Validator.validatePassword = function(value) {
+
+}
+
+module.exports = Validator;