Removes /logs endpoint

This commit is contained in:
Florent Vilmart
2016-03-01 22:33:14 -05:00
parent 8e034dd9b0
commit 63dc64004d
2 changed files with 18 additions and 29 deletions

View File

@@ -23,7 +23,7 @@ describe('LogsRouter', () => {
var router = new LogsRouter(); var router = new LogsRouter();
expect(() => { expect(() => {
router.handleGET(request); router.validateRequest(request);
}).not.toThrow(); }).not.toThrow();
done(); done();
}); });
@@ -43,14 +43,14 @@ describe('LogsRouter', () => {
var router = new LogsRouter(); var router = new LogsRouter();
expect(() => { expect(() => {
router.handleGET(request); router.validateRequest(request);
}).toThrow(); }).toThrow();
done(); done();
}); });
it('can check invalid master key of request', done => { it('can check invalid master key of request', done => {
request.get({ request.get({
url: 'http://localhost:8378/1/logs', url: 'http://localhost:8378/1/scriptlog',
json: true, json: true,
headers: { headers: {
'X-Parse-Application-Id': 'test', 'X-Parse-Application-Id': 'test',

View File

@@ -5,12 +5,16 @@ import * as middleware from "../middlewares";
export class LogsRouter extends PromiseRouter { export class LogsRouter extends PromiseRouter {
mountRoutes() { mountRoutes() {
this.route('GET','/logs', (req) => { this.route('GET','/scriptlog', middleware.promiseEnforceMasterKeyAccess, this.validateRequest, (req) => {
return this.handleGET(req); return this.handleGET(req);
}); });
this.route('GET','/scriptlog', (req) => { }
return this.handleScriptLog(req);
}); validateRequest(req) {
if (!req.config || !req.config.loggerController) {
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
'Logger adapter is not availabe');
}
} }
// Returns a promise for a {response} object. // Returns a promise for a {response} object.
@@ -20,10 +24,15 @@ export class LogsRouter extends PromiseRouter {
// until (optional) End time for the search. Defaults to current time. // until (optional) End time for the search. Defaults to current time.
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”. // order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
// size (optional) Number of rows returned by search. Defaults to 10 // size (optional) Number of rows returned by search. Defaults to 10
// n same as size, overrides size if set
handleGET(req) { handleGET(req) {
const from = req.query.from; const from = req.query.from;
const until = req.query.until; const until = req.query.until;
const size = req.query.size; let size = req.query.size;
if (req.query.n) {
size = req.query.n;
}
const order = req.query.order const order = req.query.order
const level = req.query.level; const level = req.query.level;
const options = { const options = {
@@ -33,27 +42,7 @@ export class LogsRouter extends PromiseRouter {
order, order,
level level
}; };
return req.config.loggerController
.getLogs(options)
.then(result => ({ response: result }));
level,
}
return this.getLogs(req, options);
}
handleScriptLog(req) {
const size = req.query.n;
const level = req.query.level;
return this.getLogs(req, { size, level });
}
getLogs(req, options) {
if (!req.config || !req.config.loggerController) {
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
'Logger adapter is not availabe');
}
enforceSecurity(req.auth);
return req.config.loggerController.getLogs(options).then((result) => { return req.config.loggerController.getLogs(options).then((result) => {
return Promise.resolve({ return Promise.resolve({
response: result response: result