From 8fbd8cad3223ec2e50141d795773fd422455a15f Mon Sep 17 00:00:00 2001
From: Mritunjay Kumar <mritunjaykumar@Mac-C02G429HMD6R.local>
Date: Thu, 24 Aug 2023 17:06:25 +0530
Subject: [PATCH] fix: error codes and messages

---
 common-libs/common/test/unit/Affinity.test.ts   | 2 +-
 common-libs/tools-common/src/SdkError.ts        | 2 +-
 sdk/core/src/services/HolderService.ts          | 6 +++---
 sdk/core/test/integration/NetworkMember.test.ts | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common-libs/common/test/unit/Affinity.test.ts b/common-libs/common/test/unit/Affinity.test.ts
index 933f8985..7ac80c63 100644
--- a/common-libs/common/test/unit/Affinity.test.ts
+++ b/common-libs/common/test/unit/Affinity.test.ts
@@ -298,7 +298,7 @@ describe('Affinity', () => {
     }
 
     expect(expiredTokenError).to.be.not.undefined
-    expect(expiredTokenError.message).to.be.equal('Token expired')
+    expect(expiredTokenError.message).to.be.equal('Token expired or invalid expiration')
   })
 
   it('#validateJWT (When initial token do not match)', async () => {
diff --git a/common-libs/tools-common/src/SdkError.ts b/common-libs/tools-common/src/SdkError.ts
index 4bc19068..a2ea0b2a 100644
--- a/common-libs/tools-common/src/SdkError.ts
+++ b/common-libs/tools-common/src/SdkError.ts
@@ -178,7 +178,7 @@ export const commonErrors = {
   },
   'COR-19': {
     type: 'OperationError',
-    message: 'Token expired',
+    message: 'Token expired or invalid expiration',
     httpStatusCode: 400,
   },
   'COR-20': {
diff --git a/sdk/core/src/services/HolderService.ts b/sdk/core/src/services/HolderService.ts
index 10d06ee5..89f0dff8 100644
--- a/sdk/core/src/services/HolderService.ts
+++ b/sdk/core/src/services/HolderService.ts
@@ -171,7 +171,7 @@ export default class HolderService {
     try {
       await this._affinityService.validateJWT(credentialShareResponseToken, credentialShareRequestToken, didDocument)
     } catch (error) {
-      if (error.message === 'Token expired') {
+      if (error.message === 'Token expired or invalid expiration') {
         throw new SdkErrorFromCode('COR-19')
       }
 
@@ -242,14 +242,14 @@ export default class HolderService {
     }
 
     if (payload.exp < Date.now()) {
-      throw new Error('Token expired')
+      throw new Error('Token expired or invalid expiration')
     }
   }
   async verifyCredentialOfferRequest(credentialOfferRequestToken: string) {
     try {
       await this._affinityService.validateJWT(credentialOfferRequestToken)
     } catch (error) {
-      if (error.message === 'Token expired') {
+      if (error.message === 'Token expired or invalid expiration') {
         return { isValid: false, errorCode: 'COR-19', error: error.message }
       }
 
diff --git a/sdk/core/test/integration/NetworkMember.test.ts b/sdk/core/test/integration/NetworkMember.test.ts
index c2697fcb..410caf76 100644
--- a/sdk/core/test/integration/NetworkMember.test.ts
+++ b/sdk/core/test/integration/NetworkMember.test.ts
@@ -703,7 +703,7 @@ describe('CommonNetworkMember', () => {
     const { code, httpStatusCode, message } = responseError
 
     expect(code).to.equal('COR-19')
-    expect(message).to.equal('Token expired')
+    expect(message).to.equal('Token expired or invalid expiration')
     expect(httpStatusCode).to.equal(400)
   })