fix(apigw): support oauth2.0 (#161)

* fix(apigw): support oauth2.0

* test: update scf test

* test: fix scf test

Author: yugasun

.github/workflows/test.yml

@@ -54,3 +54,4 @@ jobs:
           SUBNET_ID: ${{ secrets.SUBNET_ID }}
           CFS_VPC_ID: ${{ secrets.CFS_VPC_ID }}
           CFS_SUBNET_ID: ${{ secrets.CFS_SUBNET_ID }}
+          API_PUBLIC_KEY: ${{ secrets.API_PUBLIC_KEY }}

__tests__/apigw.test.js

@@ -94,6 +94,41 @@ describe('apigw', () => {
           registerFunctionName: 'myRestAPI',
         },
       },
+      // below two api is for oauth2.0 test
+      {
+        path: '/oauth',
+        protocol: 'HTTP',
+        method: 'GET',
+        apiName: 'oauthapi',
+        authType: 'OAUTH',
+        businessType: 'OAUTH',
+        serviceType: 'HTTP',
+        serviceConfig: {
+          method: 'GET',
+          path: '/check',
+          url: 'http://10.64.47.103:9090',
+        },
+        oauthConfig: {
+          loginRedirectUrl: 'http://10.64.47.103:9090/code',
+          publicKey: process.env.API_PUBLIC_KEY,
+          tokenLocation: 'method.req.header.authorization',
+          // tokenLocation: 'method.req.header.cookie',
+        },
+      },
+      {
+        path: '/oauthwork',
+        protocol: 'HTTP',
+        method: 'GET',
+        apiName: 'business',
+        authType: 'OAUTH',
+        businessType: 'NORMAL',
+        authRelationApi: {
+          path: '/oauth',
+          method: 'GET',
+        },
+        serviceType: 'MOCK',
+        serviceMockReturnMessage: 'helloworld',
+      },
     ],
   };
   const apigw = new Apigw(credentials, process.env.REGION);
@@ -125,6 +160,8 @@ describe('apigw', () => {
           apiName: 'index',
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
         },
         {
           path: '/mo',
@@ -133,6 +170,8 @@ describe('apigw', () => {
           internalDomain: expect.any(String),
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
         },
         {
           path: '/auto',
@@ -141,6 +180,8 @@ describe('apigw', () => {
           internalDomain: expect.any(String),
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
         },
         {
           path: '/ws',
@@ -149,6 +190,8 @@ describe('apigw', () => {
           internalDomain: expect.any(String),
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
         },
         {
           path: '/wsf',
@@ -159,6 +202,29 @@ describe('apigw', () => {
           ),
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
+        },
+        {
+          path: '/oauth',
+          method: 'GET',
+          apiName: 'oauthapi',
+          apiId: expect.stringContaining('api-'),
+          created: true,
+          authType: 'OAUTH',
+          businessType: 'OAUTH',
+          internalDomain: expect.any(String),
+        },
+        {
+          path: '/oauthwork',
+          method: 'GET',
+          apiName: 'business',
+          apiId: expect.stringContaining('api-'),
+          created: true,
+          authType: 'OAUTH',
+          businessType: 'NORMAL',
+          authRelationApiId: expect.stringContaining('api-'),
+          internalDomain: expect.any(String),
         },
       ],
     });
@@ -197,6 +263,8 @@ describe('apigw', () => {
           apiName: 'index',
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'SECRET',
+          businessType: 'NORMAL',
           usagePlan: {
             created: true,
             secrets: {
@@ -213,6 +281,8 @@ describe('apigw', () => {
           internalDomain: expect.any(String),
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
         },
         {
           path: '/auto',
@@ -221,13 +291,17 @@ describe('apigw', () => {
           internalDomain: expect.any(String),
           apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'NONE',
+          businessType: 'NORMAL',
         },
         {
           path: '/ws',
           method: 'GET',
           apiName: 'ws-test',
           internalDomain: expect.any(String),
           apiId: expect.stringContaining('api-'),
+          authType: 'NONE',
+          businessType: 'NORMAL',
           created: true,
         },
         {
@@ -238,7 +312,30 @@ describe('apigw', () => {
             'http://set-websocket.cb-common.apigateway.tencentyun.com',
           ),
           apiId: expect.stringContaining('api-'),
+          authType: 'NONE',
+          businessType: 'NORMAL',
+          created: true,
+        },
+        {
+          path: '/oauth',
+          method: 'GET',
+          apiName: 'oauthapi',
+          apiId: expect.stringContaining('api-'),
+          created: true,
+          authType: 'OAUTH',
+          businessType: 'OAUTH',
+          internalDomain: expect.any(String),
+        },
+        {
+          path: '/oauthwork',
+          method: 'GET',
+          apiName: 'business',
+          apiId: expect.stringContaining('api-'),
           created: true,
+          authType: 'OAUTH',
+          businessType: 'NORMAL',
+          authRelationApiId: expect.stringContaining('api-'),
+          internalDomain: expect.any(String),
         },
       ],
     });

__tests__/scf.test.js

@@ -68,6 +68,7 @@ describe('Scf', () => {
       {
         apigw: {
           parameters: {
+            serviceName: 'serverless_test',
             endpoints: [
               {
                 path: '/',
@@ -210,7 +211,7 @@ describe('Scf', () => {
         {
           created: true,
           serviceId: expect.stringContaining('service-'),
-          serviceName: 'Serverless_Framework',
+          serviceName: 'serverless_test',
           subDomain: expect.stringContaining('.apigw.tencentcs.com'),
           protocols: 'http',
           environment: 'release',
@@ -222,6 +223,8 @@ describe('Scf', () => {
               apiName: 'index',
               apiId: expect.stringContaining('api-'),
               created: true,
+              authType: 'NONE',
+              businessType: 'NORMAL',
             },
           ],
         },