Merge remote-tracking branch 'ParsePlatform/master' into user-roles

Francis Lessard · Francis Lessard · commit 2c5b77f2845e · 2016-02-16T09:58:38.000-05:00
diff --git a/src/Adapters/Files/S3Adapter.js b/src/Adapters/Files/S3Adapter.js
@@ -88,7 +88,7 @@ export class S3Adapter extends FilesAdapter {
   // The location is the direct S3 link if the option is set, otherwise we serve the file through parse-server
   getFileLocation(config, filename) {
     if (this._directAccess) {
-      return ('https://' + this.bucket + '._s3Client.amazonaws.com' + '/' + this._bucketPrefix + filename);
+      return `https://${this._bucket}.s3.amazonaws.com/${this._bucketPrefix + filename}`;
     }
     return (config.mount + '/files/' + config.applicationId + '/' + encodeURIComponent(filename));
   }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export class S3Adapter extends FilesAdapter {`
`88`	`88`	`// The location is the direct S3 link if the option is set, otherwise we serve the file through parse-server`
`89`	`89`	`getFileLocation(config, filename) {`
`90`	`90`	`if (this._directAccess) {`
`91`		`- return ('https://' + this.bucket + '._s3Client.amazonaws.com' + '/' + this._bucketPrefix + filename);`
	`91`	+ return `https://${this._bucket}.s3.amazonaws.com/${this._bucketPrefix + filename}`;
`92`	`92`	`}`
`93`	`93`	`return (config.mount + '/files/' + config.applicationId + '/' + encodeURIComponent(filename));`
`94`	`94`	`}`