Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions _test_/auth.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { db } = require('../src/models/index.js');
const supertest = require('supertest');
const mockRequest = supertest(server);
// const bcrypt = require('bcrypt');
// const base64 = require('base-64');

describe('web server authentication', () => {
beforeEach(async () => {
Expand All @@ -21,7 +22,7 @@ describe('web server authentication', () => {
expect(response.body.password.startsWith('$2b$10$')).toBe(true);
expect(response.body.password.length).toBeGreaterThan(40);
expect(response.body.password).not.toEqual('test password');
expect(response.body.role).toBe('user');
expect(response.body.role).toBe('admin');
// Run it once, get the error, and then
// expect(response.body.password).toEqual(
// '$2b$10$IpbYE3WRzNPJn.t79nQ4E.9nYeOifrj0Od0vWZU2vxAsXsGEzz2xm'
Expand Down Expand Up @@ -53,8 +54,6 @@ describe('web server authentication', () => {
const response = await mockRequest
.post('/signup')
.send({ username: 'test user', password: 'test password' });

console.log(response.body);
expect(response.status).toBe(500);
});
});
4 changes: 2 additions & 2 deletions _test_/server.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ describe('web server', () => {
expect(response.body.name).toEqual('Broccoli');
});

it('can delete a record', async () => {
it('can delete a record', async () => {
const response = await mockRequest.delete('/food/1');
expect(response.status).toBe(200);

const getResponse = await mockRequest.get('/food');
const getResponse = mockRequest.get('/food');
expect(getResponse.body.length).toEqual(0);
});
});
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"base-64": "^1.0.0",
"bcrypt": "^5.0.1",
"dotenv": "^8.2.0",
"eslint": "^7.14.0",
Expand Down
10 changes: 7 additions & 3 deletions src/routes/food.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@ async function updateFood(req, res) {
}

async function deleteFood(req, res) {
let id = req.params.id;
let deletedFood = await FoodCollection.delete(id);
res.status(200).json(deletedFood);
if (req.user == 'admin') {
let id = req.params.id;
let deletedFood = await FoodCollection.delete(id);
res.status(200).json(deletedFood);
} else{
res.status(403).send('Unauthorized admin');
}
}

module.exports = router;