Skip to content

Commit adc0f64

Browse files
committed
Require a server URL
1 parent 1f707a9 commit adc0f64

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

spec/index.spec.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,23 @@ var request = require('request');
22

33
describe('server', () => {
44
it('requires a master key and app id', done => {
5-
expect(setServerConfiguration.bind(undefined, { masterKey: 'mykey' })).toThrow('You must provide an appId and masterKey!');
6-
expect(setServerConfiguration.bind(undefined, { appId: 'myId' })).toThrow('You must provide an appId and masterKey!');
5+
expect(setServerConfiguration.bind(undefined, { masterKey: 'mykey', serverURL: '' })).toThrow('You must provide an appId and masterKey!');
6+
expect(setServerConfiguration.bind(undefined, { appId: 'myId', serverURL: '' })).toThrow('You must provide an appId and masterKey!');
7+
done();
8+
});
9+
10+
it('requires a serverURL', done => {
11+
expect(setServerConfiguration.bind(undefined, {
12+
databaseURI: 'mongodb://fake:[email protected]:43605/drew3',
13+
appId: 'test',
14+
javascriptKey: 'test',
15+
dotNetKey: 'windows',
16+
clientKey: 'client',
17+
restAPIKey: 'rest',
18+
masterKey: 'test',
19+
collectionPrefix: 'test_',
20+
fileKey: 'test',
21+
})).toThrow('You must provide a serverURL!');
722
done();
823
});
924

src/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var batch = require('./batch'),
1111
multer = require('multer'),
1212
Parse = require('parse/node').Parse,
1313
httpRequest = require('./httpRequest');
14-
14+
1515
import PromiseRouter from './PromiseRouter';
1616
import { GridStoreAdapter } from './Adapters/Files/GridStoreAdapter';
1717
import { S3Adapter } from './Adapters/Files/S3Adapter';
@@ -31,9 +31,9 @@ import { SchemasRouter } from './Routers/SchemasRouter';
3131
import { IAPValidationRouter } from './Routers/IAPValidationRouter';
3232
import { PushRouter } from './Routers/PushRouter';
3333
import { FilesRouter } from './Routers/FilesRouter';
34-
import { LogsRouter } from './Routers/LogsRouter';
34+
import { LogsRouter } from './Routers/LogsRouter';
3535

36-
import { loadAdapter } from './Adapters/AdapterLoader';
36+
import { loadAdapter } from './Adapters/AdapterLoader';
3737
import { FileLoggerAdapter } from './Adapters/Logger/FileLoggerAdapter';
3838
import { LoggerController } from './Controllers/LoggerController';
3939

@@ -82,7 +82,7 @@ function ParseServer({
8282
facebookAppIds = [],
8383
enableAnonymousUsers = true,
8484
oauth = {},
85-
serverURL = '',
85+
serverURL = (()=>{throw 'You must provide a serverURL!'})(),
8686
}) {
8787
if (!appId || !masterKey) {
8888
throw 'You must provide an appId and masterKey!';
@@ -105,8 +105,8 @@ function ParseServer({
105105
throw "argument 'cloud' must either be a string or a function";
106106
}
107107
}
108-
109-
108+
109+
110110
const filesControllerAdapter = loadAdapter(filesAdapter, GridStoreAdapter);
111111
const pushControllerAdapter = loadAdapter(push, ParsePushAdapter);
112112
const loggerControllerAdapter = loadAdapter(loggerAdapter, FileLoggerAdapter);
@@ -116,7 +116,7 @@ function ParseServer({
116116
const filesController = new FilesController(filesControllerAdapter);
117117
const pushController = new PushController(pushControllerAdapter);
118118
const loggerController = new LoggerController(loggerControllerAdapter);
119-
119+
120120
cache.apps[appId] = {
121121
masterKey: masterKey,
122122
collectionPrefix: collectionPrefix,
@@ -172,7 +172,7 @@ function ParseServer({
172172
new LogsRouter(),
173173
new IAPValidationRouter()
174174
];
175-
175+
176176
if (process.env.PARSE_EXPERIMENTAL_CONFIG_ENABLED || process.env.TESTING) {
177177
routers.push(require('./global_config'));
178178
}

0 commit comments

Comments
 (0)