feat: allow new unknown keys to gateway

surgioproject · Feb 19, 2020 · ec0d3a9 · ec0d3a9
1 parent efbe7ef
commit ec0d3a9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/lib/types.ts b/lib/types.ts
@@ -51,7 +51,8 @@ export interface CommandConfig {
   };
   readonly gateway?: {
     readonly accessToken?: string;
-    auth?: boolean; // tslint:disable-line:readonly-keyword
+    readonly auth?: boolean; // tslint:disable-line:readonly-keyword
+    readonly cookieMaxAge?: number;
   },
   readonly proxyTestUrl?: string;
   readonly proxyTestInterval?: number;

diff --git a/lib/utils/config.ts b/lib/utils/config.ts
@@ -113,7 +113,9 @@ export const validateConfig = (userConfig: Partial<CommandConfig>): void => {
     gateway: Joi.object({
       accessToken: Joi.string(),
       auth: Joi.boolean(),
-    }),
+      cookieMaxAge: Joi.number(),
+    })
+    .unknown(),
     proxyTestUrl: Joi.string().uri({
       scheme: [
         /https?/,

diff --git a/test/fixture/gateway/surgio.conf.js b/test/fixture/gateway/surgio.conf.js
@@ -37,6 +37,7 @@ module.exports = {
   },
   gateway: {
     accessToken: 'abcd',
+    auth: false,
   },
   surgeConfig: {
     v2ray: 'native',

diff --git a/test/gateway/index.test.ts b/test/gateway/index.test.ts
@@ -2,6 +2,7 @@ import test from 'ava';
 import path from 'path';
 import request from 'supertest';
 import { JSDOM } from 'jsdom';
+import sinon from 'sinon';
 
 import * as gateway from '../../lib/gateway';
 
@@ -190,11 +191,12 @@ test('list artifact', async t => {
 });
 
 test('auth', async t => {
+  const sandbox = sinon.createSandbox();
   const fixture = path.join(__dirname, '../fixture/gateway');
   const surgioServer = gateway.createSurgioServer(fixture);
   const app = gateway.createKoaApp(surgioServer);
 
-  app.surgioConfig.gateway.auth = true;
+  sandbox.stub(app.surgioConfig.gateway, 'auth').value(true);
 
   await request(app.callback())
     .get('/list-artifact')
@@ -206,6 +208,8 @@ test('auth', async t => {
   await request(app.callback())
     .get('/list-artifact?access_token=abcd')
     .expect(200);
+
+  sandbox.restore();
 });
 
 test('qx-script', async t => {