Merge pull request #831 from nestjs/fix/context-instance-830

fix(): assign req to object instead of object merge #830
nestjs · Apr 30, 2020 · c9a09a2 · c9a09a2
2 parents 0ca55fa + 1ec9f38
commit c9a09a2
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/lib/utils/merge-defaults.util.ts b/lib/utils/merge-defaults.util.ts
@@ -20,21 +20,15 @@ export function mergeDefaults(
     moduleOptions.context = async (...args: unknown[]) => {
       const ctx = await (options.context as Function)(...args);
       const { req } = args[0] as Record<string, unknown>;
-      if (typeof ctx === 'object') {
-        return {
-          req,
-          ...ctx,
-        };
+      if (ctx && typeof ctx === 'object') {
+        ctx.req = req;
       }
       return ctx;
     };
   } else {
     moduleOptions.context = ({ req }: Record<string, unknown>) => {
-      if (typeof options.context === 'object') {
-        return {
-          req,
-          ...options.context,
-        };
+      if (options.context && typeof options.context === 'object') {
+        (options.context as Record<string, unknown>).req = req;
       }
       return options.context;
     };