De

.github/workflows/deploy-main.yml

@@ -24,4 +24,4 @@ jobs:
       - name: Delete old container
         run: docker rm -f zuttoo-backend-container
       - name: Run docker container
-        run: docker run -d -p 8000:8000 -name zuttoo-backend-container prajna1999/zuttoo-backend
+        run: docker run -d -p 8000:8000 --name zuttoo-backend-container prajna1999/zuttoo-backend

jest.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    coverageDirectory: 'coverage',
+    collectCoverageFrom: ['src/**/*.ts'],
+    globals: {
+        'ts-jest': {
+            tsconfig: 'tsconfig.json',
+        },
+    },
+};

package.json

@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "^3.569.0",
-    "@aws-sdk/client-s3": "^3.588.0",
     "@aws-sdk/client-sesv2": "^3.569.0",
+    "@aws-sdk/client-textract": "^3.600.0",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.2.2",
     "@nestjs/core": "^10.0.0",
@@ -44,6 +44,7 @@
     "@nestjs/typeorm": "^10.0.2",
     "aws-jwt-verify": "^4.0.1",
     "aws-sdk": "^2.1613.0",
+    "braces": "^3.0.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "config": "^3.3.11",
@@ -63,22 +64,27 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
+    "@aws-sdk/client-s3": "^3.598.0",
+    "@aws-sdk/s3-request-presigner": "^3.598.0",
     "@nestjs/cli": "^10.0.0",
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
+    "@sap-cloud-sdk/generator": "^3.16.0",
+    "@sap-cloud-sdk/openapi-generator": "^3.16.0",
     "@swc/cli": "^0.3.12",
     "@swc/core": "^1.4.13",
     "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.2",
+    "@types/jest": "^29.5.12",
     "@types/multer": "^1.4.11",
     "@types/node": "^20.3.1",
+    "@types/passport-jwt": "^4.0.1",
     "@types/supertest": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.5.0",
+    "jest": "^29.7.0",
     "prettier": "^3.2.5",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.3",

service-specifications/options-per-service.json

@@ -0,0 +1,7 @@
+{
+    "service-specifications/API_BUSINESS_PARTNER.edmx": {
+        "packageName": "business-partner-service",
+        "directoryName": "business-partner-service",
+        "basePath": "/sap/opu/odata/sap/API_BUSINESS_PARTNER"
+    }
+}

src/addresses/entities/address.entity.ts

@@ -1,3 +1,4 @@
+import { Client } from 'src/clients/entities/client.entity';
 import { DefaultEntity } from '../../common/default.entity';
 import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, OneToOne, JoinColumn, OneToMany } from 'typeorm';
 
@@ -6,20 +7,25 @@ export class Address extends DefaultEntity {
 
 
   @Column()
-  address1: string;
-
-  @Column()
-  address2: string;
+  address: string;
 
   @Column()
   city: string;
 
   @Column()
   state: string;
 
+  @Column({
+    nullable:true
+  })
+  postalCode: string;
+
   @Column()
   country: string;
 
-  @Column()
-  postalCode: number;
+  @OneToOne(() => Client, (client)=>client.address)
+  @JoinColumn()
+  client: typeof Client;
+
+
 }

src/app.module.ts

@@ -10,10 +10,18 @@ import { SuppliersModule } from './suppliers/suppliers.module';
 import { OemsModule } from './oems/oems.module';
 import { AddressesModule } from './addresses/addresses.module';
 import { AuthModule } from './auth/auth.module';
+import { AuthGuard } from './auth/auth.guard';
+import { APP_GUARD } from '@nestjs/core';
 import { MailModule } from './Mail/Mail.module';
 import { OrdersModule } from './orders/orders.module';
 import { ProductModule } from './product/product.module';
 import { SupplyChainIssueModule } from './supplychain-issue/supplychain-issue.module';
+import { QualityAssuranceModule } from './quality-assurance/quality-assurance.module';
+import { S3Service } from './s3-service/s3-service';
+import { OptimaintainModule } from './optimaintain/optimaintain.module';
+
+import { SapService } from './sap/sap.service';
+
 
 
 @Module({
@@ -30,6 +38,8 @@ import { SupplyChainIssueModule } from './supplychain-issue/supplychain-issue.mo
     OemsModule,
     ProductModule,
     SupplyChainIssueModule,
+    QualityAssuranceModule,
+    OptimaintainModule,
 
   ],
   controllers: [AppController],

src/app.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@nestjs/common';
-
 @Injectable()
 export class AppService {
   getHello(): string {

src/auth/README.md

@@ -4,3 +4,5 @@
 4. User should be able to forget password.
 5. User details with extra metadata to be stores in a RDS.
 6. User details should be stored in neondb
+
+

src/auth/auth.controller.ts

@@ -1,7 +1,8 @@
-import { Controller, Post, Body, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Controller, Post, Body, UsePipes, ValidationPipe,Headers, Request, Req } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { CreateUserDto } from '../users/dto/create-user.dto';
 
+
 @Controller('auth')
 export class AuthController {
   constructor(private readonly authService: AuthService) {}
@@ -37,4 +38,23 @@ export class AuthController {
   ){
     return this.authService.confirmPasswordResetCode(confirmCodeDto.email, confirmCodeDto.code, confirmCodeDto.newPassword);
   }
+
+  @Post('verify-jwt')
+  async verifyJwt(@Body('token') token:string , @Body('intent') intent:string){
+    return await this.authService.verifyJwt(token,intent);
+  }
+
+  @Post('refresh-access-token')
+  async refreshAccessToken(
+    @Body('refreshToken') refreshToken:string,
+    @Body('accessToken') accessToken:string
+  ){
+    return await this.authService.refreshAccessToken(refreshToken,accessToken);
+  }
+  @Post('logout')
+  async logout(@Headers('refresh-token') refreshToken: string,
+                @Req() req:Request) {
+    console.log(req.headers);
+    return this.authService.logout(refreshToken);
+  }
 }

src/auth/auth.guard.ts

@@ -0,0 +1,29 @@
+import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from "@nestjs/common";
+import { AuthService } from "./auth.service";
+
+@Injectable()
+export class AuthGuard implements CanActivate{
+    constructor(private authService:AuthService){}
+
+    async canActivate(context:ExecutionContext):Promise<boolean>{
+        const request=context.switchToHttp().getRequest();
+        const authHeader=request.headers.authorization;
+
+        if(!authHeader){
+            throw new UnauthorizedException('No authorization header provided');
+        }
+
+        const [bearer, token]=authHeader.split(' ');
+        if(bearer !=='Bearer' || !token){
+            throw new UnauthorizedException('Invalid authorization header format');
+
+        }
+        try{
+            const payload=await this.authService.verifyJwt(token, 'ACCESS');
+            request['user']=payload;
+            return true;
+        }catch(error){
+            throw new UnauthorizedException('Invalid Exception');
+        }
+    }
+}

src/auth/auth.module.ts

@@ -2,9 +2,13 @@ import { Module } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { UsersModule } from '../users/users.module';
+import { PassportModule } from '@nestjs/passport';
+import { JwtStrategy } from './strategies/jwt.strategy';
+
 @Module({
-  imports:[UsersModule],
+  imports:[UsersModule, PassportModule.register({defaultStrategy:'jwt'})],
   controllers: [AuthController],
-  providers: [AuthService],
+  providers: [AuthService,JwtStrategy],
+  exports:[AuthService]
 })
 export class AuthModule {}

src/auth/auth.service.ts

@@ -18,8 +18,12 @@ import {
   ConfirmForgotPasswordCommandInput,
   ConfirmForgotPasswordCommand,
   ConfirmForgotPasswordCommandOutput,
-  AdminInitiateAuthCommandOutput
+  AdminInitiateAuthCommandOutput,
+  RevokeTokenCommandInput,
+  RevokeTokenCommand
 } from '@aws-sdk/client-cognito-identity-provider';
+import { AuthGuard } from '@nestjs/passport'
+import { CognitoJwtVerifier } from "aws-jwt-verify";
 import { createHmac, privateDecrypt } from 'crypto';
 import { UsersService } from '../users/users.service';
 import { InjectRepository } from '@nestjs/typeorm';
@@ -35,8 +39,6 @@ const { accessKey, secretKey, region } = config.get('awsConfig');
 @Injectable()
 export class AuthService {
   private cognitoClient: CognitoIdentityProviderClient;
-
-
   constructor( 
     private usersService: UsersService,
     @InjectRepository(User) private userRepository:Repository<User>
@@ -47,6 +49,8 @@ export class AuthService {
         accessKeyId: accessKey,
         secretAccessKey: secretKey,
       },
+
+
     });
 
   }
@@ -121,7 +125,6 @@ export class AuthService {
     try {
       const command = new AdminInitiateAuthCommand(params);
       const response = await this.cognitoClient.send(command);
-      console.log(response);
       return {
         message:"Login Sucessful",
         data:response
@@ -240,26 +243,26 @@ export class AuthService {
     }
   }
 
-  async refreshAccessToken(refreshToken:string, idToken:string):Promise<{message:'Successfully generate access token'; accessToken:string; idToken:string; refreshToken:string}>{
-    const email=this.getEmailFromIdToken(idToken);
-    const secretHash=this.calculateSecretHash(email);
+  async refreshAccessToken(refreshToken:string, accessToken:string):Promise<{message:'Successfully generate access token'; accessToken:string; idToken:string; refreshToken:string}>{
+    const decryptedPayload=await this.verifyJwt(accessToken,"ACCESS");
+    const secretHash=this.calculateSecretHash(decryptedPayload.sub);
     const params:AdminInitiateAuthCommandInput={
       UserPoolId:cognitoUserPoolId,
       ClientId:cognitoClientId,
       AuthFlow:'REFRESH_TOKEN_AUTH',
       AuthParameters:{
         REFRESH_TOKEN: refreshToken,
-        SECRET_HASH: secretHash,
+        SECRET_HASH: secretHash,  
       },
     };
     const command=new AdminInitiateAuthCommand(params);
 
+
     try{
-      const response:AdminInitiateAuthCommandOutput=await this.cognitoClient.send(command);
-
+      const response=await this.cognitoClient.send(command);
       const {AuthenticationResult}=response;
       if(!AuthenticationResult){
-        throw new Error('Failed to refresh access token')
+        throw new Error('New Access Tokens and Id tokens could not be generated.')
       };
 
       return{
@@ -273,17 +276,7 @@ export class AuthService {
     }
   }
 
-  getEmailFromIdToken(idToken:string): string{
-    if(!idToken){
-      throw new Error('ID Token missing');
-    }
-    const decoded=jwt.decode(idToken) as {email?:string};
 
-    if(!decoded || !decoded.email){
-      throw new Error('Email not found in ID Token');
-    }
-    return decoded.email;
-  }
   private async updateUserAttributes(userId:string, attributes: {[key:string]: string}):Promise <any>{
     const params:AdminUpdateUserAttributesCommandInput={
       UserPoolId:cognitoUserPoolId,
@@ -323,4 +316,49 @@ export class AuthService {
     } 
 
   }
+
+  async logout(refreshToken:string):Promise<{message:string}>{
+    try{
+      // await this.verifyJwt(accessToken, 'ACCESS');
+
+      const params:RevokeTokenCommandInput={
+        Token:refreshToken,
+        ClientId:cognitoClientId,
+        ClientSecret:cognitoClientSecret,
+      }
+      const command=new RevokeTokenCommand(params);
+      await this.cognitoClient.send(command);
+      return {
+        message:'Logout Successful'
+      }
+
+    }catch(error){
+      throw new BadRequestException('Failed to Logout');
+    }
+  }
+
+  async verifyJwt(jwtToken:string, intent:string):Promise<any>{
+
+    let tokenUseIntent:any;
+    if(intent==="ID"){
+      tokenUseIntent='id'
+    }else if(intent==="ACCESS"){
+      tokenUseIntent='access'
+    }
+    const verifier=CognitoJwtVerifier.create({
+      userPoolId:cognitoUserPoolId,
+      tokenUse:tokenUseIntent,
+      clientId:cognitoClientId
+    });
+
+    try{
+      const payload=await verifier.verify(jwtToken);
+
+      return payload
+
+    }catch(error){
+      console.log("Token not valid");
+      throw new BadRequestException("Token Not Valid");
+    }
+  }
 }

src/auth/guards/jwt-auth.guard.ts

@@ -0,0 +1,5 @@
+import { Injectable } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+@Injectable()
+export class JwtGuard extends AuthGuard('jwt') {}