@azteam/express 1.2.286 → 1.2.288
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/SocketServer.js +2 -2
- package/lib/index.js +0 -12
- package/lib/middleware/validateMiddleware.js +5 -53
- package/package.json +3 -3
- package/src/SocketServer.js +2 -2
- package/src/index.js +0 -1
- package/src/middleware/validateMiddleware.js +2 -51
- package/src/validate.js +0 -161
package/lib/SocketServer.js
CHANGED
|
@@ -10,7 +10,7 @@ var _express = _interopRequireDefault(require("express"));
|
|
|
10
10
|
var _socket = _interopRequireDefault(require("socket.io"));
|
|
11
11
|
var _bodyParser = _interopRequireDefault(require("body-parser"));
|
|
12
12
|
var _cookieParser = _interopRequireDefault(require("cookie-parser"));
|
|
13
|
-
var
|
|
13
|
+
var _redisAdapter = require("@socket.io/redis-adapter");
|
|
14
14
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
15
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
16
16
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
@@ -142,7 +142,7 @@ var SocketServer = /*#__PURE__*/function () {
|
|
|
142
142
|
}
|
|
143
143
|
});
|
|
144
144
|
if (this.options.redisConfig) {
|
|
145
|
-
io.adapter((0,
|
|
145
|
+
io.adapter((0, _redisAdapter.createAdapter)(this.options.redisConfig));
|
|
146
146
|
}
|
|
147
147
|
var msg = [];
|
|
148
148
|
_lodash["default"].map(this.controllers, function (obj) {
|
package/lib/index.js
CHANGED
|
@@ -47,18 +47,6 @@ Object.keys(_constant).forEach(function (key) {
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
});
|
|
50
|
-
var _validate = require("./validate");
|
|
51
|
-
Object.keys(_validate).forEach(function (key) {
|
|
52
|
-
if (key === "default" || key === "__esModule") return;
|
|
53
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
54
|
-
if (key in exports && exports[key] === _validate[key]) return;
|
|
55
|
-
Object.defineProperty(exports, key, {
|
|
56
|
-
enumerable: true,
|
|
57
|
-
get: function get() {
|
|
58
|
-
return _validate[key];
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
});
|
|
62
50
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
63
51
|
var _default = _Server["default"];
|
|
64
52
|
exports["default"] = _default;
|
|
@@ -5,69 +5,21 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports["default"] = _default;
|
|
8
|
-
var
|
|
9
|
-
var _fastestValidator = _interopRequireDefault(require("fastest-validator"));
|
|
8
|
+
var _validator = _interopRequireDefault(require("@azteam/validator"));
|
|
10
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
11
10
|
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
|
12
11
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
13
12
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
14
|
-
var v = new _fastestValidator["default"]({
|
|
15
|
-
messages: {
|
|
16
|
-
jsonString: "The '{field}' field must be an json string! Actual: {actual}"
|
|
17
|
-
}
|
|
18
|
-
});
|
|
19
|
-
v.add('json', function (_ref, path, context) {
|
|
20
|
-
var schema = _ref.schema,
|
|
21
|
-
messages = _ref.messages;
|
|
22
|
-
return {
|
|
23
|
-
source: "\n try {\n JSON.parse(value);\n } catch (e) {\n ".concat(this.makeError({
|
|
24
|
-
type: 'jsonString',
|
|
25
|
-
actual: 'value',
|
|
26
|
-
messages: messages
|
|
27
|
-
}), "\n return;\n }\n return value; \n ")
|
|
28
|
-
};
|
|
29
|
-
});
|
|
30
|
-
|
|
31
|
-
/* remove empty field or not have validate field */
|
|
32
|
-
function omitData(data) {
|
|
33
|
-
var inKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
34
|
-
Object.keys(data).map(function (key, index) {
|
|
35
|
-
if (inKeys.includes(key)) {
|
|
36
|
-
var value = data[key];
|
|
37
|
-
if (typeof value === 'string') {
|
|
38
|
-
value = value.trim();
|
|
39
|
-
if (value === '' || value === 'NaN' || value === 'null' || value === 'undefined') {
|
|
40
|
-
delete data[key];
|
|
41
|
-
} else {
|
|
42
|
-
data[key] = value;
|
|
43
|
-
}
|
|
44
|
-
} else if (value === null || value === undefined || Number.isNaN(value)) {
|
|
45
|
-
delete data[key];
|
|
46
|
-
}
|
|
47
|
-
} else {
|
|
48
|
-
delete data[key];
|
|
49
|
-
}
|
|
50
|
-
});
|
|
51
|
-
return data;
|
|
52
|
-
}
|
|
53
13
|
function _default(type, rules) {
|
|
54
14
|
return /*#__PURE__*/function () {
|
|
55
|
-
var
|
|
56
|
-
var reqData, errors;
|
|
15
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
|
|
57
16
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
58
17
|
while (1) {
|
|
59
18
|
switch (_context.prev = _context.next) {
|
|
60
19
|
case 0:
|
|
61
|
-
|
|
62
|
-
errors = v.validate(reqData, rules);
|
|
63
|
-
if (!Array.isArray(errors)) {
|
|
64
|
-
_context.next = 4;
|
|
65
|
-
break;
|
|
66
|
-
}
|
|
67
|
-
throw new _error.ErrorException(_error.INVALID, errors);
|
|
68
|
-
case 4:
|
|
20
|
+
(0, _validator["default"])(req[type], rules, true);
|
|
69
21
|
return _context.abrupt("return", next());
|
|
70
|
-
case
|
|
22
|
+
case 2:
|
|
71
23
|
case "end":
|
|
72
24
|
return _context.stop();
|
|
73
25
|
}
|
|
@@ -75,7 +27,7 @@ function _default(type, rules) {
|
|
|
75
27
|
}, _callee);
|
|
76
28
|
}));
|
|
77
29
|
return function (_x, _x2, _x3) {
|
|
78
|
-
return
|
|
30
|
+
return _ref.apply(this, arguments);
|
|
79
31
|
};
|
|
80
32
|
}();
|
|
81
33
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azteam/express",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.288",
|
|
4
4
|
"main": "./lib/index.js",
|
|
5
5
|
"module": "./src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
"@azteam/crypto": "1.0.27",
|
|
13
13
|
"@azteam/error": "1.0.29",
|
|
14
14
|
"@azteam/http-client": "1.0.103",
|
|
15
|
+
"@azteam/validator": "1.0.1",
|
|
15
16
|
"@grpc/grpc-js": "1.6.7",
|
|
16
17
|
"@grpc/proto-loader": "0.6.12",
|
|
17
18
|
"body-parser": "1.19.0",
|
|
@@ -22,7 +23,6 @@
|
|
|
22
23
|
"express": "4.17.1",
|
|
23
24
|
"express-async-errors": "3.1.1",
|
|
24
25
|
"express-rate-limit": "5.1.3",
|
|
25
|
-
"fastest-validator": "1.8.0",
|
|
26
26
|
"helmet": "3.21.2",
|
|
27
27
|
"jsonwebtoken": "8.2.1",
|
|
28
28
|
"lodash": "4.17.21",
|
|
@@ -30,6 +30,6 @@
|
|
|
30
30
|
"morgan": "1.10.0",
|
|
31
31
|
"psl": "1.8.0",
|
|
32
32
|
"socket.io": "4.4.1",
|
|
33
|
-
"socket.io-
|
|
33
|
+
"@socket.io/redis-adapter": "7.2.0"
|
|
34
34
|
}
|
|
35
35
|
}
|
package/src/SocketServer.js
CHANGED
|
@@ -4,7 +4,7 @@ import express from 'express';
|
|
|
4
4
|
import socketIO from 'socket.io';
|
|
5
5
|
import bodyParser from 'body-parser';
|
|
6
6
|
import cookieParser from 'cookie-parser';
|
|
7
|
-
import
|
|
7
|
+
import {createAdapter} from '@socket.io/redis-adapter';
|
|
8
8
|
import _ from 'lodash';
|
|
9
9
|
|
|
10
10
|
const wrap = (middleware) => (socket, next) => middleware(socket.request, {}, next);
|
|
@@ -95,7 +95,7 @@ class SocketServer {
|
|
|
95
95
|
});
|
|
96
96
|
|
|
97
97
|
if (this.options.redisConfig) {
|
|
98
|
-
io.adapter(
|
|
98
|
+
io.adapter(createAdapter(this.options.redisConfig));
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
const msg = [];
|
package/src/index.js
CHANGED
|
@@ -1,58 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
import Validator from 'fastest-validator';
|
|
3
|
-
|
|
4
|
-
const v = new Validator({
|
|
5
|
-
messages: {
|
|
6
|
-
jsonString: "The '{field}' field must be an json string! Actual: {actual}",
|
|
7
|
-
},
|
|
8
|
-
});
|
|
9
|
-
|
|
10
|
-
v.add('json', function ({schema, messages}, path, context) {
|
|
11
|
-
return {
|
|
12
|
-
source: `
|
|
13
|
-
try {
|
|
14
|
-
JSON.parse(value);
|
|
15
|
-
} catch (e) {
|
|
16
|
-
${this.makeError({type: 'jsonString', actual: 'value', messages})}
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
return value;
|
|
20
|
-
`,
|
|
21
|
-
};
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
/* remove empty field or not have validate field */
|
|
25
|
-
function omitData(data, inKeys = []) {
|
|
26
|
-
Object.keys(data).map(function (key, index) {
|
|
27
|
-
if (inKeys.includes(key)) {
|
|
28
|
-
let value = data[key];
|
|
29
|
-
if (typeof value === 'string') {
|
|
30
|
-
value = value.trim();
|
|
31
|
-
if (value === '' || value === 'NaN' || value === 'null' || value === 'undefined') {
|
|
32
|
-
delete data[key];
|
|
33
|
-
} else {
|
|
34
|
-
data[key] = value;
|
|
35
|
-
}
|
|
36
|
-
} else if (value === null || value === undefined || Number.isNaN(value)) {
|
|
37
|
-
delete data[key];
|
|
38
|
-
}
|
|
39
|
-
} else {
|
|
40
|
-
delete data[key];
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
return data;
|
|
44
|
-
}
|
|
1
|
+
import validator from '@azteam/validator';
|
|
45
2
|
|
|
46
3
|
export default function (type, rules) {
|
|
47
4
|
return async function (req, res, next) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
/* validate field */
|
|
51
|
-
const errors = v.validate(reqData, rules);
|
|
5
|
+
validator(req[type], rules, true);
|
|
52
6
|
|
|
53
|
-
if (Array.isArray(errors)) {
|
|
54
|
-
throw new ErrorException(INVALID, errors);
|
|
55
|
-
}
|
|
56
7
|
return next();
|
|
57
8
|
};
|
|
58
9
|
}
|
package/src/validate.js
DELETED
|
@@ -1,161 +0,0 @@
|
|
|
1
|
-
export const schemaId = (optional = false) => ({
|
|
2
|
-
type: 'string',
|
|
3
|
-
length: 24,
|
|
4
|
-
pattern: /^[A-Fa-f0-9]{24}$/,
|
|
5
|
-
optional,
|
|
6
|
-
});
|
|
7
|
-
|
|
8
|
-
export const schemaEmail = (optional = false) => ({
|
|
9
|
-
type: 'email',
|
|
10
|
-
optional,
|
|
11
|
-
});
|
|
12
|
-
|
|
13
|
-
export const schemaUrl = (optional = false) => ({
|
|
14
|
-
type: 'url',
|
|
15
|
-
optional,
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
export const schemaBoolean = (optional = false) => ({
|
|
19
|
-
type: 'boolean',
|
|
20
|
-
convert: true,
|
|
21
|
-
optional,
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
export const schemaDate = (optional = false) => ({
|
|
25
|
-
type: 'number',
|
|
26
|
-
convert: true,
|
|
27
|
-
integer: true,
|
|
28
|
-
optional,
|
|
29
|
-
});
|
|
30
|
-
|
|
31
|
-
export const schemaNumber = (optional = false) => ({
|
|
32
|
-
type: 'number',
|
|
33
|
-
convert: true,
|
|
34
|
-
optional,
|
|
35
|
-
});
|
|
36
|
-
export const schemaInteger = (min = 0, max = 999999999, optional = false) => ({
|
|
37
|
-
type: 'number',
|
|
38
|
-
integer: true,
|
|
39
|
-
convert: true,
|
|
40
|
-
min,
|
|
41
|
-
max,
|
|
42
|
-
optional,
|
|
43
|
-
});
|
|
44
|
-
|
|
45
|
-
export const schemaString = (min = 1, max = 255, optional = false) => ({
|
|
46
|
-
type: 'string',
|
|
47
|
-
convert: true,
|
|
48
|
-
trim: true,
|
|
49
|
-
min,
|
|
50
|
-
max,
|
|
51
|
-
optional,
|
|
52
|
-
});
|
|
53
|
-
export const schemaPassword = (optional = false) => ({
|
|
54
|
-
type: 'string',
|
|
55
|
-
convert: true,
|
|
56
|
-
min: 6,
|
|
57
|
-
max: 32,
|
|
58
|
-
optional,
|
|
59
|
-
});
|
|
60
|
-
export const schemaOTP = (optional = false) => ({
|
|
61
|
-
type: 'string',
|
|
62
|
-
length: 6,
|
|
63
|
-
pattern: /\d+/,
|
|
64
|
-
optional,
|
|
65
|
-
});
|
|
66
|
-
export const schemaIPv4 = (optional = false) => ({
|
|
67
|
-
type: 'string',
|
|
68
|
-
pattern: /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$/,
|
|
69
|
-
optional,
|
|
70
|
-
});
|
|
71
|
-
|
|
72
|
-
export const schemaImage = (optional = false) => ({
|
|
73
|
-
type: 'string',
|
|
74
|
-
max: 255,
|
|
75
|
-
optional,
|
|
76
|
-
});
|
|
77
|
-
export const schemaVideo = (optional = false) => ({
|
|
78
|
-
type: 'string',
|
|
79
|
-
max: 255,
|
|
80
|
-
optional,
|
|
81
|
-
});
|
|
82
|
-
export const schemaPhoneNumber = (optional = false) => ({
|
|
83
|
-
type: 'string',
|
|
84
|
-
length: 10,
|
|
85
|
-
pattern: /^((09|03|07|08|05)+([0-9]{8})\b)$/,
|
|
86
|
-
optional,
|
|
87
|
-
});
|
|
88
|
-
export const schemaSlug = (optional = false) => ({
|
|
89
|
-
type: 'string',
|
|
90
|
-
convert: true,
|
|
91
|
-
pattern: /[A-Za-z0-9_-]+/,
|
|
92
|
-
lowercase: true,
|
|
93
|
-
max: 300,
|
|
94
|
-
optional,
|
|
95
|
-
});
|
|
96
|
-
|
|
97
|
-
export const schemaKey = (optional = false) => ({
|
|
98
|
-
type: 'string',
|
|
99
|
-
convert: true,
|
|
100
|
-
pattern: /[A-Za-z0-9_-]+/,
|
|
101
|
-
uppercase: true,
|
|
102
|
-
max: 300,
|
|
103
|
-
optional,
|
|
104
|
-
});
|
|
105
|
-
|
|
106
|
-
export const schemaVersion = (optional = false) => ({
|
|
107
|
-
type: 'string',
|
|
108
|
-
pattern: /^(\d+)\.(\d+)\.(\d+)$/,
|
|
109
|
-
max: 300,
|
|
110
|
-
optional,
|
|
111
|
-
});
|
|
112
|
-
export const schemaArray = (items, optional = false) => ({
|
|
113
|
-
type: 'array',
|
|
114
|
-
items,
|
|
115
|
-
default: [],
|
|
116
|
-
optional,
|
|
117
|
-
});
|
|
118
|
-
export const schemaJSON = (optional = false) => ({
|
|
119
|
-
type: 'json',
|
|
120
|
-
optional,
|
|
121
|
-
});
|
|
122
|
-
|
|
123
|
-
export const schemaGallery = (optional = false) => ({
|
|
124
|
-
type: 'array',
|
|
125
|
-
items: schemaImage(),
|
|
126
|
-
optional,
|
|
127
|
-
});
|
|
128
|
-
|
|
129
|
-
export const schemaObject = (props = {}, optional = false) => ({
|
|
130
|
-
type: 'object',
|
|
131
|
-
strict: 'remove',
|
|
132
|
-
props,
|
|
133
|
-
optional,
|
|
134
|
-
});
|
|
135
|
-
|
|
136
|
-
export const schemaEnum = (values, optional = false) => ({
|
|
137
|
-
type: 'enum',
|
|
138
|
-
values,
|
|
139
|
-
optional,
|
|
140
|
-
});
|
|
141
|
-
|
|
142
|
-
/* rules */
|
|
143
|
-
export const rulesId = {
|
|
144
|
-
id: schemaId(),
|
|
145
|
-
};
|
|
146
|
-
export const rulesSlug = {
|
|
147
|
-
slug: schemaSlug(),
|
|
148
|
-
};
|
|
149
|
-
export const rulesKey = {
|
|
150
|
-
key: schemaKey(),
|
|
151
|
-
};
|
|
152
|
-
|
|
153
|
-
export const rulesMetadata = {
|
|
154
|
-
metadata_disable: schemaBoolean(true),
|
|
155
|
-
metadata_title: schemaString(0, 255, true),
|
|
156
|
-
metadata_title_og: schemaString(0, 255, true),
|
|
157
|
-
metadata_description: schemaString(0, 255, true),
|
|
158
|
-
metadata_description_og: schemaString(0, 255, true),
|
|
159
|
-
metadata_keywords: schemaString(0, 255, true),
|
|
160
|
-
metadata_image_url: schemaImage(true),
|
|
161
|
-
};
|