Skip to content
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

Adds settings endpoint to configure loglevel #1418

Closed
wants to merge 1 commit into from
Closed
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
57 changes: 57 additions & 0 deletions spec/SettingsRouter.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
var request = require('request');

var headers = {
'X-Parse-Application-Id': 'test',
'X-Parse-Master-Key': 'test'
};


describe('SettingsRouter', () => {

it('should set the loglevel', (done) => {
request.post({
headers: headers,
json: {
'logLevel': 'silly'
},
url: 'http://localhost:8378/1/settings'
}, (err, res, body) => {
request.get({
url: 'http://localhost:8378/1/settings',
headers: headers
}, (err, res, body)=> {
body = JSON.parse(body);
expect(body.logLevel).toBe('silly');
done();
});
});
});

it('should not access without masterKey', (done) => {
request.post({
headers: {
'X-Parse-Application-Id': 'test',
'X-Parse-Master-Key': 'invalid'
},
json: {
'logLevel': 'silly'
},
url: 'http://localhost:8378/1/settings'
}, (err, res, body) => {
expect(body.error).not.toBeUndefined();
expect(body.error).toBe('unauthorized');
request.get({
url: 'http://localhost:8378/1/settings',
headers: {
'X-Parse-Application-Id': 'test',
'X-Parse-Master-Key': 'invalid'
}
}, (err, res, body)=> {
body = JSON.parse(body);
expect(body.error).toBe('unauthorized');
done();
});
});
})

})
2 changes: 2 additions & 0 deletions src/ParseServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import { SchemasRouter } from './Routers/SchemasRouter';
import { SessionsRouter } from './Routers/SessionsRouter';
import { UserController } from './Controllers/UserController';
import { UsersRouter } from './Routers/UsersRouter';
import { SettingsRouter } from './Routers/SettingsRouter';

import ParsePushAdapter from 'parse-server-push-adapter';
// Mutate the Parse object to add the Cloud Code handlers
Expand Down Expand Up @@ -246,6 +247,7 @@ class ParseServer {
new IAPValidationRouter(),
new FeaturesRouter(),
new GlobalConfigRouter(),
new SettingsRouter(),
];

if (process.env.PARSE_EXPERIMENTAL_HOOKS_ENABLED || process.env.TESTING) {
Expand Down
26 changes: 26 additions & 0 deletions src/Routers/SettingsRouter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import PromiseRouter from '../PromiseRouter';
import * as middleware from "../middlewares";
import { logger, configureLogger } from '../logger';
import winston from 'winston';

export class SettingsRouter extends PromiseRouter {
mountRoutes() {
this.route('GET', '/settings', middleware.promiseEnforceMasterKeyAccess, (req) => {
return Promise.resolve({
response: {
logLevel: winston.level
}
})
});
this.route('POST','/settings', middleware.promiseEnforceMasterKeyAccess, (req) => {
let body = req.body;
let logLevel = body.logLevel;
if (logLevel) {
configureLogger({level: logLevel});
}
return Promise.resolve({
response: body
})
});
}
}