fix: change all requestMethod to real method for serverless http requ…

…est (#1028)
midwayjs · May 7, 2021 · 23e2943 · 23e2943
1 parent ae242c1
commit 23e2943
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/packages/core/src/util/triggerCollector.ts b/packages/core/src/util/triggerCollector.ts
@@ -3,7 +3,23 @@ import { WebRouterCollector } from './webRouterCollector';
 export class ServerlessTriggerCollector extends WebRouterCollector {
   protected async analyze() {
     this.options.includeFunctionRouter = true;
-    return super.analyze();
+    await super.analyze();
+    // requestMethod all transform to other method
+    for (const routerInfo of this.routes.values()) {
+      for (const info of routerInfo) {
+        if (info.requestMethod === 'all') {
+          info.functionTriggerMetadata.method = [
+            'get',
+            'post',
+            'put',
+            'delete',
+            'head',
+            'patch',
+            'options',
+          ];
+        }
+      }
+    }
   }
 
   protected collectRoute(module) {

diff --git a/packages/core/src/util/webRouterCollector.ts b/packages/core/src/util/webRouterCollector.ts
@@ -100,7 +100,7 @@ export interface RouterCollectorOptions {
 export class WebRouterCollector {
   protected readonly baseDir: string;
   private isReady = false;
-  private routes = new Map<string, RouterInfo[]>();
+  protected routes = new Map<string, RouterInfo[]>();
   private routesPriority: RouterPriority[] = [];
   protected options: RouterCollectorOptions;
 

diff --git a/packages/core/test/util/triggerCollector.test.ts b/packages/core/test/util/triggerCollector.test.ts
@@ -130,7 +130,7 @@ describe('/test/util/triggerCollector.test.ts', function () {
       "funcHandlerName": "http.handler",
       "functionName": "helloHttpService-handler",
       "functionTriggerMetadata": {
-        "method": "all",
+        "method": ['get', 'post', 'put', 'delete', 'head', 'patch', 'options'],
         "path": "/other"
       },
       "functionTriggerName": "http",