Skip to content

Commit 4e31267

Browse files
committed
Merge pull request #746 from ParsePlatform/flovilmart.logsEndpoint
adds scriptlog endpoint
2 parents 9cc7bd0 + 63dc640 commit 4e31267

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

spec/LogsRouter.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('LogsRouter', () => {
2323
var router = new LogsRouter();
2424

2525
expect(() => {
26-
router.handleGET(request);
26+
router.validateRequest(request);
2727
}).not.toThrow();
2828
done();
2929
});
@@ -43,14 +43,14 @@ describe('LogsRouter', () => {
4343
var router = new LogsRouter();
4444

4545
expect(() => {
46-
router.handleGET(request);
46+
router.validateRequest(request);
4747
}).toThrow();
4848
done();
4949
});
5050

5151
it('can check invalid master key of request', done => {
5252
request.get({
53-
url: 'http://localhost:8378/1/logs',
53+
url: 'http://localhost:8378/1/scriptlog',
5454
json: true,
5555
headers: {
5656
'X-Parse-Application-Id': 'test',

src/Routers/LogsRouter.js

+24-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ import * as middleware from "../middlewares";
55
export class LogsRouter extends PromiseRouter {
66

77
mountRoutes() {
8-
this.route('GET','/logs', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleGET(req); });
8+
this.route('GET','/scriptlog', middleware.promiseEnforceMasterKeyAccess, this.validateRequest, (req) => {
9+
return this.handleGET(req);
10+
});
11+
}
12+
13+
validateRequest(req) {
14+
if (!req.config || !req.config.loggerController) {
15+
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
16+
'Logger adapter is not availabe');
17+
}
918
}
1019

1120
// Returns a promise for a {response} object.
@@ -15,28 +24,30 @@ export class LogsRouter extends PromiseRouter {
1524
// until (optional) End time for the search. Defaults to current time.
1625
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
1726
// size (optional) Number of rows returned by search. Defaults to 10
27+
// n same as size, overrides size if set
1828
handleGET(req) {
19-
if (!req.config || !req.config.loggerController) {
20-
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED, 'Logger adapter is not available.');
21-
}
22-
23-
let from = req.query.from;
24-
let until = req.query.until;
29+
const from = req.query.from;
30+
const until = req.query.until;
2531
let size = req.query.size;
26-
let order = req.query.order
27-
let level = req.query.level;
32+
if (req.query.n) {
33+
size = req.query.n;
34+
}
2835

36+
const order = req.query.order
37+
const level = req.query.level;
2938
const options = {
3039
from,
3140
until,
3241
size,
3342
order,
3443
level
3544
};
36-
37-
return req.config.loggerController
38-
.getLogs(options)
39-
.then(result => ({ response: result }));
45+
46+
return req.config.loggerController.getLogs(options).then((result) => {
47+
return Promise.resolve({
48+
response: result
49+
});
50+
})
4051
}
4152
}
4253

0 commit comments

Comments
 (0)