From 7ca931ad8b650f6c4d19a36a304d38219de3148b Mon Sep 17 00:00:00 2001 From: Justyn Oh Date: Thu, 17 Aug 2023 00:33:47 +0800 Subject: [PATCH] chore: revert out-of-scope changes --- __tests__/unit/backend/helpers/jest-db.ts | 2 +- src/app/loaders/express/helmet.ts | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/__tests__/unit/backend/helpers/jest-db.ts b/__tests__/unit/backend/helpers/jest-db.ts index 291d9845cd..60e2946c8b 100644 --- a/__tests__/unit/backend/helpers/jest-db.ts +++ b/__tests__/unit/backend/helpers/jest-db.ts @@ -1,5 +1,5 @@ import MemoryDatabaseServer from '__tests__/setup/database' -import { ObjectID } from 'bson-ext' +import { ObjectID } from 'bson' import mongoose from 'mongoose' import { FormResponseMode } from 'shared/types' diff --git a/src/app/loaders/express/helmet.ts b/src/app/loaders/express/helmet.ts index 08620ff0e1..ba054e08a7 100644 --- a/src/app/loaders/express/helmet.ts +++ b/src/app/loaders/express/helmet.ts @@ -1,14 +1,10 @@ import { RequestHandler } from 'express' -import helmet, { HelmetOptions } from 'helmet' +import helmet from 'helmet' +import { ContentSecurityPolicyOptions } from 'helmet/dist/types/middlewares/content-security-policy' import config from '../../config/config' import { sentryConfig } from '../../config/features/sentry.config' -type ContentSecurityPolicyOptions = Exclude< - HelmetOptions['contentSecurityPolicy'], - boolean | undefined -> - const helmetMiddlewares = () => { // Only add the "Strict-Transport-Security" header if request is https. const hstsMiddleware: RequestHandler = (req, res, next) => {