Skip to content

Commit 6e694c9

Browse files
committed
Remove Create and Update object validation
1 parent bf48fc5 commit 6e694c9

File tree

3 files changed

+2
-99
lines changed

3 files changed

+2
-99
lines changed

app/src/routes/v1/object.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const { checkAppMode, currentObject, hasPermission } = require('../../middleware
99
routes.use(checkAppMode);
1010

1111
/** Creates new objects */
12-
routes.post('/', requireSomeAuth, objectValidator.createObjects, (req, res, next) => {
12+
routes.post('/', requireSomeAuth, (req, res, next) => {
1313
objectController.createObjects(req, res, next);
1414
});
1515

@@ -32,7 +32,7 @@ routes.get('/:objId', objectValidator.readObject, currentObject, hasPermission(P
3232
});
3333

3434
/** Updates an object */
35-
routes.post('/:objId', objectValidator.updateObject, currentObject, hasPermission(Permissions.UPDATE), (req, res, next) => {
35+
routes.post('/:objId', currentObject, hasPermission(Permissions.UPDATE), (req, res, next) => {
3636
objectController.updateObject(req, res, next);
3737
});
3838

app/src/validators/object.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ const { validate, Joi } = require('express-validation');
22
const { scheme, type } = require('./common');
33

44
const schema = {
5-
createObjects: {
6-
headers: Joi.object({
7-
name: type.alphanum,
8-
stream: type.alphanum,
9-
info: type.alphanum
10-
})
11-
},
12-
135
deleteObject: {
146
params: Joi.object({
157
objId: type.uuidv4
@@ -61,28 +53,15 @@ const schema = {
6153
public: type.truthy
6254
})
6355
},
64-
65-
updateObject: {
66-
params: Joi.object({
67-
objId: type.uuidv4
68-
}),
69-
headers: Joi.object({
70-
name: type.alphanum,
71-
stream: type.alphanum,
72-
info: type.alphanum
73-
})
74-
}
7556
};
7657

7758
const validator = {
78-
createObjects: validate(schema.createObjects, { statusCode: 422 }),
7959
deleteObject: validate(schema.deleteObject, { statusCode: 422 }),
8060
headObject: validate(schema.headObject, { statusCode: 422 }),
8161
listObjectVersion: validate(schema.listObjectVersion, { statusCode: 422 }),
8262
readObject: validate(schema.readObject, { statusCode: 422 }),
8363
searchObjects: validate(schema.searchObjects, { statusCode: 422 }),
8464
togglePublic: validate(schema.togglePublic, { statusCode: 422 }),
85-
updateObject: validate(schema.updateObject, { statusCode: 422 }),
8665
};
8766

8867
module.exports = validator;

app/tests/unit/validators/object.spec.js

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,6 @@ expect.extend(jestJoi.matchers);
66
const schema = require('../../../src/validators/object').schema;
77
const { scheme, type } = require('../../../src/validators/common');
88

9-
describe('createObjects', () => {
10-
11-
describe('headers', () => {
12-
const headers = schema.createObjects.headers.describe();
13-
14-
describe('name', () => {
15-
const name = headers.keys.name;
16-
17-
it('is the expected schema', () => {
18-
expect(name).toEqual(type.alphanum.describe());
19-
});
20-
});
21-
22-
describe('stream', () => {
23-
const stream = headers.keys.stream;
24-
25-
it('is the expected schema', () => {
26-
expect(stream).toEqual(type.alphanum.describe());
27-
});
28-
});
29-
30-
describe('info', () => {
31-
const info = headers.keys.info;
32-
33-
it('is the expected schema', () => {
34-
expect(info).toEqual(type.alphanum.describe());
35-
});
36-
});
37-
});
38-
});
39-
409
describe('deleteObject', () => {
4110

4211
describe('params', () => {
@@ -238,7 +207,6 @@ describe('searchObjects', () => {
238207
});
239208
});
240209

241-
242210
describe('togglePublic', () => {
243211

244212
describe('params', () => {
@@ -265,47 +233,3 @@ describe('togglePublic', () => {
265233
});
266234
});
267235
});
268-
269-
270-
describe('updateObject', () => {
271-
272-
describe('params', () => {
273-
const params = schema.togglePublic.params.describe();
274-
275-
describe('objId', () => {
276-
const objId = params.keys.objId;
277-
278-
it('is the expected schema', () => {
279-
expect(objId).toEqual(type.uuidv4.describe());
280-
});
281-
});
282-
});
283-
284-
describe('headers', () => {
285-
const headers = schema.updateObject.headers.describe();
286-
287-
describe('name', () => {
288-
const name = headers.keys.name;
289-
290-
it('is the expected schema', () => {
291-
expect(name).toEqual(type.alphanum.describe());
292-
});
293-
});
294-
295-
describe('stream', () => {
296-
const stream = headers.keys.stream;
297-
298-
it('is the expected schema', () => {
299-
expect(stream).toEqual(type.alphanum.describe());
300-
});
301-
});
302-
303-
describe('info', () => {
304-
const info = headers.keys.info;
305-
306-
it('is the expected schema', () => {
307-
expect(info).toEqual(type.alphanum.describe());
308-
});
309-
});
310-
});
311-
});

0 commit comments

Comments
 (0)