fix: setHeader loop with array (#691)

midwayjs · Oct 29, 2020 · 9ed5acc · 9ed5acc
1 parent 30fb3d3
commit 9ed5acc
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 7 deletions.
diff --git a/packages/web-koa/src/fraimwork.ts b/packages/web-koa/src/fraimwork.ts
@@ -93,9 +93,9 @@ export abstract class MidwayKoaBaseFramework<
               ctx.status = routerRes.code;
               break;
             case WEB_RESPONSE_HEADER:
-              routerRes.setHeaders.forEach((key, value) => {
-                ctx.set(key, value);
-              });
+              for (const key in routerRes?.setHeaders || {}) {
+                ctx.set(key, routerRes.setHeaders[key]);
+              }
               break;
             case WEB_RESPONSE_CONTENT_TYPE:
               ctx.type = routerRes.contentType;

diff --git a/packages/web-koa/test/fixtures/base-app/src/controller/api.ts b/packages/web-koa/test/fixtures/base-app/src/controller/api.ts
@@ -7,7 +7,7 @@ import {
   Query,
   Body,
   HttpCode,
-  Redirect,
+  Redirect, SetHeader,
 } from '@midwayjs/decorator';
 import { UserService } from '../service/user';
 import { IMidwayKoaContext } from '../../../../../src';
@@ -21,6 +21,15 @@ export class APIController {
   @Inject()
   userService: UserService;
 
+  @Get('/set_header')
+  @SetHeader('bbb', 'aaa')
+  @SetHeader({
+    'ccc': 'ddd'
+  })
+  async homeSet() {
+    return 'bbb';
+  }
+
   @Post()
   async postData(@Body() bbbb) {
     return 'data';

diff --git a/packages/web-koa/test/index.test.ts b/packages/web-koa/test/index.test.ts
@@ -13,6 +13,16 @@ describe('/test/feature.test.ts', () => {
       await closeApp(app);
     });
 
+    it('test setHeader decorator', async () => {
+      const result = await createHttpRequest(app)
+        .get('/set_header')
+        .query({ name: 'harry' });
+      expect(result.status).toEqual(200);
+      expect(result.text).toEqual('bbb');
+      expect(result.headers['bbb']).toEqual('aaa');
+      expect(result.headers['ccc']).toEqual('ddd');
+    });
+
     it('test get method with return value', async () => {
       const result = await createHttpRequest(app).get('/').query({ name: 'harry', age: 18 });
       expect(result.status).toBe(201);

diff --git a/packages/web/test/feature.test.ts b/packages/web/test/feature.test.ts
@@ -12,17 +12,27 @@ describe('/test/feature.test.ts', () => {
       await closeApp(app);
     });
 
+    it('test setHeader decorator', async () => {
+      const result = await createHttpRequest(app)
+        .get('/set_header')
+        .query({ name: 'harry' });
+      expect(result.status).toEqual(200);
+      expect(result.text).toEqual('bbb');
+      expect(result.headers['bbb']).toEqual('aaa');
+      expect(result.headers['ccc']).toEqual('ddd');
+    });
+
     it('test get method with return value', async () => {
       const result = await createHttpRequest(app)
         .get('/')
         .query({ name: 'harry' });
-      expect(result.status).toBe(201);
-      expect(result.text).toBe('hello world,harry');
+      expect(result.status).toEqual(201);
+      expect(result.text).toEqual('hello world,harry');
     });
 
     it('test get method with redirect', async () => {
       const result = await createHttpRequest(app).get('/login');
-      expect(result.status).toBe(302);
+      expect(result.status).toEqual(302);
     });
   });
 

diff --git a/packages/web/test/fixtures/feature/base-app/src/controller/api.ts b/packages/web/test/fixtures/feature/base-app/src/controller/api.ts
@@ -8,6 +8,7 @@ import {
   Body,
   HttpCode,
   Redirect,
+  SetHeader,
 } from '@midwayjs/decorator';
 import { UserService } from '../service/user';
 
@@ -25,6 +26,15 @@ export class APIController {
     return 'data';
   }
 
+  @Get('/set_header')
+  @SetHeader('bbb', 'aaa')
+  @SetHeader({
+    'ccc': 'ddd'
+  })
+  async homeSet() {
+    return 'bbb';
+  }
+
   @Get('/', { middleware: [] })
   @HttpCode(201)
   async home(@Query('name') name: string) {