Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(router,admin): admin requests not passing through master key middleware #88

Merged
merged 1 commit into from
Mar 22, 2022
Merged

fix(router,admin): admin requests not passing through master key middleware #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 8 additions & 11 deletions packages/admin/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,23 @@ export default class AdminModule extends IConduitAdmin {
this._app = app;
this._restRouter = new RestController(this._app, swaggerRouterMetadata);

this._restRouter.registerRoute('*', middleware.getAdminMiddleware(this.conduit));
// Register Middleware
this._restRouter.registerRoute(
'*',
middleware.getAuthMiddleware(this.grpcSdk, this.conduit),
[
middleware.getAdminMiddleware(this.conduit),
middleware.getAuthMiddleware(this.grpcSdk, this.conduit),
],
);
// Register Pre-Auth-Middleware routes
const preAuthMiddlewareRoutes: ConduitRoute[] = [];
preAuthMiddlewareRoutes.push(adminRoutes.getLoginRoute(this.conduit));
preAuthMiddlewareRoutes.push(adminRoutes.getModulesRoute(this.conduit));
preAuthMiddlewareRoutes.forEach((route) => {
this._restRouter.registerConduitRoute(route);
}, this);

this._grpcRoutes = {};
this._sdkRoutes = [
adminRoutes.getLoginRoute(this.conduit),
adminRoutes.getModulesRoute(this.conduit),
adminRoutes.getCreateAdminRoute(this.conduit),
];

// Register Post-Auth-Middleware routes
// Register Routes
this._sdkRoutes.forEach((route) => {
this._restRouter.registerConduitRoute(route);
}, this);
Expand Down Expand Up @@ -123,7 +121,6 @@ export default class AdminModule extends IConduitAdmin {
message: 'Error when registering routes',
});
}
//(call as any).metadata.get('module-name')
call.request.routerUrl = result;
}
this.internalRegisterRoute(
Expand Down
6 changes: 3 additions & 3 deletions packages/router/src/controllers/Rest/Rest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { ConduitRouter } from '../Router';
const swaggerUi = require('swagger-ui-express');

export class RestController extends ConduitRouter {
private _registeredLocalRoutes: Map<string, Handler>;
private _registeredLocalRoutes: Map<string, Handler | Handler[]>;
private _swagger: SwaggerGenerator;
private _scheduledTimeout: any = null;

Expand All @@ -40,7 +40,7 @@ export class RestController extends ConduitRouter {

registerRoute(
path: string,
router: Router | ((req: Request, res: Response, next: NextFunction) => void)
router: Router | ((req: Request, res: Response, next: NextFunction) => void) | ((req: Request, res: Response, next: NextFunction) => void)[]
) {
const key = `*-${path}`;
const registered = this._registeredLocalRoutes.has(key);
Expand Down Expand Up @@ -75,7 +75,7 @@ export class RestController extends ConduitRouter {

private addRoute(
path: string,
router: Router | ((req: Request, res: Response, next: NextFunction) => void)
router: Router | ((req: Request, res: Response, next: NextFunction) => void) | ((req: Request, res: Response, next: NextFunction) => void)[]
) {
this._expressRouter.use(path, router);
}
Expand Down