comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Proper error codes

Browse source
This commit is contained in:
vjrj 2018-06-14 19:48:48 +02:00
parent eebbdda064
commit 1de7e4a7b3
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
imports/api/Rest/Rest.js
View file

@ -20,20 +20,21 @@ const debug = false;
const uptime = new Date(); const uptime = new Date();
const restivusError = (code, message) => ({ status: 'error', statusCode: code, body: message });
function fail(e) { function fail(e) {
return jsend.error(`Unexpected error in REST call: ${e}`); return restivusError(500, `Unexpected error in REST call: ${e}`);
} }
function defaultFailParams(e) { function defaultFailParams(e) {
return jsend.error(`Wrong REST params: ${e}`); return restivusError(400, `Wrong REST params: ${e}`);
} }
function checkAuthToken(token) { function checkAuthToken(token) {
if (token !== Meteor.settings.private.internalApiToken) { if (token !== Meteor.settings.private.internalApiToken) {
const message = `Unauthorized auth token '${token}' in REST API`; const message = `Unauthorized auth token '${token}' in REST API`;
console.warn(message); console.warn(message);
return jsend.error(message); return restivusError(401, message);
} }
return undefined; return undefined;
} }

19
test/rest.test.js
View file

@ -70,8 +70,7 @@ describe('basic api v1 returns', () => {
} }
}, (error, result) => { }, (error, result) => {
chai.expect(error, null); chai.expect(error, null);
chai.expect(result.data.status).equal('error'); chai.expect(result.statusCode).equal(401);
chai.expect(result.statusCode).equal(200);
done(); done();
})); }));
@ -81,16 +80,14 @@ describe('basic api v1 returns', () => {
} }
}, (error, result) => { }, (error, result) => {
chai.expect(error, null); chai.expect(error, null);
chai.expect(result.data.status).equal('error'); chai.expect(result.statusCode).equal(401);
chai.expect(result.statusCode).equal(200);
done(); done();
})); }));
it('should not return fires with some wrong distance', async done => it('should not return fires with some wrong distance', async done =>
HTTP.get(url(`api/v1/fires-in-full/${token}/38.736946/-9.142685/1100`), (error, result) => { HTTP.get(url(`api/v1/fires-in-full/${token}/38.736946/-9.142685/1100`), (error, result) => {
chai.expect(error, null); chai.expect(error, null);
chai.expect(result.data.status).equal('error'); chai.expect(result.statusCode).equal(400);
chai.expect(result.statusCode).equal(200);
done(); done();
})); }));
@ -138,7 +135,7 @@ describe('basic api v1 returns', () => {
} }
}, (error, result) => { }, (error, result) => {
chai.expect(error, null); chai.expect(error, null);
chai.expect(result.data.status).equal('error'); chai.expect(result.statusCode).equal(401);
done(); done();
}); });
}); });
@ -198,7 +195,7 @@ describe('basic api v1 returns', () => {
} }
}, (error, result) => { }, (error, result) => {
chai.expect(error, null); chai.expect(error, null);
chai.expect(result.data.status).equal('error'); chai.expect(result.statusCode).equal(401);
done(); done();
}); });
}); });
@ -212,8 +209,12 @@ describe('basic api v1 returns', () => {
} }
}, (error, result) => { }, (error, result) => {
chai.expect(error, null); chai.expect(error, null);
chai.expect(result.data.status).equal('error'); chai.expect(result.statusCode).equal(401);
done(); done();
}); });
}); });
// TODO list all subs
// TODO remove all subs
}); });