Move alphaNumericRegex to schema checker from todo

merge-requests/341/head
Thomas Lynch 2 years ago
parent e73cef4caf
commit aaae81ff5b
Signed by: fatchan
GPG Key ID: 112884AA57DF40B1
  1. 3
      controllers/forms/create.js
  2. 3
      controllers/forms/deleteboard.js
  3. 3
      controllers/forms/editaccount.js
  4. 3
      controllers/forms/editstaff.js
  5. 5
      controllers/forms/register.js
  6. 3
      controllers/forms/resign.js
  7. 3
      controllers/forms/transfer.js
  8. 4
      lib/input/alphanumregex.js
  9. 2
      lib/input/schema.js

@ -4,9 +4,8 @@ const createBoard = require(__dirname+'/../../models/forms/create.js')
, Permissions = require(__dirname+'/../../lib/permission/permissions.js')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, config = require(__dirname+'/../../lib/misc/config.js')
, alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, { checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -3,9 +3,8 @@
const { Boards } = require(__dirname+'/../../db/')
, deleteBoard = require(__dirname+'/../../models/forms/deleteboard.js')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, { checkSchema, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -2,11 +2,10 @@
const editAccount = require(__dirname+'/../../models/forms/editaccount.js')
, { Accounts } = require(__dirname+'/../../db/')
, alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, roleManager = require(__dirname+'/../../lib/permission/rolemanager.js')
, { checkSchema, lengthBody, inArrayBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, lengthBody, inArrayBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -1,10 +1,9 @@
'use strict';
const editStaff = require(__dirname+'/../../models/forms/editstaff.js')
, alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, { checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -1,11 +1,10 @@
'use strict';
const alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, Permissions = require(__dirname+'/../../lib/permission/permissions.js')
const Permissions = require(__dirname+'/../../lib/permission/permissions.js')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, registerAccount = require(__dirname+'/../../models/forms/register.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, { checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -3,9 +3,8 @@
const { Boards } = require(__dirname+'/../../db/')
, resignFromBoard = require(__dirname+'/../../models/forms/resign.js')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, { checkSchema, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -3,9 +3,8 @@
const transferBoard = require(__dirname+'/../../models/forms/transferboard.js')
, { Accounts } = require(__dirname+'/../../db/')
, dynamicResponse = require(__dirname+'/../../lib/misc/dynamic.js')
, alphaNumericRegex = require(__dirname+'/../../lib/input/alphanumregex.js')
, paramConverter = require(__dirname+'/../../lib/middleware/input/paramconverter.js')
, { checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
, { alphaNumericRegex, checkSchema, lengthBody, existsBody } = require(__dirname+'/../../lib/input/schema.js');
module.exports = {

@ -1,4 +0,0 @@
'use strict';
//literally just alphanumeric ¯\_(ツ)_/¯
module.exports = /^[a-zA-Z0-9]+$/;

@ -2,7 +2,7 @@
module.exports = {
//TODO: move some other checks here? like isAlphaNumeric would be a good example
alphaNumericRegex: /^[a-zA-Z0-9]+$/,
//just whether it exists, for stuff like checkboxes where the value doesnt matter
existsBody: (data) => {

Loading…
Cancel
Save