From 6dc8d287d6e739bd9893798489b7fc03d49565f2 Mon Sep 17 00:00:00 2001 From: OzgeAkin Date: Sun, 10 Jul 2016 19:15:30 +0200 Subject: [PATCH] Option to ignore parse file storage (#2222) * flag in configurations to use only files adapter * added lib folder * remove lib * alignment edit * replace comma with semicolon * ignore parse file storage if fileKey is not provided (undefined) --- src/Controllers/FilesController.js | 14 +++++++++----- src/ParseServer.js | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Controllers/FilesController.js b/src/Controllers/FilesController.js index 3cea4ddb..a355396e 100644 --- a/src/Controllers/FilesController.js +++ b/src/Controllers/FilesController.js @@ -64,12 +64,16 @@ export class FilesController extends AdaptableController { // 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 { + if (config.fileKey === undefined) { fileObject['url'] = this.adapter.getFileLocation(config, filename); + } else { + 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); + } } } } diff --git a/src/ParseServer.js b/src/ParseServer.js index 9a651116..7e96d7c5 100644 --- a/src/ParseServer.js +++ b/src/ParseServer.js @@ -109,7 +109,7 @@ class ParseServer { dotNetKey, restAPIKey, webhookKey, - fileKey = 'invalid-file-key', + fileKey = undefined, facebookAppIds = [], enableAnonymousUsers = true, allowClientClassCreation = true,