Skip to content

Commit bf7cd09

Browse files
committed
Removes /logs endpoint
1 parent 4995260 commit bf7cd09

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

spec/LogsRouter.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('LogsRouter', () => {
2020
var router = new LogsRouter();
2121

2222
expect(() => {
23-
router.handleGET(request);
23+
router.validateRequest(request);
2424
}).not.toThrow();
2525
done();
2626
});
@@ -40,7 +40,7 @@ describe('LogsRouter', () => {
4040
var router = new LogsRouter();
4141

4242
expect(() => {
43-
router.handleGET(request);
43+
router.validateRequest(request);
4444
}).toThrow();
4545
done();
4646
});
@@ -60,7 +60,7 @@ describe('LogsRouter', () => {
6060
var router = new LogsRouter();
6161

6262
expect(() => {
63-
router.handleGET(request);
63+
router.validateRequest(request);
6464
}).toThrow();
6565
done();
6666
});

src/Routers/LogsRouter.js

+15-20
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@ let enforceSecurity = (auth) => {
1515
export class LogsRouter extends PromiseRouter {
1616

1717
mountRoutes() {
18-
this.route('GET','/logs', (req) => {
18+
this.route('GET','/scriptlog', this.validateRequest, (req) => {
1919
return this.handleGET(req);
2020
});
21-
this.route('GET','/scriptlog', (req) => {
22-
return this.handleScriptLog(req);
23-
});
21+
}
22+
23+
validateRequest(req) {
24+
if (!req.config || !req.config.loggerController) {
25+
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
26+
'Logger adapter is not availabe');
27+
}
28+
enforceSecurity(req.auth);
2429
}
2530

2631
// Returns a promise for a {response} object.
@@ -30,10 +35,15 @@ export class LogsRouter extends PromiseRouter {
3035
// until (optional) End time for the search. Defaults to current time.
3136
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
3237
// size (optional) Number of rows returned by search. Defaults to 10
38+
// n same as size, overrides size if set
3339
handleGET(req) {
3440
const from = req.query.from;
3541
const until = req.query.until;
36-
const size = req.query.size;
42+
let size = req.query.size;
43+
if (req.query.n) {
44+
size = req.query.n;
45+
}
46+
3747
const order = req.query.order
3848
const level = req.query.level;
3949
const options = {
@@ -43,21 +53,6 @@ export class LogsRouter extends PromiseRouter {
4353
order,
4454
level,
4555
}
46-
return this.getLogs(req, options);
47-
}
48-
49-
handleScriptLog(req) {
50-
const size = req.query.n;
51-
const level = req.query.level;
52-
return this.getLogs(req, { size, level });
53-
}
54-
55-
getLogs(req, options) {
56-
if (!req.config || !req.config.loggerController) {
57-
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
58-
'Logger adapter is not availabe');
59-
}
60-
enforceSecurity(req.auth);
6156
return req.config.loggerController.getLogs(options).then((result) => {
6257
return Promise.resolve({
6358
response: result

0 commit comments

Comments
 (0)