added tests for sdjwt utility methods

Signed-off-by: Berend Sliedrecht <[email protected]>
berendsliedrecht · Oct 31, 2023 · 2d711bc · 2d711bc
1 parent 0fa7de4
commit 2d711bc
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 8 deletions.
diff --git a/src/jwt/jwt.ts b/src/jwt/jwt.ts
@@ -149,7 +149,7 @@ export class Jwt<
      *
      */
     public addHeaderClaim(
-        item: keyof Header,
+        item: keyof Header | string,
         value: Header[typeof item] | unknown
     ): ReturnJwtWithHeader<Header, Payload, this> {
         this.header ??= {} as Header
@@ -177,7 +177,7 @@ export class Jwt<
      *
      */
     public addPayloadClaim(
-        item: keyof Payload,
+        item: keyof Payload | string,
         value: Payload[typeof item] | unknown
     ): ReturnJwtWithPayload<Header, Payload, this> {
         this.payload ??= {} as Payload

diff --git a/src/sdJwt/sdJwt.ts b/src/sdJwt/sdJwt.ts
@@ -128,7 +128,7 @@ export class SdJwt<
         return this as ReturnSdJwtWithPayload<Header, Payload, this>
     }
 
-    private addHasherAlgorithmToPayload() {
+    public addHasherAlgorithmToPayload() {
         this.assertHashAndAlgorithm()
 
         this.addPayloadClaim('_sd_alg', this.hasherAndAlgorithm!.algorithm)
@@ -358,12 +358,12 @@ export class SdJwt<
     }
 
     public checkHasher(expectedHasher: HasherAlgorithm | string): boolean {
-        this.assertPayload()
-
         try {
-            this.assertClaimInPayload('_sd_alg', expectedHasher)
+            this.assertPayload()
+            this.assertClaimInPayload('_sd_alg', expectedHasher.toString())
             return true
-        } catch {
+        } catch (e) {
+            console.error(e)
             return false
         }
     }

diff --git a/tests/sdJwt.test.ts b/tests/sdJwt.test.ts
@@ -1,5 +1,11 @@
 import { before, describe, it } from 'node:test'
-import assert, { deepStrictEqual, rejects, strictEqual } from 'node:assert'
+import assert, {
+    deepStrictEqual,
+    doesNotThrow,
+    rejects,
+    strictEqual,
+    throws
+} from 'node:assert'
 
 import {
     hasherAndAlgorithm,
@@ -20,6 +26,67 @@ import {
 describe('sd-jwt', async () => {
     before(prelude)
 
+    describe('utility', () => {
+        it('Check correct hashing algorithm', () => {
+            const sdJwt = new SdJwt({
+                payload: { some: 'payload' }
+            })
+                .withHasher(hasherAndAlgorithm)
+                .addHasherAlgorithmToPayload()
+
+            assert(sdJwt.checkHasher(HasherAlgorithm.Sha256))
+        })
+
+        it('Check incorrect hashing algorithm', () => {
+            const sdJwt = new SdJwt({
+                payload: { some: 'payload' }
+            })
+                .withHasher(hasherAndAlgorithm)
+                .addHasherAlgorithmToPayload()
+
+            assert(!sdJwt.checkHasher(HasherAlgorithm.Sha3_256))
+        })
+    })
+
+    describe('assert in disclosure frame', () => {
+        it('assert claim in disclosure frame', () => {
+            const sdJwt = new SdJwt(
+                { header: { a: 'b' }, payload: { c: 'd' } },
+                { disclosureFrame: { c: true } }
+            )
+
+            doesNotThrow(() => sdJwt.assertClaimInDisclosureFrame('c'))
+        })
+
+        it('assert claims in disclosure frame', () => {
+            const sdJwt = new SdJwt(
+                { header: { a: 'b' }, payload: { c: 'd', e: 'f', g: 'h' } },
+                { disclosureFrame: { c: true, g: true } }
+            )
+
+            doesNotThrow(() => sdJwt.assertClaimInDisclosureFrame('c'))
+            doesNotThrow(() => sdJwt.assertClaimInDisclosureFrame('g'))
+        })
+
+        it('assert claim not in disclosure frame', () => {
+            const sdJwt = new SdJwt(
+                { header: { a: 'b' }, payload: { c: 'd' } },
+                { disclosureFrame: { c: true } }
+            )
+
+            throws(() => sdJwt.assertClaimInDisclosureFrame('z'))
+        })
+
+        it('assert claims not in disclosure frame', () => {
+            const sdJwt = new SdJwt(
+                { header: { a: 'b' }, payload: { c: 'd', e: 'f', g: 'h' } },
+                { disclosureFrame: { c: true, g: true } }
+            )
+
+            throws(() => sdJwt.assertClaimInDisclosureFrame('e'))
+        })
+    })
+
     describe('JWT without selective disclosure', async () => {
         it('should create a simple jwt', async () => {
             const sdJwt = await new SdJwt({