Skip to content

Commit 63dc640

Browse files
committed
Removes /logs endpoint
1 parent 8e034dd commit 63dc640

File tree

2 files changed

+18
-29
lines changed

2 files changed

+18
-29
lines changed

spec/LogsRouter.spec.js

Lines changed: 3 additions & 3 deletions
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

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ import * as middleware from "../middlewares";
55
export class LogsRouter extends PromiseRouter {
66

77
mountRoutes() {
8-
this.route('GET','/logs', (req) => {
8+
this.route('GET','/scriptlog', middleware.promiseEnforceMasterKeyAccess, this.validateRequest, (req) => {
99
return this.handleGET(req);
1010
});
11-
this.route('GET','/scriptlog', (req) => {
12-
return this.handleScriptLog(req);
13-
});
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+
}
1418
}
1519

1620
// Returns a promise for a {response} object.
@@ -20,10 +24,15 @@ export class LogsRouter extends PromiseRouter {
2024
// until (optional) End time for the search. Defaults to current time.
2125
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
2226
// size (optional) Number of rows returned by search. Defaults to 10
27+
// n same as size, overrides size if set
2328
handleGET(req) {
2429
const from = req.query.from;
2530
const until = req.query.until;
26-
const size = req.query.size;
31+
let size = req.query.size;
32+
if (req.query.n) {
33+
size = req.query.n;
34+
}
35+
2736
const order = req.query.order
2837
const level = req.query.level;
2938
const options = {
@@ -33,27 +42,7 @@ export class LogsRouter extends PromiseRouter {
3342
order,
3443
level
3544
};
36-
37-
return req.config.loggerController
38-
.getLogs(options)
39-
.then(result => ({ response: result }));
40-
level,
41-
}
42-
return this.getLogs(req, options);
43-
}
44-
45-
handleScriptLog(req) {
46-
const size = req.query.n;
47-
const level = req.query.level;
48-
return this.getLogs(req, { size, level });
49-
}
50-
51-
getLogs(req, options) {
52-
if (!req.config || !req.config.loggerController) {
53-
throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
54-
'Logger adapter is not availabe');
55-
}
56-
enforceSecurity(req.auth);
45+
5746
return req.config.loggerController.getLogs(options).then((result) => {
5847
return Promise.resolve({
5948
response: result

0 commit comments

Comments
 (0)