joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2001 from skinp/legacy-files

Browse Source 
Support file objects in the legacy bucket: files.parse.com
This commit is contained in:
Patrick Pelletier
2016-06-07 18:36:24 -07:00
parent e7e2369132 65518cdd64
commit db76aa376f
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/ParseFile.spec.js
View File

@@ -491,7 +491,7 @@ describe('Parse.File testing', () => {
}); });
}); });
it('creates correct url for old files hosted on parse', done => { it('creates correct url for old files hosted on files.parsetfss.com', done => {
var file = { var file = {
__type: 'File', __type: 'File',
url: 'http://irrelevant.elephant/', url: 'http://irrelevant.elephant/',
@@ -511,6 +511,26 @@ describe('Parse.File testing', () => {
}); });
}); });
it('creates correct url for old files hosted on files.parse.com', done => {
var file = {
__type: 'File',
url: 'http://irrelevant.elephant/',
name: 'd6e80979-a128-4c57-a167-302f874700dc-123.txt'
};
var obj = new Parse.Object('OldFileTest');
obj.set('oldfile', file);
obj.save().then(() => {
var query = new Parse.Query('OldFileTest');
return query.first();
}).then((result) => {
var fileAgain = result.get('oldfile');
expect(fileAgain.url()).toEqual(
'http://files.parse.com/test/d6e80979-a128-4c57-a167-302f874700dc-123.txt'
);
done();
});
});
it('supports files in objects without urls', done => { it('supports files in objects without urls', done => {
var file = { var file = {
__type: 'File', __type: 'File',

7
src/Controllers/FilesController.js
View File

@@ -6,6 +6,8 @@ import { FilesAdapter } from '../Adapters/Files/FilesAdapter';
import path from 'path'; import path from 'path';
import mime from 'mime'; import mime from 'mime';
const legacyFilesRegex = new RegExp("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}-.*");
export class FilesController extends AdaptableController { export class FilesController extends AdaptableController {
getFileData(config, filename) { getFileData(config, filename) {
@@ -59,8 +61,13 @@ export class FilesController extends AdaptableController {
continue; continue;
} }
let filename = fileObject['name']; let filename = fileObject['name'];
// all filenames starting with "tfss-" should be from files.parsetfss.com
// all filenames starting with a "-" seperated UUID should be from files.parse.com
// all other filenames have been migrated or created from Parse Server
if (filename.indexOf('tfss-') === 0) { if (filename.indexOf('tfss-') === 0) {
fileObject['url'] = 'http://files.parsetfss.com/' + config.fileKey + '/' + encodeURIComponent(filename); fileObject['url'] = 'http://files.parsetfss.com/' + config.fileKey + '/' + encodeURIComponent(filename);
} else if (legacyFilesRegex.test(filename)) {
fileObject['url'] = 'http://files.parse.com/' + config.fileKey + '/' + encodeURIComponent(filename);
} else { } else {
fileObject['url'] = this.adapter.getFileLocation(config, filename); fileObject['url'] = this.adapter.getFileLocation(config, filename);
} }