Merge pull request #18 from blockydevs/authorization-token-handling

Middleware to pass the auth token

packages/apps/human-app/server/src/app.module.ts

@@ -15,6 +15,7 @@ import { JobsDiscoveryModule } from './modules/jobs-discovery/jobs-discovery.mod
 import { JobsDiscoveryController } from './modules/jobs-discovery/jobs-discovery.controller';
 import { JobAssignmentController } from './modules/job-assignment/job-assignment.controller';
 import { JobAssignmentModule } from './modules/job-assignment/job-assignment.module';
+import { RequestContext } from './common/utils/request-context.util';
 
 @Module({
   imports: [
@@ -41,7 +42,7 @@ import { JobAssignmentModule } from './modules/job-assignment/job-assignment.mod
     JobsDiscoveryController,
     JobAssignmentController,
   ],
-  providers: [],
+  providers: [RequestContext],
   exports: [HttpModule],
 })
 export class AppModule {}

packages/apps/human-app/server/src/common/interceptors/auth-token.middleware.ts

@@ -0,0 +1,13 @@
+import { RequestContext } from '../utils/request-context.util';
+import { Injectable, NestMiddleware } from '@nestjs/common';
+
+@Injectable()
+export class TokenMiddleware implements NestMiddleware {
+  constructor(private readonly requestContext: RequestContext) {}
+
+  use(req: any, res: any, next: () => void) {
+    const authorization = req.headers['authorization'];
+    this.requestContext.token = authorization;
+    next();
+  }
+}

packages/apps/human-app/server/src/common/utils/request-context.util.ts

@@ -0,0 +1,6 @@
+import { Injectable, Scope } from '@nestjs/common';
+
+@Injectable({ scope: Scope.REQUEST })
+export class RequestContext {
+  token: string;
+}

packages/apps/human-app/server/src/modules/job-assignment/job-assignment.module.ts

@@ -1,11 +1,18 @@
-import { Module } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import { JobAssignmentService } from './job-assignment.service';
 import { JobAssignmentProfile } from './job-assignment.mapper';
 import { HttpModule } from '@nestjs/axios';
+import { TokenMiddleware } from '../../common/interceptors/auth-token.middleware';
+import { JobAssignmentController } from './job-assignment.controller';
+import { RequestContext } from '../../common/utils/request-context.util';
 
 @Module({
   imports: [HttpModule],
-  providers: [JobAssignmentService, JobAssignmentProfile],
+  providers: [JobAssignmentService, JobAssignmentProfile, RequestContext],
   exports: [JobAssignmentService],
 })
-export class JobAssignmentModule {}
+export class JobAssignmentModule implements NestModule {
+  configure(consumer: MiddlewareConsumer) {
+    consumer.apply(TokenMiddleware).forRoutes(JobAssignmentController);
+  }
+}

packages/apps/human-app/server/src/modules/job-assignment/job-assignment.service.ts

@@ -11,12 +11,14 @@ import {
 import { HttpService } from '@nestjs/axios';
 import { InjectMapper } from '@automapper/nestjs';
 import { Mapper } from '@automapper/core';
+import { RequestContext } from '../../common/utils/request-context.util';
 
 @Injectable()
 export class JobAssignmentService {
   constructor(
     public httpService: HttpService,
     @InjectMapper() private readonly mapper: Mapper,
+    private readonly requestContext: RequestContext,
   ) {}
 
   async processJobAssignment(
@@ -29,10 +31,12 @@ export class JobAssignmentService {
     );
     try {
       const url = jobAssignmentData.exchange_oracle_url;
+      const token = this.requestContext.token;
       const options = {
         method: 'POST',
         url: `${url}/assignment`,
         data: jobAssignmentData,
+        headers: { Authorization: `Bearer ${token}` },
       };
       const response = await lastValueFrom(this.httpService.request(options));
       return response.data;

packages/apps/human-app/server/src/modules/jobs-discovery/jobs-discovery.module.ts

@@ -1,11 +1,18 @@
-import { Module } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import { JobsDiscoveryService } from './jobs-discovery.service';
 import { JobsDiscoveryProfile } from './jobs-discovery.mapper';
 import { HttpModule } from '@nestjs/axios';
+import { TokenMiddleware } from '../../common/interceptors/auth-token.middleware';
+import { JobsDiscoveryController } from './jobs-discovery.controller';
+import { RequestContext } from '../../common/utils/request-context.util';
 
 @Module({
   imports: [HttpModule],
-  providers: [JobsDiscoveryService, JobsDiscoveryProfile],
+  providers: [JobsDiscoveryService, JobsDiscoveryProfile, RequestContext],
   exports: [JobsDiscoveryService],
 })
-export class JobsDiscoveryModule {}
+export class JobsDiscoveryModule implements NestModule {
+  configure(consumer: MiddlewareConsumer) {
+    consumer.apply(TokenMiddleware).forRoutes(JobsDiscoveryController);
+  }
+}

packages/apps/human-app/server/src/modules/jobs-discovery/jobs-discovery.service.ts

@@ -8,12 +8,14 @@ import {
 import { HttpService } from '@nestjs/axios';
 import { InjectMapper } from '@automapper/nestjs';
 import { Mapper } from '@automapper/core';
+import { RequestContext } from '../../common/utils/request-context.util';
 
 @Injectable()
 export class JobsDiscoveryService {
   constructor(
     public httpService: HttpService,
     @InjectMapper() private readonly mapper: Mapper,
+    private readonly requestContext: RequestContext,
   ) {}
 
   async processJobsDiscovery(
@@ -26,10 +28,12 @@ export class JobsDiscoveryService {
     );
     try {
       const url = jobsDiscoveryParamsCommand.exchange_oracle_url;
+      const token = this.requestContext.token;
       const options = {
         method: 'GET',
         url: `${url}/jobs`,
         params: jobsDiscoveryParamsData,
+        headers: { Authorization: `Bearer ${token}` },
       };
       const response = await lastValueFrom(this.httpService.request(options));
       return response.data;

packages/apps/human-app/server/src/modules/jobs-discovery/spec/jobs-discovery.controller.spec.ts

@@ -15,6 +15,8 @@ import { AutomapperModule } from '@automapper/nestjs';
 import { classes } from '@automapper/classes';
 import { JobsDiscoveryProfile } from '../jobs-discovery.mapper';
 import { HttpService } from '@nestjs/axios';
+import { TokenMiddleware } from '../../../common/interceptors/auth-token.middleware';
+import { RequestContext } from '../../../common/utils/request-context.util';
 
 describe('JobsDiscoveryController', () => {
   let controller: JobsDiscoveryController;
@@ -41,6 +43,7 @@ describe('JobsDiscoveryController', () => {
               ),
           },
         },
+        RequestContext,
       ],
     })
       .overrideProvider(JobsDiscoveryService)
@@ -75,4 +78,27 @@ describe('JobsDiscoveryController', () => {
       );
     });
   });
+  describe('TokenMiddleware', () => {
+    let middleware: TokenMiddleware;
+    let requestContext: RequestContext;
+
+    beforeEach(() => {
+      requestContext = new RequestContext();
+      middleware = new TokenMiddleware(requestContext);
+    });
+
+    it('should set token in requestContext', () => {
+      const mockReq = {
+        headers: {
+          authorization: 'Bearer token',
+        },
+      };
+
+      const next = jest.fn();
+      middleware.use(mockReq, {}, next);
+
+      expect(requestContext.token).toEqual('Bearer token');
+      expect(next).toHaveBeenCalled();
+    });
+  });
 });