fixes after review

Author: stefangutica

src/main.ts

@@ -188,12 +188,12 @@ async function bootstrap() {
   logger.log(`Transaction pool enabled: ${apiConfigService.isTransactionPoolEnabled()}`);
   logger.log(`Transaction pool cache warmer enabled: ${apiConfigService.isTransactionPoolCacheWarmerEnabled()}`);
 
-  logger.log('Restricted routes enabled: ' + apiConfigService.isRestrictedRoutesEnabled());
+  logger.log(`Restricted routes enabled: ${apiConfigService.isRestrictedRoutesEnabled()}`);
 }
 
 async function configurePublicApp(publicApp: NestExpressApplication, apiConfigService: ApiConfigService) {
   if (apiConfigService.isRestrictedRoutesEnabled()) {
-    const restrictedRoutesMiddleware = new RestrictedRoutesMiddleware(apiConfigService);
+    const restrictedRoutesMiddleware = publicApp.get(RestrictedRoutesMiddleware);
     publicApp.use(restrictedRoutesMiddleware.use.bind(restrictedRoutesMiddleware));
   }
 

src/public.app.module.ts

@@ -9,6 +9,7 @@ import { GuestCacheService } from '@multiversx/sdk-nestjs-cache';
 import { LoggingModule } from '@multiversx/sdk-nestjs-common';
 import { DynamicModuleUtils } from './utils/dynamic.module.utils';
 import { LocalCacheController } from './endpoints/caching/local.cache.controller';
+import { RestrictedRoutesMiddleware } from './utils/restricted.routes.middleware';
 
 @Module({
   imports: [
@@ -23,6 +24,7 @@ import { LocalCacheController } from './endpoints/caching/local.cache.controller
   providers: [
     DynamicModuleUtils.getNestJsApiConfigService(),
     GuestCacheService,
+    RestrictedRoutesMiddleware,
   ],
   exports: [
     EndpointsServicesModule,

src/test/unit/utils/restricted.routes.middleware.spec.ts

@@ -0,0 +1,45 @@
+import { NotFoundException } from '@nestjs/common';
+import { Request, Response } from 'express';
+import { ApiConfigService } from 'src/common/api-config/api.config.service';
+import { RestrictedRoutesMiddleware } from 'src/utils/restricted.routes.middleware';
+
+describe('RestrictedRoutesMiddleware', () => {
+  let middleware: RestrictedRoutesMiddleware;
+  let apiConfigService: jest.Mocked<ApiConfigService>;
+
+  beforeEach(() => {
+    apiConfigService = {
+      getRestrictedRoutes: jest.fn(),
+    } as unknown as jest.Mocked<ApiConfigService>;
+
+    middleware = new RestrictedRoutesMiddleware(apiConfigService);
+  });
+
+  it('should throw NotFoundException when route is restricted', () => {
+    apiConfigService.getRestrictedRoutes.mockReturnValue(['/blocked']);
+
+    const req = {
+      path: '/blocked',
+    } as Request;
+    const res = {} as Response;
+    const next = jest.fn();
+
+    expect(() => middleware.use(req, res, next)).toThrow(NotFoundException);
+    expect(() => middleware.use(req, res, next)).toThrow('Cannot GET /blocked');
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it('should call next when route is not restricted', () => {
+    apiConfigService.getRestrictedRoutes.mockReturnValue(['/blocked']);
+
+    const req = {
+      path: '/allowed',
+    } as Request;
+    const res = {} as Response;
+    const next = jest.fn();
+
+    middleware.use(req, res, next);
+
+    expect(next).toHaveBeenCalledTimes(1);
+  });
+});

src/utils/restricted.routes.middleware.ts

@@ -1,11 +1,13 @@
-import { NestMiddleware, NotFoundException } from '@nestjs/common';
+import { Injectable, NestMiddleware, NotFoundException } from '@nestjs/common';
 import { Request, Response, NextFunction } from 'express';
 import { ApiConfigService } from 'src/common/api-config/api.config.service';
 
+@Injectable()
 export class RestrictedRoutesMiddleware implements NestMiddleware {
   constructor(
     private readonly apiConfigService: ApiConfigService,
   ) { }
+
   use(req: Request, _res: Response, next: NextFunction) {
     const restrictedRoutes = this.apiConfigService.getRestrictedRoutes();
     if (restrictedRoutes.includes(req.path)) {