fix: check instance types of record properties (#163)

Signed-off-by: Timo Glastra <[email protected]>
openwallet-foundation · Jan 14, 2021 · cc61c80 · cc61c80
1 parent 026beb9
commit cc61c80
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/lib/modules/CredentialsModule.ts b/src/lib/modules/CredentialsModule.ts
@@ -38,10 +38,12 @@ export class CredentialsModule {
   public async acceptCredential(credential: CredentialRecord) {
     logger.log('acceptCredential credential', credential);
 
-    // FIXME: credential.offer is already CredentialOfferMessage type
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const offer = JsonTransformer.fromJSON(credential.offer, CredentialOfferMessage);
+    // FIXME: transformation should be handled by credential record
+    const offer =
+      credential.offer instanceof CredentialOfferMessage
+        ? credential.offer
+        : JsonTransformer.fromJSON(credential.offer, CredentialOfferMessage);
+
     const [offerAttachment] = offer.attachments;
 
     if (!offerAttachment.data.base64) {

diff --git a/src/lib/protocols/credentials/CredentialService.ts b/src/lib/protocols/credentials/CredentialService.ts
@@ -110,10 +110,11 @@ export class CredentialService extends EventEmitter {
 
     const proverDid = connection.did;
 
-    // FIXME: TypeScript thinks the type of credential.offer is already CredentialOfferMessage, but it still needs to be transformed
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const offer = JsonTransformer.fromJSON(credential.offer, CredentialOfferMessage);
+    // FIXME: transformation should be handled by credential record
+    const offer =
+      credential.offer instanceof CredentialOfferMessage
+        ? credential.offer
+        : JsonTransformer.fromJSON(credential.offer, CredentialOfferMessage);
     const [offerAttachment] = offer.attachments;
 
     if (!offerAttachment.data.base64) {
@@ -190,10 +191,11 @@ export class CredentialService extends EventEmitter {
 
     this.assertState(credential.state, CredentialState.RequestReceived);
 
-    // FIXME: credential.offer is already CredentialOfferMessage type
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const offer = JsonTransformer.fromJSON(credential.offer, CredentialOfferMessage);
+    // FIXME: transformation should be handled by credential record
+    const offer =
+      credential.offer instanceof CredentialOfferMessage
+        ? credential.offer
+        : JsonTransformer.fromJSON(credential.offer, CredentialOfferMessage);
     const [offerAttachment] = offer.attachments;
 
     if (!offerAttachment.data.base64) {