Merge pull request #1426 from credebl/develop

Sync Develop branch into qa

Author: shitrerohit

apps/issuance/src/issuance.repository.ts

@@ -9,27 +9,27 @@ import {
   PreviewRequest,
   SchemaDetails
 } from '../interfaces/issuance.interfaces';
-import { PrismaTables, SortValue } from '@credebl/enum/enum';
+import { IssueCredentials, IssuedCredentialStatus } from '../enum/issuance.enum';
 // eslint-disable-next-line camelcase
 import {
+  Prisma,
   agent_invitations,
   credentials,
   file_data,
   file_upload,
   org_agents,
   organisation,
   platform_config,
-  Prisma,
   schema
 } from '@prisma/client';
+import { PrismaTables, SortValue } from '@credebl/enum/enum';
 
 import { FileUploadStatus } from 'apps/api-gateway/src/enum';
 import { IDeletedIssuanceRecords } from '@credebl/common/interfaces/issuance.interface';
 import { IIssuedCredentialSearchParams } from 'apps/api-gateway/src/issuance/interfaces';
 import { IUserRequest } from '@credebl/user-request/user-request.interface';
 import { PrismaService } from '@credebl/prisma-service';
 import { ResponseMessages } from '@credebl/common/response-messages';
-import { IssueCredentials, IssuedCredentialStatus } from '../enum/issuance.enum';
 
 @Injectable()
 export class IssuanceRepository {
@@ -164,7 +164,7 @@ export class IssuanceRepository {
           break;
 
         default:
-          stateInfo = null;
+          break;
       }
 
       const issuanceWhereClause: Prisma.credentialsWhereInput = {

apps/user/src/user.service.ts

@@ -770,11 +770,7 @@ export class UserService {
           );
 
           if (userData.keycloakUserId) {
-            keycloakDetails = await this.clientRegistrationService.resetPasswordOfUser(
-              userData,
-              process.env.KEYCLOAK_REALM,
-              token
-            );
+            await this.clientRegistrationService.resetPasswordOfUser(userData, process.env.KEYCLOAK_REALM, token);
             await this.updateFidoVerifiedUser(email.toLowerCase(), userData.isFidoVerified, newPassword);
           } else {
             keycloakDetails = await this.clientRegistrationService.createUser(

apps/verification/src/repositories/verification.repository.ts

@@ -8,7 +8,7 @@ import {
 import { IProofPresentationsListCount, IVerificationRecords } from '@credebl/common/interfaces/verification.interface';
 import { Injectable, Logger, NotFoundException } from '@nestjs/common';
 // eslint-disable-next-line camelcase
-import { agent_invitations, org_agents, organisation, platform_config, presentations, Prisma } from '@prisma/client';
+import { Prisma, agent_invitations, org_agents, organisation, platform_config, presentations } from '@prisma/client';
 
 import { CommonService } from '@credebl/common';
 import { IUserRequest } from '@credebl/user-request/user-request.interface';
@@ -112,7 +112,7 @@ export class VerificationRepository {
           verificationStateInfo = ProofRequest.presentationReceived;
           break;
         default:
-          verificationStateInfo = null;
+          break;
       }
 
       const whereClause: Prisma.presentationsWhereInput = {