File tree Expand file tree Collapse file tree 3 files changed +19
-10
lines changed Expand file tree Collapse file tree 3 files changed +19
-10
lines changed Original file line number Diff line number Diff line change @@ -11,17 +11,23 @@ var ParseServer = require('../src/index').ParseServer;
11
11
var path = require ( 'path' ) ;
12
12
var TestUtils = require ( '../src/index' ) . TestUtils ;
13
13
var MongoStorageAdapter = require ( '../src/Adapters/Storage/Mongo/MongoStorageAdapter' ) ;
14
+ const GridStoreAdapter = require ( '../src/Adapters/Files/GridStoreAdapter' ) . GridStoreAdapter ;
15
+
14
16
15
17
var port = 8378 ;
16
18
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 ,
19
22
collectionPrefix : 'test_' ,
20
23
} )
21
24
25
+ let gridStoreAdapter = new GridStoreAdapter ( mongoURI ) ;
26
+
22
27
// Default server configuration for tests.
23
28
var defaultConfiguration = {
24
29
databaseAdapter : mongoAdapter ,
30
+ filesAdapter : gridStoreAdapter ,
25
31
serverURL : 'http://localhost:' + port + '/1' ,
26
32
appId : 'test' ,
27
33
javascriptKey : 'test' ,
Original file line number Diff line number Diff line change @@ -148,6 +148,10 @@ class ParseServer {
148
148
databaseAdapter = loadAdapter ( databaseAdapter )
149
149
}
150
150
151
+ if ( ! filesAdapter && ! databaseURI ) {
152
+ throw 'When using an explicit database adapter, you must also use and explicit filesAdapter.' ;
153
+ }
154
+
151
155
if ( logsFolder ) {
152
156
configureLogger ( {
153
157
logsFolder
Original file line number Diff line number Diff line change 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' ;
4
4
import { randomHexString } from '../cryptoUtils' ;
5
- import Config from '../Config' ;
6
- import mime from 'mime' ;
5
+ import Config from '../Config' ;
6
+ import mime from 'mime' ;
7
7
8
8
export class FilesRouter {
9
9
@@ -77,8 +77,7 @@ export class FilesRouter {
77
77
res . set ( 'Location' , result . url ) ;
78
78
res . json ( result ) ;
79
79
} ) . 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.' ) ) ;
82
81
} ) ;
83
82
}
84
83
@@ -93,4 +92,4 @@ export class FilesRouter {
93
92
'Could not delete file.' ) ) ;
94
93
} ) ;
95
94
}
96
- }
95
+ }
You can’t perform that action at this time.
0 commit comments