gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(curriculum): replace validator with Joi (#39959)

Browse Source 
We only used validator in one place and Joi could do the same job.
This commit is contained in:
Oliver Eyton-Williams
2020-10-13 13:55:24 +02:00
committed by GitHub
parent 38323f858f
commit 3e00167ba4
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
curriculum/package-lock.json generated
View File

@ -7437,12 +7437,6 @@
"spdx-expression-parse": "^3.0.0" "spdx-expression-parse": "^3.0.0"
} }
}, },
"validator": {
"version": "10.11.0",
"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
"dev": true
},
"value-or-function": { "value-or-function": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",

3
curriculum/package.json
View File

@ -57,7 +57,6 @@
"puppeteer": "^5.3.1", "puppeteer": "^5.3.1",
"readdirp-walk": "^1.7.0", "readdirp-walk": "^1.7.0",
"rx": "^4.1.0", "rx": "^4.1.0",
"string-similarity": "^4.0.2", "string-similarity": "^4.0.2"
"validator": "^10.4.0"
} }
} }

14
curriculum/test/utils/mongoIds.js
View File

@ -1,15 +1,21 @@
const _ = require('lodash'); const findIndex = require('lodash/findIndex');
const { isMongoId } = require('validator'); const Joi = require('joi');
Joi.objectId = require('joi-objectid')(Joi);
const schema = Joi.objectId();
class MongoIds { class MongoIds {
constructor() { constructor() {
this.knownIds = []; this.knownIds = [];
} }
check(id, title) { check(id, title) {
if (!isMongoId(id)) { try {
Joi.validate(id, schema);
} catch {
throw new Error(`Expected a valid ObjectId for ${title}, but got ${id}`); throw new Error(`Expected a valid ObjectId for ${title}, but got ${id}`);
} }
const idIndex = _.findIndex(this.knownIds, existing => id === existing);
const idIndex = findIndex(this.knownIds, existing => id === existing);
if (idIndex !== -1) { if (idIndex !== -1) {
throw new Error(` throw new Error(`
All challenges must have a unique id. All challenges must have a unique id.