diff --git a/.idea/libraries/dist.xml b/.idea/libraries/dist.xml
new file mode 100644
index 0000000..3d92275
--- /dev/null
+++ b/.idea/libraries/dist.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ docs
' + doc[key]['x-doc'] + 'docs
' + text + '
You requested to reset your password.
Your new password is:
' + newPass + '
If you did not request a password reset, talk to the sysadmin quickly!
Have a nice day.
The DFOP team', err => {
if (err) return next(err);
res.json({status: 'OK'});
@@ -166,4 +138,27 @@ router.post('/user/passreset', (req, res, next) => {
});
-module.exports = router;
\ No newline at end of file
+module.exports = router;
+
+function getUsername (req, res) { // returns username or false if action is not allowed
+ req.params.username = req.params[0]; // because of path regex
+ if (req.params.username !== undefined) { // different username than request user
+ if (!req.auth(res, ['admin'], 'basic')) return false;
+ return req.params.username;
+ }
+ else {
+ return req.authDetails.username;
+ }
+}
+
+async function usernameCheck (name, res, next) { // check if username is already taken
+ const userData = await UserModel.findOne({name: name}).lean().exec().catch(err => next(err)) as any;
+ if (userData instanceof Error) return false;
+ console.log(userData);
+ console.log(UserValidate.isSpecialName(name));
+ if (userData || UserValidate.isSpecialName(name)) {
+ res.status(400).json({status: 'Username already taken'});
+ return false;
+ }
+ return true;
+}
\ No newline at end of file
diff --git a/src/routes/validate/condition.ts b/src/routes/validate/condition.ts
index f130076..d752ff3 100644
--- a/src/routes/validate/condition.ts
+++ b/src/routes/validate/condition.ts
@@ -18,18 +18,16 @@ export default class ConditionValidate {
)
}
- static input (data, param) {
+ static input (data, param) { // validate input, set param to 'new' to make all attributes required
if (param === 'new') {
return Joi.object({
sample_id: IdValidate.get().required(),
- number: this.condition.number.required(),
parameters: this.condition.parameters.required(),
treatment_template: IdValidate.get().required()
}).validate(data);
}
else if (param === 'change') {
return Joi.object({
- number: this.condition.number,
parameters: this.condition.parameters
}).validate(data);
}
@@ -38,7 +36,7 @@ export default class ConditionValidate {
}
}
- static output (data) {
+ static output (data) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
const {value, error} = Joi.object({
_id: IdValidate.get(),
diff --git a/src/routes/validate/id.ts b/src/routes/validate/id.ts
index a9bb70a..6b7b677 100644
--- a/src/routes/validate/id.ts
+++ b/src/routes/validate/id.ts
@@ -3,11 +3,11 @@ import Joi from '@hapi/joi';
export default class IdValidate {
private static id = Joi.string().pattern(new RegExp('[0-9a-f]{24}')).length(24);
- static get () {
+ static get () { // return joi validation
return this.id;
}
- static valid (id) {
+ static valid (id) { // validate id
return this.id.validate(id).error === undefined;
}
@@ -15,11 +15,14 @@ export default class IdValidate {
return ':id([0-9a-f]{24})';
}
- static stringify (data) {
+ static stringify (data) { // convert all ObjectID objects to plain strings
Object.keys(data).forEach(key => {
- if (data[key] !== null && data[key].hasOwnProperty('_bsontype') && data[key]._bsontype === 'ObjectID') {
+ if (data[key] !== null && data[key].hasOwnProperty('_bsontype') && data[key]._bsontype === 'ObjectID') { // stringify id
data[key] = data[key].toString();
}
+ else if (typeof data[key] === 'object' && data[key] !== null) { // deeper into recursion
+ data[key] = this.stringify(data[key]);
+ }
});
return data;
}
diff --git a/src/routes/validate/material.ts b/src/routes/validate/material.ts
index c8b6e91..c92f440 100644
--- a/src/routes/validate/material.ts
+++ b/src/routes/validate/material.ts
@@ -33,13 +33,14 @@ export default class MaterialValidate { // validate input for material
color: joi.string()
.max(128)
.required(),
- number: joi.number()
- .min(0)
+ number: joi.string()
+ .max(128)
+ .allow('')
.required()
}))
};
- static input (data, param) { // validate data, param: new(everything required)/change(available attributes are validated)
+ static input (data, param) { // validate input, set param to 'new' to make all attributes required
if (param === 'new') {
return joi.object({
name: this.material.name.required(),
@@ -67,7 +68,7 @@ export default class MaterialValidate { // validate input for material
}
}
- static output (data) { // validate output from database for needed properties, strip everything else
+ static output (data) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
const {value, error} = joi.object({
_id: IdValidate.get(),
diff --git a/src/routes/validate/measurement.ts b/src/routes/validate/measurement.ts
index 0efaaea..21b38a2 100644
--- a/src/routes/validate/measurement.ts
+++ b/src/routes/validate/measurement.ts
@@ -15,7 +15,7 @@ export default class MeasurementValidate {
)
};
- static input (data, param) {
+ static input (data, param) { // validate input, set param to 'new' to make all attributes required
if (param === 'new') {
return Joi.object({
condition_id: IdValidate.get().required(),
@@ -33,7 +33,7 @@ export default class MeasurementValidate {
}
}
- static output (data) {
+ static output (data) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
const {value, error} = Joi.object({
_id: IdValidate.get(),
diff --git a/src/routes/validate/note_field.ts b/src/routes/validate/note_field.ts
index 7d34d98..68856c9 100644
--- a/src/routes/validate/note_field.ts
+++ b/src/routes/validate/note_field.ts
@@ -8,7 +8,7 @@ export default class NoteFieldValidate {
qty: Joi.number()
};
- static output (data) {
+ static output (data) { // validate output and strip unwanted properties, returns null if not valid
const {value, error} = Joi.object({
name: this.note_field.name,
qty: this.note_field.qty
diff --git a/src/routes/validate/parameters.ts b/src/routes/validate/parameters.ts
index d855815..79e62ef 100644
--- a/src/routes/validate/parameters.ts
+++ b/src/routes/validate/parameters.ts
@@ -4,7 +4,7 @@ export default class ParametersValidate {
static input (data, parameters, param) { // data to validate, parameters from template, param: 'new', 'change'
let joiObject = {};
parameters.forEach(parameter => {
- if (parameter.range.hasOwnProperty('values')) {
+ if (parameter.range.hasOwnProperty('values')) { // append right validation method according to parameter
joiObject[parameter.name] = Joi.alternatives()
.try(Joi.string().max(128), Joi.number(), Joi.boolean())
.valid(...parameter.range.values);
diff --git a/src/routes/validate/res400.ts b/src/routes/validate/res400.ts
index 5e032f7..e4595c8 100644
--- a/src/routes/validate/res400.ts
+++ b/src/routes/validate/res400.ts
@@ -1,3 +1,5 @@
+// respond with 400 and include error details from the joi validation
+
export default function res400 (error, res) {
res.status(400).json({status: 'Invalid body format', details: error.details[0].message});
}
\ No newline at end of file
diff --git a/src/routes/validate/sample.ts b/src/routes/validate/sample.ts
index aa28304..1b23cb1 100644
--- a/src/routes/validate/sample.ts
+++ b/src/routes/validate/sample.ts
@@ -41,10 +41,9 @@ export default class SampleValidate {
})
};
- static input (data, param) { // validate data, param: new(everything required)/change(available attributes are validated)
+ static input (data, param) { // validate input, set param to 'new' to make all attributes required
if (param === 'new') {
return Joi.object({
- number: this.sample.number.required(),
color: this.sample.color.required(),
type: this.sample.type.required(),
batch: this.sample.batch.required(),
@@ -54,7 +53,6 @@ export default class SampleValidate {
}
else if (param === 'change') {
return Joi.object({
- number: this.sample.number,
color: this.sample.color,
type: this.sample.type,
batch: this.sample.batch,
@@ -67,7 +65,7 @@ export default class SampleValidate {
}
}
- static output (data) {
+ static output (data) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
const {value, error} = Joi.object({
_id: IdValidate.get(),
diff --git a/src/routes/validate/template.ts b/src/routes/validate/template.ts
index 7cb461d..571f48c 100644
--- a/src/routes/validate/template.ts
+++ b/src/routes/validate/template.ts
@@ -1,35 +1,36 @@
-import joi from '@hapi/joi';
+import Joi from '@hapi/joi';
import IdValidate from './id';
export default class TemplateValidate {
private static template = {
- name: joi.string()
+ name: Joi.string()
.max(128),
- version: joi.number()
+ version: Joi.number()
.min(1),
- number_prefix: joi.string()
+ number_prefix: Joi.string()
+ .pattern(/^[a-zA-Z]+$/)
.min(1)
.max(16),
- parameters: joi.array()
+ parameters: Joi.array()
.min(1)
.items(
- joi.object({
- name: joi.string()
+ Joi.object({
+ name: Joi.string()
.max(128)
.required(),
- range: joi.object({
- values: joi.array()
+ range: Joi.object({
+ values: Joi.array()
.min(1),
- min: joi.number(),
+ min: Joi.number(),
- max: joi.number(),
+ max: Joi.number(),
- type: joi.string()
+ type: Joi.string()
.valid('array')
})
.oxor('values', 'min')
@@ -42,17 +43,17 @@ export default class TemplateValidate {
)
};
- static input (data, param, template) { // validate data, param: new(everything required)/change(available attributes are validated)
+ static input (data, param, template) { // validate input, set param to 'new' to make all attributes required
if (param === 'new') {
if (template === 'treatment') {
- return joi.object({
+ return Joi.object({
name: this.template.name.required(),
number_prefix: this.template.number_prefix.required(),
parameters: this.template.parameters.required()
}).validate(data);
}
else {
- return joi.object({
+ return Joi.object({
name: this.template.name.required(),
parameters: this.template.parameters.required()
}).validate(data);
@@ -60,14 +61,14 @@ export default class TemplateValidate {
}
else if (param === 'change') {
if (template === 'treatment') {
- return joi.object({
+ return Joi.object({
name: this.template.name,
number_prefix: this.template.number_prefix,
parameters: this.template.parameters
}).validate(data);
}
else {
- return joi.object({
+ return Joi.object({
name: this.template.name,
parameters: this.template.parameters
}).validate(data);
@@ -78,10 +79,10 @@ export default class TemplateValidate {
}
}
- static output (data, template) { // validate output from database for needed properties, strip everything else
+ static output (data, template) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
let joiObject;
- if (template === 'treatment') {
+ if (template === 'treatment') { // differentiate between measurement and treatment (has number_prefix) template
joiObject = {
_id: IdValidate.get(),
name: this.template.name,
@@ -98,7 +99,7 @@ export default class TemplateValidate {
parameters: this.template.parameters
};
}
- const {value, error} = joi.object(joiObject).validate(data, {stripUnknown: true});
+ const {value, error} = Joi.object(joiObject).validate(data, {stripUnknown: true});
return error !== undefined? null : value;
}
}
\ No newline at end of file
diff --git a/src/routes/validate/user.ts b/src/routes/validate/user.ts
index 4472aa8..bd4dfbd 100644
--- a/src/routes/validate/user.ts
+++ b/src/routes/validate/user.ts
@@ -5,9 +5,9 @@ import IdValidate from './id';
export default class UserValidate { // validate input for user
private static user = {
- name: Joi.string() // TODO: check allowed characters
- .alphanum()
+ name: Joi.string()
.lowercase()
+ .pattern(new RegExp('^[a-z0-9-_.]+$'))
.max(128),
email: Joi.string()
@@ -16,7 +16,7 @@ export default class UserValidate { // validate input for user
.max(128),
pass: Joi.string()
- .pattern(new RegExp('^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[!"#%&\'()*+,-.\\/:;<=>?@[\\]^_`{|}~])(?=\\S+$).{8,}$'))
+ .pattern(/^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[!"#%&'()*+,-.\/:;<=>?@[\]^_`{|}~])(?=\S+$)[a-zA-Z0-9!"#%&'()*+,\-.\/:;<=>?@[\]^_`{|}~]{8,}$/)
.max(128),
level: Joi.string()
@@ -33,7 +33,7 @@ export default class UserValidate { // validate input for user
private static specialUsernames = ['admin', 'user', 'key', 'new', 'passreset']; // names a user cannot take
- static input (data, param) {
+ static input (data, param) { // validate input, set param to 'new' to make all attributes required
if (param === 'new') {
return Joi.object({
name: this.user.name.required(),
@@ -68,7 +68,7 @@ export default class UserValidate { // validate input for user
}
}
- static output (data) { // validate output from database for needed properties, strip everything else
+ static output (data) { // validate output and strip unwanted properties, returns null if not valid
data = IdValidate.stringify(data);
const {value, error} = Joi.object({
_id: IdValidate.get(),
diff --git a/src/test/db.json b/src/test/db.json
index 619fb75..b78f8e7 100644
--- a/src/test/db.json
+++ b/src/test/db.json
@@ -51,7 +51,7 @@
},
{
"_id": {"$oid":"400000000000000000000005"},
- "number": "33",
+ "number": "Rng33",
"type": "granulate",
"color": "black",
"batch": "1653000308",
@@ -121,11 +121,11 @@
"numbers": [
{
"color": "black",
- "number": 5514263423
+ "number": "5514263423"
},
{
"color": "natural",
- "number": 5514263422
+ "number": "5514263422"
}
],
"status": 10,
@@ -142,11 +142,11 @@
"numbers": [
{
"color": "black",
- "number": 5514212901
+ "number": "5514212901"
},
{
"color": "signalviolet",
- "number": 5514612901
+ "number": "5514612901"
}
],
"status": 10,
@@ -176,7 +176,7 @@
"numbers": [
{
"color": "black",
- "number": 5513933405
+ "number": "5513933405"
}
],
"status": 10,
@@ -193,7 +193,7 @@
"numbers": [
{
"color": "black",
- "number": 5514262406
+ "number": "5514262406"
}
],
"status": 10,
@@ -210,18 +210,35 @@
"numbers": [
{
"color": "natural",
- "number": 10000000
+ "number": "10000000"
}
],
"status": -1,
"__v": 0
+ },
+ {
+ "_id": {"$oid":"100000000000000000000007"},
+ "name": "Ultramid A4H",
+ "supplier": "BASF",
+ "group": "PA66",
+ "mineral": 0,
+ "glass_fiber": 0,
+ "carbon_fiber": 0,
+ "numbers": [
+ {
+ "color": "black",
+ "number": ""
+ }
+ ],
+ "status": 0,
+ "__v": 0
}
],
"conditions": [
{
"_id": {"$oid":"700000000000000000000001"},
"sample_id": {"$oid":"400000000000000000000001"},
- "number": "B1",
+ "number": "A1",
"parameters": {
"material": "copper",
"weeks": 3
@@ -233,7 +250,7 @@
{
"_id": {"$oid":"700000000000000000000002"},
"sample_id": {"$oid":"400000000000000000000002"},
- "number": "B1",
+ "number": "A1",
"parameters": {
"material": "copper",
"weeks": 3
@@ -245,7 +262,7 @@
{
"_id": {"$oid":"700000000000000000000003"},
"sample_id": {"$oid":"400000000000000000000004"},
- "number": "B1",
+ "number": "A1",
"parameters": {
"material": "copper",
"weeks": 3
@@ -257,7 +274,7 @@
{
"_id": {"$oid":"700000000000000000000004"},
"sample_id": {"$oid":"400000000000000000000001"},
- "number": "B3",
+ "number": "A2",
"parameters": {
"material": "hot air",
"weeks": 5
@@ -429,6 +446,17 @@
"device_name": "",
"key": "000000000000000000001003",
"__v": "0"
+ },
+ {
+ "_id": {"$oid":"000000000000000000000004"},
+ "email": "johnny.doe@bosch.com",
+ "name": "johnnydoe",
+ "pass": "$2a$10$di26XKF63OG0V00PL1kSK.ceCcTxDExBMOg.jkHiCnXcY7cN7DlPi",
+ "level": "write",
+ "location": "Fe",
+ "device_name": "Alpha I",
+ "key": "000000000000000000001004",
+ "__v": 0
}
]
}
diff --git a/src/test/helper.ts b/src/test/helper.ts
index 26cb5a5..3983959 100644
--- a/src/test/helper.ts
+++ b/src/test/helper.ts
@@ -4,12 +4,13 @@ import db from "../db";
export default class TestHelper {
- public static auth = {
+ public static auth = { // test user credentials
admin: {pass: 'Abc123!#', key: '000000000000000000001003'},
janedoe: {pass: 'Xyz890*)', key: '000000000000000000001002'},
- user: {pass: 'Xyz890*)', key: '000000000000000000001001'}
+ user: {pass: 'Xyz890*)', key: '000000000000000000001001'},
+ johnnydoe: {pass: 'Xyz890*)', key: '000000000000000000001004'}
}
- public static res = {
+ public static res = { // default responses
400: {status: 'Bad request'},
401: {status: 'Unauthorized'},
403: {status: 'Forbidden'},
@@ -39,10 +40,10 @@ export default class TestHelper {
static request (server, done, options) { // options in form: {method, url, auth: {key/basic: 'name' or 'key'/{name, pass}}, httpStatus, req, res}
let st = supertest(server);
- if (options.hasOwnProperty('auth') && options.auth.hasOwnProperty('key')) {
+ if (options.hasOwnProperty('auth') && options.auth.hasOwnProperty('key')) { // resolve API key
options.url += '?key=' + (this.auth.hasOwnProperty(options.auth.key)? this.auth[options.auth.key].key : options.auth.key);
}
- switch (options.method) {
+ switch (options.method) { // http method
case 'get':
st = st.get(options.url)
break;
@@ -56,10 +57,10 @@ export default class TestHelper {
st = st.delete(options.url)
break;
}
- if (options.hasOwnProperty('req')) {
+ if (options.hasOwnProperty('req')) { // request body
st = st.send(options.req);
}
- if (options.hasOwnProperty('auth') && options.auth.hasOwnProperty('basic')) {
+ if (options.hasOwnProperty('auth') && options.auth.hasOwnProperty('basic')) { // resolve basic auth
if (this.auth.hasOwnProperty(options.auth.basic)) {
st = st.auth(options.auth.basic, this.auth[options.auth.basic].pass)
}
@@ -69,21 +70,21 @@ export default class TestHelper {
}
st = st.expect('Content-type', /json/)
.expect(options.httpStatus);
- if (options.hasOwnProperty('res')) {
+ if (options.hasOwnProperty('res')) { // evaluate result
return st.end((err, res) => {
if (err) return done (err);
should(res.body).be.eql(options.res);
done();
});
}
- else if (this.res.hasOwnProperty(options.httpStatus) && options.default !== false) {
+ else if (this.res.hasOwnProperty(options.httpStatus) && options.default !== false) { // evaluate default results
return st.end((err, res) => {
if (err) return done (err);
should(res.body).be.eql(this.res[options.httpStatus]);
done();
});
}
- else {
+ else { // return object to do .end() manually
return st;
}
}
diff --git a/src/test/loadDev.ts b/src/test/loadDev.ts
index 690044d..15a6868 100644
--- a/src/test/loadDev.ts
+++ b/src/test/loadDev.ts
@@ -1,5 +1,7 @@
import db from '../db';
+// script to load test db into dev db for a clean start
+
db.connect('dev', () => {
console.info('dropping data...');
db.drop(() => { // reset database