Skip to content

adds scriptlog endpoint #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2016
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
6 changes: 3 additions & 3 deletions spec/LogsRouter.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('LogsRouter', () => {
var router = new LogsRouter();

expect(() => {
router.handleGET(request);
router.validateRequest(request);
}).not.toThrow();
done();
});
Expand All @@ -43,14 +43,14 @@ describe('LogsRouter', () => {
var router = new LogsRouter();

expect(() => {
router.handleGET(request);
router.validateRequest(request);
}).toThrow();
done();
});

it('can check invalid master key of request', done => {
request.get({
url: 'http://localhost:8378/1/logs',
url: 'http://localhost:8378/1/scriptlog',
json: true,
headers: {
'X-Parse-Application-Id': 'test',
Expand Down
37 changes: 24 additions & 13 deletions src/Routers/LogsRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ import * as middleware from "../middlewares";
export class LogsRouter extends PromiseRouter {

mountRoutes() {
this.route('GET','/logs', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleGET(req); });
this.route('GET','/scriptlog', middleware.promiseEnforceMasterKeyAccess, this.validateRequest, (req) => {
return this.handleGET(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.
Expand All @@ -15,28 +24,30 @@ export class LogsRouter extends PromiseRouter {
// until (optional) End time for the search. Defaults to current time.
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
// size (optional) Number of rows returned by search. Defaults to 10
// n same as size, overrides size if set
handleGET(req) {
if (!req.config || !req.config.loggerController) {
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED, 'Logger adapter is not available.');
}

let from = req.query.from;
let until = req.query.until;
const from = req.query.from;
const until = req.query.until;
let size = req.query.size;
let order = req.query.order
let level = req.query.level;
if (req.query.n) {
size = req.query.n;
}

const order = req.query.order
const level = req.query.level;
const options = {
from,
until,
size,
order,
level
};

return req.config.loggerController
.getLogs(options)
.then(result => ({ response: result }));

return req.config.loggerController.getLogs(options).then((result) => {
return Promise.resolve({
response: result
});
})
}
}

Expand Down