Merge pull request #3497 from acinader/allow-empty-client-key
Allow empty client key
This commit is contained in:
@@ -79,6 +79,19 @@ describe('middlewares', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should succeed when client key supplied but empty', (done) => {
|
||||||
|
AppCache.put(fakeReq.body._ApplicationId, {
|
||||||
|
clientKey: '',
|
||||||
|
masterKey: 'masterKey',
|
||||||
|
restAPIKey: 'restAPIKey'
|
||||||
|
});
|
||||||
|
fakeReq.headers['x-parse-client-key'] = '';
|
||||||
|
middlewares.handleParseHeaders(fakeReq, fakeRes, () => {
|
||||||
|
expect(fakeRes.status).not.toHaveBeenCalled();
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('should succeed when no keys are configured and none supplied', (done) => {
|
it('should succeed when no keys are configured and none supplied', (done) => {
|
||||||
AppCache.put(fakeReq.body._ApplicationId, {
|
AppCache.put(fakeReq.body._ApplicationId, {
|
||||||
masterKey: 'masterKey'
|
masterKey: 'masterKey'
|
||||||
|
|||||||
@@ -122,10 +122,10 @@ export function handleParseHeaders(req, res, next) {
|
|||||||
// to preserve original behavior.
|
// to preserve original behavior.
|
||||||
const keys = ["clientKey", "javascriptKey", "dotNetKey", "restAPIKey"];
|
const keys = ["clientKey", "javascriptKey", "dotNetKey", "restAPIKey"];
|
||||||
const oneKeyConfigured = keys.some(function(key) {
|
const oneKeyConfigured = keys.some(function(key) {
|
||||||
return req.config[key];
|
return req.config[key] !== undefined;
|
||||||
});
|
});
|
||||||
const oneKeyMatches = keys.some(function(key){
|
const oneKeyMatches = keys.some(function(key){
|
||||||
return req.config[key] && info[key] == req.config[key];
|
return req.config[key] !== undefined && info[key] === req.config[key];
|
||||||
});
|
});
|
||||||
|
|
||||||
if (oneKeyConfigured && !oneKeyMatches) {
|
if (oneKeyConfigured && !oneKeyMatches) {
|
||||||
|
|||||||
Reference in New Issue
Block a user