Merge pull request #1412 from credebl/develop

Sync develop with qa

Author: sujitaw

apps/agent-service/src/agent-service.service.ts

@@ -105,7 +105,7 @@ export class AgentServiceService {
       const agentDetails = await this.agentServiceRepository.getAgentDetailsByOrgId(orgId);
       return agentDetails;
     } catch (error) {
-      this.logger.error(`in getAgentDetails::: ${JSON.stringify(error)}`);
+      this.logger.error(`in getAgentDetails ::: ${JSON.stringify(error)}`);
       throw new RpcException(error.response ?? error);
     }
   }
@@ -1568,7 +1568,7 @@ export class AgentServiceService {
           description: ResponseMessages.errorMessages.notFound
         });
       }
-      const url = getAgentUrl(orgAgentDetails.agentEndPoint, CommonConstants.SIGN_DATA_FROM_AGENT);
+      const url = await getAgentUrl(orgAgentDetails.agentEndPoint, CommonConstants.SIGN_DATA_FROM_AGENT);
 
       const { dataTypeToSign, credentialPayload, rawPayload, storeCredential } = data;
 
@@ -1628,7 +1628,7 @@ export class AgentServiceService {
           description: ResponseMessages.errorMessages.notFound
         });
       }
-      const url = getAgentUrl(orgAgentDetails.agentEndPoint, CommonConstants.VERIFY_SIGNED_DATA_FROM_AGENT);
+      const url = await getAgentUrl(orgAgentDetails.agentEndPoint, CommonConstants.VERIFY_SIGNED_DATA_FROM_AGENT);
 
       // Invoke an API request from the agent to assess its current status
       const signedDataFromAgent = await this.commonService

apps/user/src/user.service.ts

@@ -449,22 +449,20 @@ export class UserService {
     try {
       this.validateEmail(email.toLowerCase());
       const userData = await this.userRepository.checkUserExist(email.toLowerCase());
-      const userSessionDetails = await this.userRepository.fetchUserSessions(userData?.id);
-      if (Number(process.env.SESSIONS_LIMIT) <= userSessionDetails?.length) {
-        throw new BadRequestException(ResponseMessages.user.error.sessionLimitReached);
-      }
-
       if (!userData) {
         throw new NotFoundException(ResponseMessages.user.error.notFound);
       }
-
       if (userData && !userData.isEmailVerified) {
         throw new BadRequestException(ResponseMessages.user.error.verifyMail);
       }
 
       if (true === isPasskey && false === userData?.isFidoVerified) {
         throw new UnauthorizedException(ResponseMessages.user.error.registerFido);
       }
+      const userSessionDetails = await this.userRepository.fetchUserSessions(userData?.id);
+      if (Number(process.env.SESSIONS_LIMIT) <= userSessionDetails?.length) {
+        throw new BadRequestException(ResponseMessages.user.error.sessionLimitReached);
+      }
       let tokenDetails;
       if (true === isPasskey && userData?.username && true === userData?.isFidoVerified) {
         const getUserDetails = await this.userRepository.getUserDetails(userData.email.toLowerCase());

libs/common/src/common.constant.ts

@@ -111,7 +111,7 @@ export enum CommonConstants {
   URL_AGENT_GET_ENDPOINT = '/agent',
 
   // sign data from agent
-  URL_AGENT_SIGN_DATA = '/agent/credential/sign/#',
+  URL_AGENT_SIGN_DATA = '/agent/credential/sign',
   URL_AGENT_VERIFY_SIGNED_DATA = '/agent/credential/verify',
 
   // CREATE KEYS