c4patino/know-it-all
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated server to more fit frontend requirements

Browse source
This commit is contained in:
Ceferino Patino 2022-12-15 20:47:35 -06:00
commit 7ca9067533
5 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/middleware/basicAuth.js
View file

@ -13,6 +13,8 @@ async function basicAuth(req, res, next) {
const [email, password] = Buffer.from(b64Encoded, 'base64').toString().split(':'); const [email, password] = Buffer.from(b64Encoded, 'base64').toString().split(':');
if (!email || !password) return res.status(400).send(config.errorIncomplete); if (!email || !password) return res.status(400).send(config.errorIncomplete);
console.log(Buffer.from(b64Encoded, 'base64').toString());
// Make sure that a user exists with that email // Make sure that a user exists with that email
const result = await User.findOne({ const result = await User.findOne({
where: { email: email }, where: { email: email },

2
server/middleware/tokenAuth.js
View file

@ -20,7 +20,7 @@ async function tokenAuth(req, res, next) {
return res.status(401).send(config.errorUnauthed); return res.status(401).send(config.errorUnauthed);
} }
const user = await token.getUser(); const user = await result.getUser();
if (!user) return res.status(500).send(config.errorGeneric); if (!user) return res.status(500).send(config.errorGeneric);

3
server/routes/authRouter.js
View file

@ -29,8 +29,9 @@ router.post('/audio', parseFormData, tokenAuth, SetAudio);
router.get('/reset', RequestReset); router.get('/reset', RequestReset);
router.patch('/reset/:id', ResetPassword); router.patch('/reset/:id', ResetPassword);
router.get('/:userID', tokenAuth, checkKnownUser, GetUserDetails);
router.get('/orgs', tokenAuth, GetOwnedOrgs); router.get('/orgs', tokenAuth, GetOwnedOrgs);
router.get('/orgs/member', tokenAuth, GetMemberOrgs); router.get('/orgs/member', tokenAuth, GetMemberOrgs);
router.get('/:userID', tokenAuth, checkKnownUser, GetUserDetails);
module.exports = router; module.exports = router;

12
server/tests/auth/CreateUser.test.js
View file

@ -34,12 +34,12 @@ describe('CreateUser', function () {
}); });
}); });
test('[500] Request missing fields', async () => { test('[400] Request missing fields', async () => {
await supertest(app) await supertest(app)
.post('/api/auth/register') .post('/api/auth/register')
.send() .send()
.expect(400, 'The request is missing required fields.') .expect(400, 'The request is missing required fields.')
.set('Accept', 'text/html') .set('Accept', 'application/json')
.expect('Content-Type', /text/); .expect('Content-Type', /text/);
}); });
@ -90,12 +90,8 @@ describe('CreateUser', function () {
}, },
}); });
expect(response.body.user).toEqual( expect(response.body.user).toEqual(expect.objectContaining(user));
expect.objectContaining(user) expect(org.member).toEqual(expect.arrayContaining([expect.objectContaining(user)]));
);
expect(org.member).toEqual(
expect.arrayContaining([expect.objectContaining(user)])
);
}); });
}); });

8
server/tests/auth/SetAudio.test.js
View file

@ -15,18 +15,18 @@ describe('SetAudio', function () {
test('[403] Missing token', async () => { test('[403] Missing token', async () => {
await supertest(app) await supertest(app)
.post('/api/auth/logout') .post('/api/auth/audio')
.send() .send()
.expect(403, 'Unauthorized user') .expect(403, 'Unauthorized user')
.set('Accept', 'text/html') .set('Accept', 'text/html')
.expect('Content-Type', /text/); .expect('Content-Type', /text/);
}); });
test('[511] Token was not found', async () => { test('[400] Token was not found', async () => {
await supertest(app) await supertest(app)
.post('/api/auth/logout') .post('/api/auth/audio')
.send({ token: 'randomString' }) .send({ token: 'randomString' })
.expect(511, 'Session expired') .expect(400, 'Session expired')
.set('Accept', 'text/html') .set('Accept', 'text/html')
.expect('Content-Type', /text/); .expect('Content-Type', /text/);
}); });