fix: koa response 204 (#733)

* fix: koa response 204 * fix: response 204
midwayjs · Nov 28, 2020 · 2463d77 · 2463d77
1 parent 2e430f3
commit 2463d77
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 11 deletions.
diff --git a/packages/core/src/context/midwayContainer.ts b/packages/core/src/context/midwayContainer.ts
@@ -60,7 +60,7 @@ const DEFAULT_IGNORE_PATTERN = [
   '**/view/**',
   '**/views/**',
   '**/app/extend/**',
-  '**/node_modules/**'
+  '**/node_modules/**',
 ];
 
 const globalDebugLogger = util.debuglog('midway:container');

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -34,7 +34,10 @@ export {
 } from '@midwayjs/decorator';
 export * from './interface';
 export { ContainerLoader } from './loader';
-export { MidwayContainer, clearContainerCache } from './context/midwayContainer';
+export {
+  MidwayContainer,
+  clearContainerCache,
+} from './context/midwayContainer';
 export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';

diff --git a/packages/web-express/src/framework.ts b/packages/web-express/src/framework.ts
@@ -132,7 +132,9 @@ export class MidwayExpressFramework extends BaseFramework<
       const controller = await req.requestContext.getAsync(controllerId);
       // eslint-disable-next-line prefer-spread
       const result = await controller[methodName].apply(controller, args);
-
+      if (res.statusCode === 200 && (result === null || result === undefined)) {
+        res.status(204);
+      }
       // implement response decorator
       if (Array.isArray(routerResponseData) && routerResponseData.length) {
         for (const routerRes of routerResponseData) {
@@ -152,10 +154,7 @@ export class MidwayExpressFramework extends BaseFramework<
           }
         }
       }
-
-      if (result) {
-        res.send(result);
-      }
+      res.send(result);
     };
   }
 

diff --git a/packages/web-express/test/fixtures/base-app/src/controller/api.ts b/packages/web-express/test/fixtures/base-app/src/controller/api.ts
@@ -45,6 +45,11 @@ export class APIController {
     return 'hello world,' + name;
   }
 
+  @Get('/204')
+  async status204() {
+    // empty
+  }
+
   @Get('/login')
   @Redirect('/')
   async redirect() {

diff --git a/packages/web-express/test/index.test.ts b/packages/web-express/test/index.test.ts
@@ -33,6 +33,12 @@ describe('/test/feature.test.ts', () => {
       const result = await createHttpRequest(app).get('/login');
       expect(result.status).toBe(302);
     });
+
+    it('test get status 204', async () => {
+      const result = await createHttpRequest(app).get('/204');
+      console.log('result.status', result.status);
+      expect(result.status).toBe(204);
+    });
   });
 
 });
diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts
@@ -80,10 +80,7 @@ export abstract class MidwayKoaBaseFramework<
       }
       const controller = await ctx.requestContext.getAsync(controllerId);
       // eslint-disable-next-line prefer-spread
-      const result = await controller[methodName].apply(controller, args);
-      if (result) {
-        ctx.body = result;
-      }
+      ctx.body = await controller[methodName].apply(controller, args);
 
       // implement response decorator
       if (Array.isArray(routerResponseData) && routerResponseData.length) {

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
@@ -41,6 +41,11 @@ export class APIController {
     return 'hello world,' + name + age;
   }
 
+  @Get('/204')
+  async status204() {
+    // empty
+  }
+
   @Get('/login')
   @Redirect('/')
   async redirect() {}

diff --git a/packages/web-koa/test/index.test.ts b/packages/web-koa/test/index.test.ts
@@ -33,6 +33,11 @@ describe('/test/feature.test.ts', () => {
       const result = await createHttpRequest(app).get('/login');
       expect(result.status).toBe(302);
     });
+
+    it('test get status 204', async () => {
+      const result = await createHttpRequest(app).get('/204');
+      expect(result.status).toBe(204);
+    });
   });
 
 });
diff --git a/packages/web/test/feature.test.ts b/packages/web/test/feature.test.ts
@@ -22,6 +22,11 @@ describe('/test/feature.test.ts', () => {
       expect(result.headers['ccc']).toEqual('ddd');
     });
 
+    it('test get status 204', async () => {
+      const result = await createHttpRequest(app).get('/204');
+      expect(result.status).toEqual(204);
+    });
+
     it('test get method with return value', async () => {
       const result = await createHttpRequest(app)
         .get('/')

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
@@ -46,4 +46,9 @@ export class APIController {
   async redirect() {
   }
 
+  @Get('/204')
+  async r204() {
+    //
+  }
+
 }