diff options
Diffstat (limited to 'src/lib/middleware.ts')
-rw-r--r-- | src/lib/middleware.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts index 5073137..be05c3f 100644 --- a/src/lib/middleware.ts +++ b/src/lib/middleware.ts @@ -1,7 +1,7 @@ import { NextFunction, Request, Response } from "express"; import MagicLink from "../models/MagicLink.js"; import getConfig, { GathioConfig } from "../lib/config.js"; -import { deepMerge } from "../util/object.js"; +import { merge as deepMerge } from "ts-deepmerge"; export const checkMagicLink = async ( req: Request, @@ -62,7 +62,7 @@ export const getConfigMiddleware = ( if (process.env.CYPRESS === "true" && req.cookies?.cypressConfigOverride) { console.log("Overriding config with Cypress config"); const override = JSON.parse(req.cookies.cypressConfigOverride); - res.locals.config = deepMerge<GathioConfig>(config, override); + res.locals.config = deepMerge(config, override); return next(); } res.locals.config = config; |