Support Metadata in GridFSAdapter (#6660)
* Support Metadata in GridFSAdapter * Useful for testing in the JS SDK * Adds new endpoint to be used with `Parse.File.getData` * Allows file adapters to return tags as well as future data. * fix tests * Make getMetadata optional * Revert "fix tests" This reverts commit 7706da13c688027483974e854b5b24321fb070cd. * improve coverage
This commit is contained in:
@@ -8,6 +8,7 @@ const GridStoreAdapter = require('../lib/Adapters/Files/GridStoreAdapter')
|
||||
.GridStoreAdapter;
|
||||
const Config = require('../lib/Config');
|
||||
const FilesController = require('../lib/Controllers/FilesController').default;
|
||||
const databaseURI = 'mongodb://localhost:27017/parse';
|
||||
|
||||
const mockAdapter = {
|
||||
createFile: () => {
|
||||
@@ -23,13 +24,13 @@ const mockAdapter = {
|
||||
|
||||
// Small additional tests to improve overall coverage
|
||||
describe('FilesController', () => {
|
||||
it('should properly expand objects', done => {
|
||||
it('should properly expand objects', (done) => {
|
||||
const config = Config.get(Parse.applicationId);
|
||||
const gridStoreAdapter = new GridFSBucketAdapter(
|
||||
'mongodb://localhost:27017/parse'
|
||||
);
|
||||
const filesController = new FilesController(gridStoreAdapter);
|
||||
const result = filesController.expandFilesInObject(config, function() {});
|
||||
const result = filesController.expandFilesInObject(config, function () {});
|
||||
|
||||
expect(result).toBeUndefined();
|
||||
|
||||
@@ -47,7 +48,7 @@ describe('FilesController', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
it('should create a server log on failure', done => {
|
||||
it('should create a server log on failure', (done) => {
|
||||
const logController = new LoggerController(new WinstonLoggerAdapter());
|
||||
|
||||
reconfigureServer({ filesAdapter: mockAdapter })
|
||||
@@ -56,22 +57,20 @@ describe('FilesController', () => {
|
||||
() => done.fail('should not succeed'),
|
||||
() => setImmediate(() => Promise.resolve('done'))
|
||||
)
|
||||
.then(() => new Promise(resolve => setTimeout(resolve, 200)))
|
||||
.then(() => new Promise((resolve) => setTimeout(resolve, 200)))
|
||||
.then(() =>
|
||||
logController.getLogs({ from: Date.now() - 1000, size: 1000 })
|
||||
)
|
||||
.then(logs => {
|
||||
.then((logs) => {
|
||||
// we get two logs here: 1. the source of the failure to save the file
|
||||
// and 2 the message that will be sent back to the client.
|
||||
|
||||
const log1 = logs.find(
|
||||
x => x.message === 'Error creating a file: it failed with xyz'
|
||||
(x) => x.message === 'Error creating a file: it failed with xyz'
|
||||
);
|
||||
expect(log1.level).toBe('error');
|
||||
|
||||
const log2 = logs.find(
|
||||
x => x.message === 'it failed with xyz'
|
||||
);
|
||||
const log2 = logs.find((x) => x.message === 'it failed with xyz');
|
||||
expect(log2.level).toBe('error');
|
||||
expect(log2.code).toBe(130);
|
||||
|
||||
@@ -79,7 +78,7 @@ describe('FilesController', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('should create a parse error when a string is returned', done => {
|
||||
it('should create a parse error when a string is returned', (done) => {
|
||||
const mock2 = mockAdapter;
|
||||
mock2.validateFilename = () => {
|
||||
return 'Bad file! No biscuit!';
|
||||
@@ -92,7 +91,7 @@ describe('FilesController', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
it('should add a unique hash to the file name when the preserveFileName option is false', done => {
|
||||
it('should add a unique hash to the file name when the preserveFileName option is false', (done) => {
|
||||
const config = Config.get(Parse.applicationId);
|
||||
const gridStoreAdapter = new GridFSBucketAdapter(
|
||||
'mongodb://localhost:27017/parse'
|
||||
@@ -115,7 +114,7 @@ describe('FilesController', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
it('should not add a unique hash to the file name when the preserveFileName option is true', done => {
|
||||
it('should not add a unique hash to the file name when the preserveFileName option is true', (done) => {
|
||||
const config = Config.get(Parse.applicationId);
|
||||
const gridStoreAdapter = new GridFSBucketAdapter(
|
||||
'mongodb://localhost:27017/parse'
|
||||
@@ -137,7 +136,16 @@ describe('FilesController', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
it('should reject slashes in file names', done => {
|
||||
it('should handle adapter without getMetadata', async () => {
|
||||
const gridStoreAdapter = new GridFSBucketAdapter(databaseURI);
|
||||
gridStoreAdapter.getMetadata = null;
|
||||
const filesController = new FilesController(gridStoreAdapter);
|
||||
|
||||
const result = await filesController.getMetadata();
|
||||
expect(result).toEqual({});
|
||||
});
|
||||
|
||||
it('should reject slashes in file names', (done) => {
|
||||
const gridStoreAdapter = new GridFSBucketAdapter(
|
||||
'mongodb://localhost:27017/parse'
|
||||
);
|
||||
@@ -146,7 +154,7 @@ describe('FilesController', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
it('should also reject slashes in file names', done => {
|
||||
it('should also reject slashes in file names', (done) => {
|
||||
const gridStoreAdapter = new GridStoreAdapter(
|
||||
'mongodb://localhost:27017/parse'
|
||||
);
|
||||
|
||||
@@ -4,6 +4,8 @@ const GridFSBucketAdapter = require('../lib/Adapters/Files/GridFSBucketAdapter')
|
||||
.GridFSBucketAdapter;
|
||||
const { randomString } = require('../lib/cryptoUtils');
|
||||
const databaseURI = 'mongodb://localhost:27017/parse';
|
||||
const request = require('../lib/request');
|
||||
const Config = require('../lib/Config');
|
||||
|
||||
async function expectMissingFile(gfsAdapter, name) {
|
||||
try {
|
||||
@@ -33,6 +35,73 @@ describe_only_db('mongo')('GridFSBucket and GridStore interop', () => {
|
||||
expect(gfsResult.toString('utf8')).toBe(originalString);
|
||||
});
|
||||
|
||||
it('should save metadata', async () => {
|
||||
const gfsAdapter = new GridFSBucketAdapter(databaseURI);
|
||||
const originalString = 'abcdefghi';
|
||||
const metadata = { hello: 'world' };
|
||||
await gfsAdapter.createFile('myFileName', originalString, null, {
|
||||
metadata,
|
||||
});
|
||||
const gfsResult = await gfsAdapter.getFileData('myFileName');
|
||||
expect(gfsResult.toString('utf8')).toBe(originalString);
|
||||
let gfsMetadata = await gfsAdapter.getMetadata('myFileName');
|
||||
expect(gfsMetadata.metadata).toEqual(metadata);
|
||||
|
||||
// Empty json for file not found
|
||||
gfsMetadata = await gfsAdapter.getMetadata('myUnknownFile');
|
||||
expect(gfsMetadata).toEqual({});
|
||||
});
|
||||
|
||||
it('should save metadata with file', async () => {
|
||||
const gfsAdapter = new GridFSBucketAdapter(databaseURI);
|
||||
await reconfigureServer({ filesAdapter: gfsAdapter });
|
||||
const str = 'Hello World!';
|
||||
const data = [];
|
||||
for (let i = 0; i < str.length; i++) {
|
||||
data.push(str.charCodeAt(i));
|
||||
}
|
||||
const metadata = { foo: 'bar' };
|
||||
const file = new Parse.File('hello.txt', data, 'text/plain');
|
||||
file.addMetadata('foo', 'bar');
|
||||
await file.save();
|
||||
let fileData = await gfsAdapter.getMetadata(file.name());
|
||||
expect(fileData.metadata).toEqual(metadata);
|
||||
|
||||
// Can only add metadata on create
|
||||
file.addMetadata('hello', 'world');
|
||||
await file.save();
|
||||
fileData = await gfsAdapter.getMetadata(file.name());
|
||||
expect(fileData.metadata).toEqual(metadata);
|
||||
|
||||
const headers = {
|
||||
'X-Parse-Application-Id': 'test',
|
||||
'X-Parse-REST-API-Key': 'rest',
|
||||
};
|
||||
const response = await request({
|
||||
method: 'GET',
|
||||
headers,
|
||||
url: `http://localhost:8378/1/files/test/metadata/${file.name()}`,
|
||||
});
|
||||
fileData = response.data;
|
||||
expect(fileData.metadata).toEqual(metadata);
|
||||
});
|
||||
|
||||
it('should handle getMetadata error', async () => {
|
||||
const config = Config.get('test');
|
||||
config.filesController.getMetadata = () => Promise.reject();
|
||||
|
||||
const headers = {
|
||||
'X-Parse-Application-Id': 'test',
|
||||
'X-Parse-REST-API-Key': 'rest',
|
||||
};
|
||||
const response = await request({
|
||||
method: 'GET',
|
||||
headers,
|
||||
url: `http://localhost:8378/1/files/test/metadata/filename.txt`,
|
||||
});
|
||||
expect(response.data).toEqual({});
|
||||
});
|
||||
|
||||
it('properly fetches a large file from GridFS', async () => {
|
||||
const gfsAdapter = new GridFSBucketAdapter(databaseURI);
|
||||
const twoMegabytesFile = randomString(2048 * 1024);
|
||||
|
||||
Reference in New Issue
Block a user