fix: add app.keys (#1395)

midwayjs · Dec 3, 2021 · c44afc6 · c44afc6
1 parent 77af5c0
commit c44afc6
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 2 deletions.
diff --git a/packages/core/src/error/code.ts b/packages/core/src/error/code.ts
@@ -56,4 +56,5 @@ export enum FrameworkErrorEnum {
   DEFINITION_NOT_FOUND = 10003,
   FEATURE_NO_LONGER_SUPPORTED = 10004,
   VALIDATE_FAIL = 10005,
+  MISSING_CONFIG = 10006,
 }
diff --git a/packages/core/src/error/framework.ts b/packages/core/src/error/framework.ts
@@ -55,3 +55,12 @@ export class MidwayValidationError extends MidwayError {
     });
   }
 }
+
+export class MidwayConfigMissingError extends MidwayError {
+  constructor(configKey: string) {
+    super(
+      `Can't found config key "${configKey}" in your config, please set it first`,
+      FrameworkErrorEnum.MISSING_CONFIG
+    );
+  }
+}
diff --git a/packages/processAgent/test/fixtures/primary-demo/src/configuration.ts b/packages/processAgent/test/fixtures/primary-demo/src/configuration.ts
@@ -6,6 +6,15 @@ import * as primary from '../../../../src'
 @Configuration({
   imports: [primary],
   conflictCheck: true,
+  importConfigs: [
+    {
+      default: {
+        koa: {
+          keys: ['123']
+        }
+      }
+    }
+  ]
 })
 export class ContainerLifeCycle {
   @App()

diff --git a/packages/prometheus/test/fixtures/base-app/src/configuration.ts b/packages/prometheus/test/fixtures/base-app/src/configuration.ts
@@ -3,7 +3,16 @@ import * as metrics from '../../../../src';
 
 
 @Configuration({
-  imports: [metrics]
+  imports: [metrics],
+  importConfigs: [
+    {
+      default: {
+        koa: {
+          keys: ['123']
+        }
+      }
+    }
+  ]
 })
 export class AutoConfiguration {
 }
diff --git a/packages/sequelize/test/fixtures/sequelize-demo/src/config/config.default.ts b/packages/sequelize/test/fixtures/sequelize-demo/src/config/config.default.ts
@@ -7,3 +7,7 @@ export const sequelize = {
   },
   sync: true
 }
+
+export const koa = {
+  keys: ['123']
+}
diff --git a/packages/sequelize/test/index.test.ts b/packages/sequelize/test/index.test.ts
@@ -1,5 +1,5 @@
 import { createApp, close } from '@midwayjs/mock';
-import { Framework } from '@midwayjs/koa'
+import { Framework } from '@midwayjs/koa';
 import { join } from 'path';
 import { UserService } from './fixtures/sequelize-demo/src/service/user'
 

diff --git a/packages/view/test/fixtures/base-app/src/config/config.default.ts b/packages/view/test/fixtures/base-app/src/config/config.default.ts
@@ -6,3 +6,7 @@ export const view = {
   },
   keys: '123',
 };
+
+export const koa = {
+  keys: ['123']
+}
diff --git a/packages/web-koa/src/configuration.ts b/packages/web-koa/src/configuration.ts
@@ -8,6 +8,16 @@ import { extractKoaLikeValue, MidwayDecoratorService } from '@midwayjs/core';
 
 @Configuration({
   namespace: 'koa',
+  importConfigs: [
+    {
+      default: {
+        koa: {
+          keys: [],
+          onerror: {},
+        },
+      },
+    },
+  ],
 })
 export class KoaConfiguration {
   @Inject()

diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts
@@ -8,6 +8,7 @@ import {
   PathFileUtil,
   RouterInfo,
   WebControllerGenerator,
+  MidwayConfigMissingError,
 } from '@midwayjs/core';
 
 import { Framework } from '@midwayjs/decorator';
@@ -58,6 +59,14 @@ export class MidwayKoaFramework extends BaseFramework<
       DefaultState,
       IMidwayKoaContext
     >() as IMidwayKoaApplication;
+    const appKeys =
+      this.configurationOptions['keys'] ||
+      this.configService.getConfiguration('keys');
+    if (appKeys) {
+      this.app.keys = appKeys;
+    } else {
+      throw new MidwayConfigMissingError('koa.keys');
+    }
     onerror(this.app, this.configurationOptions.onerror);
     this.app.use(async (ctx, next) => {
       this.app.createAnonymousContext(ctx);