Merge pull request #296 from boostcampwm-2024/dev-back

[BE] Merge to main

Author: sjy2335

backend/proxy-server/src/server/fastify.server.ts

@@ -83,11 +83,11 @@ const initialize = (server: FastifyInstance, logger: Logger) => {
 
 const addPlugins = (server: FastifyInstance) => {
     server.register(replyFrom, replyFromConfig);
-    // server.addHook('preHandler', async (request) => {
-    //     (request as any).locals = {
-    //         originalContentType: request.headers['content-type'],
-    //     };
-    // });
+    server.addHook('preHandler', async (request) => {
+        (request as any).locals = {
+            originalContentType: request.headers['content-type'],
+        };
+    });
 };
 
 const addRouters = (server: FastifyInstance, logger: Logger) => {

backend/proxy-server/src/server/handler/proxy.handler.ts

@@ -6,7 +6,8 @@ import { logHandler } from 'server/handler/log.handler';
 import type { LogAdapter } from 'server/adapter/log.adapter';
 import type { Logger } from 'common/logger/createFastifyLogger';
 import { HOST_HEADER } from 'common/constant/http.constant';
-// import type { Locals } from 'server/fastify.server';
+import type { Locals } from 'server/fastify.server';
+
 
 export const proxyHandler = async (
     request: FastifyRequest,
@@ -17,14 +18,14 @@ export const proxyHandler = async (
 ) => {
     const targetUrl = await projectAdapter.resolveTargetUrl(request);
 
-    // const locals = (request as any).locals as Locals;
-    // const extraHeaders: { [header: string]: string } = {};
-    //
-    // if (locals.originalContentType) {
-    //     extraHeaders['content-type'] = locals.originalContentType;
-    // }
+    const locals = (request as any).locals as Locals;
+    const extraHeaders: { [header: string]: string } = {};
+
+    if (locals.originalContentType) {
+        extraHeaders['content-type'] = locals.originalContentType;
+    }
     const host = request.headers[HOST_HEADER] as string;
-    return sendProxyRequest(host, targetUrl, reply, logAdapter, logger);
+    return sendProxyRequest(host, targetUrl, reply, logAdapter, logger, extraHeaders);
 };
 
 const sendProxyRequest = async (
@@ -33,10 +34,12 @@ const sendProxyRequest = async (
     reply: FastifyReply,
     logAdapter: LogAdapter,
     logger: Logger,
+    extraHeaders: { [header: string]: string },
 ): Promise<void> => {
     return reply.from(targetUrl, {
         rewriteRequestHeaders: (req, headers) => ({
             ...headers,
+            ...extraHeaders,
             host,
         }),
         onError: (reply, error) => {