@midwayjs/express 3.5.1 → 3.6.0

package/dist/configuration.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const session = require("@midwayjs/express-session");
 const framework_1 = require("./framework");
@@ -19,7 +18,7 @@ const cookieParser = require("cookie-parser");
 const DefaultConfig = require("./config/config.default");
 let ExpressConfiguration = class ExpressConfiguration {
     init() {
-        this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
+        this.decoratorService.registerParameterHandler(core_1.WEB_ROUTER_PARAM_KEY, options => {
             return (0, core_1.extractExpressLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1], options.originArgs[2]);
         });
     }
@@ -54,25 +53,25 @@ let ExpressConfiguration = class ExpressConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], ExpressConfiguration.prototype, "decoratorService", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", framework_1.MidwayExpressFramework)
 ], ExpressConfiguration.prototype, "expressFramework", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayConfigService)
 ], ExpressConfiguration.prototype, "configService", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], ExpressConfiguration.prototype, "init", null);
 ExpressConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'express',
         imports: [session],
         importConfigs: [

package/dist/framework.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayExpressFramework = void 0;
 const core_1 = require("@midwayjs/core");
-const decorator_1 = require("@midwayjs/decorator");
 const express = require("express");
 const middlewareService_1 = require("./middlewareService");
 const util_1 = require("util");
@@ -160,6 +159,14 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
      */
     generateController(routeInfo) {
         return (0, middlewareService_1.wrapAsyncHandler)(async (req, res, next) => {
+            if (routeInfo.controllerClz && typeof routeInfo.method === 'string') {
+                const isPassed = await this.app
+                    .getFramework()
+                    .runGuard(req, routeInfo.controllerClz, routeInfo.method);
+                if (!isPassed) {
+                    throw new core_1.httpError.ForbiddenError();
+                }
+            }
             let result;
             if (typeof routeInfo.method !== 'string') {
                 result = await routeInfo.method(req, res, next);
@@ -180,16 +187,16 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
                 routeInfo.responseMetadata.length) {
                 for (const routerRes of routeInfo.responseMetadata) {
                     switch (routerRes.type) {
-                        case decorator_1.WEB_RESPONSE_HTTP_CODE:
+                        case core_1.WEB_RESPONSE_HTTP_CODE:
                             res.status(routerRes.code);
                             break;
-                        case decorator_1.WEB_RESPONSE_HEADER:
+                        case core_1.WEB_RESPONSE_HEADER:
                             res.set(routerRes.setHeaders);
                             break;
-                        case decorator_1.WEB_RESPONSE_CONTENT_TYPE:
+                        case core_1.WEB_RESPONSE_CONTENT_TYPE:
                             res.type(routerRes.contentType);
                             break;
-                        case decorator_1.WEB_RESPONSE_REDIRECT:
+                        case core_1.WEB_RESPONSE_REDIRECT:
                             res.redirect(routerRes.code, routerRes.url);
                             return;
                     }
@@ -279,7 +286,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
     }
 };
 MidwayExpressFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], MidwayExpressFramework);
 exports.MidwayExpressFramework = MidwayExpressFramework;
 //# sourceMappingURL=framework.js.map

package/dist/middlewareService.js

@@ -10,11 +10,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapMiddleware = exports.MidwayExpressMiddlewareService = exports.wrapAsyncHandler = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const util_1 = require("./util");
 function wrapAsyncHandler(fn) {
-    if (decorator_1.Types.isAsyncFunction(fn)) {
+    if (core_1.Types.isAsyncFunction(fn)) {
         return (req, res, next) => {
             return fn(req, res, next).catch(err => {
                 next(err);
@@ -36,7 +35,7 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
         }
         const newMiddlewareArr = [];
         for (let fn of middleware) {
-            if (decorator_1.Types.isClass(fn) || typeof fn === 'string') {
+            if (core_1.Types.isClass(fn) || typeof fn === 'string') {
                 if (typeof fn === 'string' &&
                     !this.applicationContext.hasDefinition(fn)) {
                     throw new core_1.MidwayCommonError('Middleware definition not found in midway container');
@@ -118,8 +117,8 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
     }
 };
 MidwayExpressMiddlewareService = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayExpressMiddlewareService);
 exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -24,17 +24,16 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.11",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.5.1",
+    "@midwayjs/mock": "^3.6.0",
     "@types/body-parser": "1.19.2",
-    "@types/express": "4.17.13",
+    "@types/express": "4.17.14",
     "fs-extra": "10.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.5.1",
-    "@midwayjs/express-session": "^3.5.1",
-    "body-parser": "1.20.0",
+    "@midwayjs/core": "^3.6.0",
+    "@midwayjs/express-session": "^3.6.0",
+    "body-parser": "1.20.1",
     "cookie-parser": "^1.4.6",
     "express": "4.18.1"
   },
@@ -46,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "3b63fc768617037644602dd5ad66d3734ce01b16"
+  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
 }