Add option to generate a presigned url with a expiration time

README.md

@@ -75,6 +75,8 @@ The preferred method is to use the default AWS credentials pattern.  If no AWS c
       "baseUrlDirect": false, // default value
       "signatureVersion": 'v4', // default value
       "globalCacheControl": null, // default value. Or 'public, max-age=86400' for 24 hrs Cache-Control
+      "presignedUrl": false, // default value
+      "presignedUrlExpires": 300, // default value (300 seconds or 5 minutes)
       "ServerSideEncryption": 'AES256|aws:kms', //AES256 or aws:kms, or if you do not pass this, encryption won't be done
       "validateFilename": null, // Default to parse-server FilesAdapter::validateFilename.
       "generateKey": null // Will default to Parse.FilesController.preserveFileName
@@ -114,29 +116,35 @@ And update your config / options
 ```
 var S3Adapter = require('@parse/s3-files-adapter');
 
-var s3Adapter = new S3Adapter('accessKey',
-                  'secretKey', bucket, {
-                    region: 'us-east-1'
-                    bucketPrefix: '',
-                    directAccess: false,
-                    baseUrl: 'http://images.example.com',
-                    signatureVersion: 'v4',
-                    globalCacheControl: 'public, max-age=86400',  // 24 hrs Cache-Control.
-                    validateFilename: (filename) => {
-                      if (filename.length > 1024) {
-                         return 'Filename too long.';
-                       }
-                       return null; // Return null on success
-                    },
-                    generateKey: (filename) => {
-                        return `${Date.now()}_${filename}`; // unique prefix for every filename
-                    }
-                  });
+var s3Adapter = new S3Adapter(
+  'accessKey',
+  'secretKey',
+  'bucket',
+  {
+    region: 'us-east-1'
+    bucketPrefix: '',
+    directAccess: false,
+    baseUrl: 'http://images.example.com',
+    signatureVersion: 'v4',
+    globalCacheControl: 'public, max-age=86400',  // 24 hrs Cache-Control.
+    presignedUrl: false,
+    presignedUrlExpires: 300,
+    validateFilename: (filename) => {
+      if (filename.length > 1024) {
+          return 'Filename too long.';
+        }
+        return null; // Return null on success
+    },
+    generateKey: (filename) => {
+      return `${Date.now()}_${filename}`; // unique prefix for every filename
+    }
+  }
+);
 
 var api = new ParseServer({
-	appId: 'my_app',
-	masterKey: 'master_key',
-	filesAdapter: s3adapter
+  appId: 'my_app',
+  masterKey: 'master_key',
+  filesAdapter: s3adapter
 })
 ```
 **Note:** there are a few ways you can pass arguments:
@@ -167,6 +175,8 @@ var s3Options = {
   "baseUrl": null // default value
   "signatureVersion": 'v4', // default value
   "globalCacheControl": null, // default value. Or 'public, max-age=86400' for 24 hrs Cache-Control
+  "presignedUrl": false, // default value
+  "presignedUrlExpires": 300, // default value (300 seconds or 5 minutes)
   "validateFilename": () => null, // Anything goes!
   "generateKey": (filename) => filename,  // Ensure Parse.FilesController.preserveFileName is true!
 }
@@ -193,6 +203,8 @@ var s3Options = {
   region: process.env.SPACES_REGION,
   directAccess: true,
   globalCacheControl: "public, max-age=31536000",
+  presignedUrl: false,
+  presignedUrlExpires: 300,
   bucketPrefix: process.env.SPACES_BUCKET_PREFIX,
   s3overrides: {
     accessKeyId: process.env.SPACES_ACCESS_KEY,

index.js

@@ -36,6 +36,8 @@ class S3Adapter {
     this._baseUrlDirect = options.baseUrlDirect;
     this._signatureVersion = options.signatureVersion;
     this._globalCacheControl = options.globalCacheControl;
+    this._presignedUrl = options.presignedUrl;
+    this._presignedUrlExpires = parseInt(options.presignedUrlExpires, 10);
     this._encryption = options.ServerSideEncryption;
     this._generateKey = options.generateKey;
     // Optional FilesAdaptor method
@@ -159,21 +161,37 @@ class S3Adapter {
   getFileLocation(config, filename) {
     const fileName = filename.split('/').map(encodeURIComponent).join('/');
     if (this._directAccess) {
+      const fileKey = `${this._bucketPrefix}${fileName}`;
+
+      let presignedUrl = '';
+      if (this._presignedUrl) {
+        const params = { Bucket: this._bucket, Key: fileKey, Expires: this._presignedUrlExpires };
+        presignedUrl = this._s3Client.getSignedUrl('getObject', params);
+      }
       if (this._baseUrl) {
+        let directAccessFileKey = fileKey;
+        if (this._baseUrlDirect) {
+          directAccessFileKey = fileName;
+        }
+
+        let directAccessUrl;
         if (typeof this._baseUrl === 'function') {
-          if (this._baseUrlDirect) {
-            return `${this._baseUrl(config, filename)}/${fileName}`;
-          }
-          return `${this._baseUrl(config, filename)}/${this._bucketPrefix + fileName}`;
+          directAccessUrl = `${this._baseUrl(config, filename)}/${directAccessFileKey}`;
+        } else {
+          directAccessUrl = `${this._baseUrl}/${directAccessFileKey}`;
         }
-        if (this._baseUrlDirect) {
-          return `${this._baseUrl}/${fileName}`;
+
+        if (this._presignedUrl) {
+          directAccessUrl += presignedUrl.substring(presignedUrl.indexOf('?'));
         }
-        return `${this._baseUrl}/${this._bucketPrefix + fileName}`;
+        return directAccessUrl;
+      }
+      if (this._presignedUrl) {
+        return presignedUrl;
       }
-      return `https://${this._bucket}.s3.amazonaws.com/${this._bucketPrefix + fileName}`;
+      return `https://${this._bucket}.s3.amazonaws.com/${fileKey}`;
     }
-    return (`${config.mount}/files/${config.applicationId}/${fileName}`);
+    return `${config.mount}/files/${config.applicationId}/${fileName}`;
   }
 
   handleFileStream(filename, req, res) {

lib/optionsFromArguments.js

@@ -94,6 +94,8 @@ const optionsFromArguments = function optionsFromArguments(args) {
   options = fromEnvironmentOrDefault(options, 'baseUrlDirect', 'S3_BASE_URL_DIRECT', false);
   options = fromEnvironmentOrDefault(options, 'signatureVersion', 'S3_SIGNATURE_VERSION', 'v4');
   options = fromEnvironmentOrDefault(options, 'globalCacheControl', 'S3_GLOBAL_CACHE_CONTROL', null);
+  options = fromEnvironmentOrDefault(options, 'presignedUrl', 'S3_PRESIGNED_URL', false);
+  options = fromEnvironmentOrDefault(options, 'presignedUrlExpires', 'S3_PRESIGNED_URL_EXPIRES', 300);
   options = fromOptionsDictionaryOrDefault(options, 'generateKey', null);
   options = fromOptionsDictionaryOrDefault(options, 'validateFilename', null);