Merge pull request #2001 from skinp/legacy-files

Support file objects in the legacy bucket: files.parse.com
parse-community · Jun 8, 2016 · db76aa3 · db76aa3
2 parents e7e2369 + 65518cd
commit db76aa3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/spec/ParseFile.spec.js b/spec/ParseFile.spec.js
@@ -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 = {
       __type: 'File',
       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 => {
     var file = {
       __type: 'File',

diff --git a/src/Controllers/FilesController.js b/src/Controllers/FilesController.js
@@ -6,6 +6,8 @@ import { FilesAdapter } from '../Adapters/Files/FilesAdapter';
 import path  from 'path';
 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 {
 
   getFileData(config, filename) {
@@ -59,8 +61,13 @@ export class FilesController extends AdaptableController {
           continue;
         }
         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) {
           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 {
           fileObject['url'] = this.adapter.getFileLocation(config, filename);
         }