test: updates env test file

theopensystemslab · Aug 17, 2022 · 742c53c · 742c53c
1 parent 49aa64d
commit 742c53c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/api.planx.uk/.env.test b/api.planx.uk/.env.test
@@ -35,3 +35,4 @@ GOVUK_NOTIFY_EXPIRY_EMAIL_TEMPLATE_ID=9619f89d-5d33-4cb0-a365-42c431ea9db3
 GOVUK_NOTIFY_API_KEY_TEAM=Test
 
 HASURA_PLANX_API_KEY=testtesttest
+FILE_API_KEY=test
diff --git a/api.planx.uk/server.test.js b/api.planx.uk/server.test.js
@@ -1,6 +1,5 @@
 const nock = require("nock");
 const supertest = require("supertest");
-const { generateFileHash } = require("./s3");
 const loadOrRecordNockRequests = require("./tests/loadOrRecordNockRequests");
 
 const { queryMock } = require("./tests/graphqlQueryMock");
@@ -335,7 +334,6 @@ describe("File upload", () => {
         expect(res.body).toEqual({
           file_type: 'text/plain',
           key: expect.stringContaining('some_file.txt'),
-          file_hash: expect.any(String),
         });
         expect(mockPutObject).toHaveBeenCalledTimes(1);
       });
@@ -398,64 +396,54 @@ describe("File download", () => {
   });
 
   it("file/public - should not download private files", async () => {
+    const filePath = 'somekey/file_name.txt'
     getObjectResponse = {
       ...getObjectResponse,
       Metadata: {
-        file_hash: '123'
+        is_private: 'true'
       }
     }
-    await supertest(app)
-      .get("/file/public/somekey/file_name.txt")
-      .expect(400)
-      .then(res => {
-        expect(mockGetObject).toHaveBeenCalledTimes(1);
-        expect(res.body.error).toBe('bad request')
-      })
-  });
 
-  it("file/private - should not download with missing file hash", async () => {
     await supertest(app)
-      .get("/file/private/somekey/file_name.txt")
+      .get(`/file/public/${filePath}`)
       .expect(400)
       .then(res => {
-        expect(mockGetObject).not.toHaveBeenCalled();
-        expect(res.body.error).toBe('wrong or missing headers')
-      })
+        expect(mockGetObject).toHaveBeenCalledTimes(1);
+        expect(res.body.error).toBe("bad request")
+      });
   });
 
-  it("file/private - should not download if file has different hash", async () => {
+  it("file/private - should not download if file is private", async () => {
     const filePath = 'somekey/file_name.txt'
-    const hash = generateFileHash(filePath);
     getObjectResponse = {
       ...getObjectResponse,
       Metadata: {
-        file_hash: 'somehash'
+        is_private: 'true'
       }
     }
 
     await supertest(app)
-      .get(`/file/private/${filePath}`)
-      .set({ 'file-hash': hash })
-      .expect(403)
+      .get(`/file/public/${filePath}`)
+      .expect(400)
       .then(res => {
         expect(mockGetObject).toHaveBeenCalledTimes(1);
-        expect(res.body.error).toBe('unauthorized')
+        expect(res.body.error).toBe("bad request")
       });
   });
 
   it("file/private - should download file", async () => {
     const filePath = 'somekey/file_name.txt'
-    const hash = generateFileHash(filePath);
+
     getObjectResponse = {
       ...getObjectResponse,
       Metadata: {
-        file_hash: hash
+        is_private: 'true'
       }
     }
 
     await supertest(app)
       .get(`/file/private/${filePath}`)
-      .set({ 'file-hash': hash })
+      .set({ 'api-key': 'test' })
       .expect(200)
       .then(() => {
         expect(mockGetObject).toHaveBeenCalledTimes(1);