Skip to content

Commit 30d1f9a

Browse files
committed
Fix issues caused by missing gridstore adapter
1 parent 4d86675 commit 30d1f9a

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

spec/helper.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,23 @@ var ParseServer = require('../src/index').ParseServer;
1111
var path = require('path');
1212
var TestUtils = require('../src/index').TestUtils;
1313
var MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
14+
const GridStoreAdapter = require('../src/Adapters/Files/GridStoreAdapter').GridStoreAdapter;
15+
1416

1517
var port = 8378;
1618

17-
var mongoAdapter = new MongoStorageAdapter({
18-
uri: 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase',
19+
let mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
20+
let mongoAdapter = new MongoStorageAdapter({
21+
uri: mongoURI,
1922
collectionPrefix: 'test_',
2023
})
2124

25+
let gridStoreAdapter = new GridStoreAdapter(mongoURI);
26+
2227
// Default server configuration for tests.
2328
var defaultConfiguration = {
2429
databaseAdapter: mongoAdapter,
30+
filesAdapter: gridStoreAdapter,
2531
serverURL: 'http://localhost:' + port + '/1',
2632
appId: 'test',
2733
javascriptKey: 'test',

src/ParseServer.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ class ParseServer {
148148
databaseAdapter = loadAdapter(databaseAdapter)
149149
}
150150

151+
if (!filesAdapter && !databaseURI) {
152+
throw 'When using an explicit database adapter, you must also use and explicit filesAdapter.';
153+
}
154+
151155
if (logsFolder) {
152156
configureLogger({
153157
logsFolder

src/Routers/FilesRouter.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import express from 'express';
2-
import BodyParser from 'body-parser';
3-
import * as Middlewares from '../middlewares';
1+
import express from 'express';
2+
import BodyParser from 'body-parser';
3+
import * as Middlewares from '../middlewares';
44
import { randomHexString } from '../cryptoUtils';
5-
import Config from '../Config';
6-
import mime from 'mime';
5+
import Config from '../Config';
6+
import mime from 'mime';
77

88
export class FilesRouter {
99

@@ -77,8 +77,7 @@ export class FilesRouter {
7777
res.set('Location', result.url);
7878
res.json(result);
7979
}).catch((err) => {
80-
next(new Parse.Error(Parse.Error.FILE_SAVE_ERROR,
81-
'Could not store file.'));
80+
next(new Parse.Error(Parse.Error.FILE_SAVE_ERROR, 'Could not store file.'));
8281
});
8382
}
8483

@@ -93,4 +92,4 @@ export class FilesRouter {
9392
'Could not delete file.'));
9493
});
9594
}
96-
}
95+
}

0 commit comments

Comments
 (0)