Merge pull request #154 from adhocteam/cm-247-download-of-uploaded-do…

…cuments

Add url virtual field to file upload model

src/lib/s3Uploader.js

@@ -24,6 +24,21 @@ if (process.env.VCAP_SERVICES) {
 }
 export const s3 = new S3(s3Config);
 
+export const getPresignedURL = (Key, Bucket = bucketName, s3Client = s3, Expires = 360) => {
+  const url = { url: null, error: null };
+  try {
+    const params = {
+      Bucket,
+      Key,
+      Expires,
+    };
+    url.url = s3Client.getSignedUrl('getObject', params);
+  } catch (error) {
+    url.error = error;
+  }
+  return url;
+};
+
 export const verifyVersioning = async (bucket = bucketName, s3Client = s3) => {
   const versioningConfiguration = {
     MFADelete: 'Disabled',

src/lib/s3Uploader.test.js

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import s3Uploader, { verifyVersioning, s3 } from './s3Uploader';
+import s3Uploader, { verifyVersioning, s3, getPresignedURL } from './s3Uploader';
 
 const mockData = {
   MFADelete: 'Disabled',
@@ -70,3 +70,26 @@ describe('s3Uploader', () => {
     await expect(got).toBe(response);
   });
 });
+
+describe('s3Uploader.getPresignedUrl', () => {
+  const Bucket = 'fakeBucket';
+  const Key = 'fakeKey';
+  const fakeError = new Error('fake error');
+  const mockGetURL = jest.spyOn(s3, 'getSignedUrl').mockImplementation(() => 'https://example.com');
+  beforeEach(() => {
+    mockGetURL.mockClear();
+  });
+  it('calls getSignedUrl() with correct parameters', () => {
+    const url = getPresignedURL(Key, Bucket);
+    expect(url).toMatchObject({ url: 'https://example.com', error: null });
+    expect(mockGetURL).toHaveBeenCalled();
+    expect(mockGetURL).toHaveBeenCalledWith('getObject', { Bucket, Key, Expires: 360 });
+  });
+  it('calls getSignedUrl() witcih incorrect parameters', async () => {
+    mockGetURL.mockImplementationOnce(() => { throw fakeError; });
+    const url = getPresignedURL(Key, Bucket);
+    expect(url).toMatchObject({ url: null, error: fakeError });
+    expect(mockGetURL).toHaveBeenCalled();
+    expect(mockGetURL).toHaveBeenCalledWith('getObject', { Bucket, Key, Expires: 360 });
+  });
+});

src/models/file.js

@@ -1,4 +1,5 @@
-const { Model } = require('sequelize');
+import { Model } from 'sequelize';
+import { getPresignedURL } from '../lib/s3Uploader';
 
 module.exports = (sequelize, DataTypes) => {
   class File extends Model {
@@ -37,6 +38,13 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.INTEGER,
       allowNull: false,
     },
+    url: {
+      type: DataTypes.VIRTUAL,
+      get() {
+        const url = getPresignedURL(this.key);
+        return url;
+      },
+    },
   }, {
     sequelize,
     modelName: 'File',