@@ -5,12 +5,16 @@ import * as middleware from "../middlewares";
5
5
export class LogsRouter extends PromiseRouter {
6
6
7
7
mountRoutes ( ) {
8
- this . route ( 'GET' , '/logs' , ( req ) => {
8
+ this . route ( 'GET' , '/scriptlog' , middleware . promiseEnforceMasterKeyAccess , this . validateRequest , ( req ) => {
9
9
return this . handleGET ( req ) ;
10
10
} ) ;
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
+ }
14
18
}
15
19
16
20
// Returns a promise for a {response} object.
@@ -20,10 +24,15 @@ export class LogsRouter extends PromiseRouter {
20
24
// until (optional) End time for the search. Defaults to current time.
21
25
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
22
26
// size (optional) Number of rows returned by search. Defaults to 10
27
+ // n same as size, overrides size if set
23
28
handleGET ( req ) {
24
29
const from = req . query . from ;
25
30
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
+
27
36
const order = req . query . order
28
37
const level = req . query . level ;
29
38
const options = {
@@ -33,27 +42,7 @@ export class LogsRouter extends PromiseRouter {
33
42
order,
34
43
level
35
44
} ;
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
+
57
46
return req . config . loggerController . getLogs ( options ) . then ( ( result ) => {
58
47
return Promise . resolve ( {
59
48
response : result
0 commit comments