Merge pull request #1109 from credebl/develop-dco-fixed

Sync changes from DEV to QA (22/01/2024)

Author: pranalidhanavade

Dockerfiles/Dockerfile.agent-provisioning

@@ -1,6 +1,7 @@
 # Stage 1: Build the application
 FROM node:18-alpine as build
 # Install OpenSSL
+RUN apk update && apk upgrade
 RUN apk add --no-cache openssl
 RUN set -eux \
     && apk --no-cache add \
@@ -37,6 +38,7 @@ RUN pnpm run build agent-provisioning
 # Stage 2: Create the final image
 FROM node:18-alpine as prod
 # Install OpenSSL
+RUN apk update && apk upgrade
 RUN apk add --no-cache openssl
 RUN set -eux \
     && apk --no-cache add \

apps/api-gateway/common/exception-handler.ts

@@ -12,8 +12,6 @@ export class CustomExceptionFilter extends BaseExceptionFilter {
 
     let errorResponse;
     let status = HttpStatus.INTERNAL_SERVER_ERROR;
-    
-    this.logger.error(`exception ::: ${JSON.stringify(exception)}`);
 
     if (!exception || '{}' === JSON.stringify(exception)) {
       errorResponse = {

apps/verification/src/verification.service.ts

@@ -310,10 +310,26 @@ export class VerificationService {
         return getProofPresentationById?.response;
       }
     } catch (error) {
+      // Handle cases where identical attributes are used in both predicates and non-predicates.   
+      // This case is not supported in credo-ts, so we are handling in platform
+      // TODO: Handle all credo-errors globally in platform
+
+    const errorMessage = error?.status?.message?.error?.message; 
+    const match = errorMessage?.match(
+      /CredoError: The proof request contains duplicate predicates and attributes: (.+)/
+    );
+    if (match) {
+      const [, duplicateAttributes] = match;
+      throw new RpcException({
+        message: `CredoError: The proof request contains duplicate attributes: ${duplicateAttributes}`,
+        statusCode: 500
+      });
+    }
+
       this.logger.error(`[sendProofRequest] - error in sending proof request: ${JSON.stringify(error)}`);
       this.verificationErrorHandling(error);
+      }
     }
-  }
 
 
   /**

libs/interceptors/nats.interceptor.ts

@@ -17,7 +17,7 @@ import {
     intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> {
       return next.handle().pipe(
         catchError((error) => {
-          if (error.message.includes(ResponseMessages.nats.error.natsConnect)) {
+          if (error?.message && error?.message.includes(ResponseMessages.nats.error.natsConnect)) {
             this.logger.error(`No subscribers for message: ${error.message}`);
             return throwError(() => new HttpException(ResponseMessages.nats.error.noSubscribers, 500));
           }