Merge branch 'feature/63/upgrade-dependencies' into...

Merge branch 'feature/63/upgrade-dependencies' into dependabot/npm_and_yarn/cacheable-request-and-got-10.2.7

build/Jenkinsfile

 node() {
-    properties([
-        parameters([
-            string(name: 'docker_repo', defaultValue: 'user-service', description: 'Docker Image Name'),
-            string(name: 'docker_server', defaultValue: 'localhost:5000', description: 'Docker Registry URL'),
+    withCredentials([string(credentialsId: 'docker_server', variable: 'docker_server')]) {
+        properties([
+            parameters([
+                string(name: 'docker_repo', defaultValue: 'samagragovernance/esamwad-user-service', description: 'Docker Image Name'),
+                string(name: 'docker_server', defaultValue: "$docker_server", description: 'Docker Registry URL'),
 
+            ])
         ])
-    ])
+    }
     stage('Checkout') {
             cleanWs()
             checkout scm
-            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-            env.commit_id = sh(script: 'echo ' + env.docker_repo + '_' + commit_hash + '_' + env.BRANCH_NAME, returnStdout: true).trim()
+            env.commit_id = env.BRANCH_NAME
             echo "${env.commit_id}"
     }
 
     stage('docker-build') {
+        sh '''
+        docker build -f build/Dockerfile -t $docker_server/$docker_repo:$commit_id .
+        '''
+        if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') {
             sh '''
-                docker build  -f build/Dockerfile -t $docker_server/$docker_repo:$commit_id .
-                '''
+            docker build -f build/Dockerfile -t $docker_server/$docker_repo:latest .
+            '''
+        }
     }
 
     stage('docker-push') {
         sh '''
-                docker push $docker_server/$docker_repo:$commit_id
-                '''
-    }
-    stage('ArchiveArtifacts') {
-        sh("echo ${commit_id} > commit_id.txt")
-                archiveArtifacts 'commit_id.txt'
-                currentBuild.description = "${commit_id}"
+        docker push $docker_server/$docker_repo:$commit_id
+        '''
+        if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') {
+            sh '''
+            docker push $docker_server/$docker_repo:latest
+            '''
+        }
     }
-}
\ No newline at end of file
+}

package.json

@@ -31,9 +31,9 @@
     "@nestjs/common": "^8.0.0",
     "@nestjs/config": "^1.0.1",
     "@nestjs/core": "^8.0.0",
-    "@nestjs/jwt": "^8.0.0",
+    "@nestjs/jwt": "^10.0.1",
     "@nestjs/passport": "^8.2.1",
-    "@nestjs/platform-express": "^8.0.0",
+    "@nestjs/platform-express": "^8.4.7",
     "@nestjs/swagger": "^5.0.9",
     "@nestjs/terminus": "^9.1.4",
     "@nestjs/throttler": "^2.0.1",
@@ -43,7 +43,7 @@
     "got": "^12.5.3",
     "passport": "^0.5.2",
     "passport-http": "^0.3.0",
-    "passport-jwt": "^4.0.0",
+    "passport-jwt": "^4.0.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",

src/api/api.controller.ts

@@ -7,7 +7,7 @@ import {
   Param,
   Patch,
   Post,
-  Query,
+  Query, UnprocessableEntityException,
 } from '@nestjs/common';
 import {
   SignupResponse,
@@ -44,7 +44,24 @@ export class ApiController {
   }
 
   @Get('sendOTP')
-  async sendOTP(@Query('phone') phone): Promise<any> {
+  async sendOTP(
+    @Query('phone') phone,
+    @Query('errorMessage') errorMessage = 'User not found.',
+    @Headers('x-application-id') applicationId?,
+  ): Promise<any> {
+    if (applicationId) {
+      const { total }: { total: number; users: Array<User> } =
+        await this.fusionAuthService.getUsersByString(
+          `(username: ${phone}, mobilePhone: ${phone})`,
+          0,
+          1,
+          applicationId,
+          null,
+        );
+      if (!total || total == 0) {
+        throw new UnprocessableEntityException(errorMessage);
+      }
+    }
     const status: SMSResponse = await this.otpService.sendOTP(phone);
     return { status };
   }