Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RoutingControllers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class RoutingControllers<T extends BaseDriver> {
.buildMiddlewareMetadata(classes)
.filter(middleware => middleware.global && middleware.type === type)
.sort((middleware1, middleware2) => middleware2.priority - middleware1.priority)
.forEach(middleware => this.driver.registerMiddleware(middleware));
.forEach(middleware => this.driver.registerMiddleware(middleware, this.options));

return this;
}
Expand Down
3 changes: 2 additions & 1 deletion src/driver/BaseDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ActionMetadata } from '../metadata/ActionMetadata';
import { ParamMetadata } from '../metadata/ParamMetadata';
import { MiddlewareMetadata } from '../metadata/MiddlewareMetadata';
import { Action } from '../Action';
import { RoutingControllersOptions } from '../RoutingControllersOptions';

/**
* Base driver functionality for all other drivers.
Expand Down Expand Up @@ -180,7 +181,7 @@ export abstract class BaseDriver {
/**
* Registers given middleware.
*/
abstract registerMiddleware(middleware: MiddlewareMetadata): void;
abstract registerMiddleware(middleware: MiddlewareMetadata, options: RoutingControllersOptions): void;

/**
* Registers action in the driver.
Expand Down
6 changes: 3 additions & 3 deletions src/driver/express/ExpressDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { AuthorizationCheckerNotDefinedError } from '../../error/AuthorizationCh
import { isPromiseLike } from '../../util/isPromiseLike';
import { getFromContainer } from '../../container';
import { AuthorizationRequiredError } from '../../error/AuthorizationRequiredError';
import { NotFoundError } from '../../index';
import { NotFoundError, RoutingControllersOptions } from '../../index';

// eslint-disable-next-line @typescript-eslint/no-var-requires
const cookie = require('cookie');
Expand Down Expand Up @@ -54,7 +54,7 @@ export class ExpressDriver extends BaseDriver {
/**
* Registers middleware that run before controller actions.
*/
registerMiddleware(middleware: MiddlewareMetadata): void {
registerMiddleware(middleware: MiddlewareMetadata, options: RoutingControllersOptions): void {
let middlewareWrapper;

// if its an error handler then register it with proper signature in express
Expand Down Expand Up @@ -88,7 +88,7 @@ export class ExpressDriver extends BaseDriver {
writable: true,
});

this.express.use(middlewareWrapper);
this.express.use(options.routePrefix || '/', middlewareWrapper);
}
}

Expand Down