@sphereon/ssi-sdk.data-store 0.29.1-next.106 → 0.29.1-next.174

package/src/__tests__/digitalCredential.store.test.ts

@@ -45,6 +45,8 @@ describe('Database entities tests', (): void => {
       rawDocument: rawCredential,
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
       subjectCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
       credentialRole: CredentialRole.VERIFIER,
@@ -59,6 +61,8 @@ describe('Database entities tests', (): void => {
     const digitalCredential: AddCredentialArgs = {
       rawDocument:
         'eyJhbGciOiJFZERTQSIsInR5cCI6InZjK3NkLWp3dCIsImtpZCI6IiN6Nk1rdHF0WE5HOENEVVk5UHJydG9TdEZ6ZUNuaHBNbWd4WUwxZ2lrY1czQnp2TlcifQ.eyJ2Y3QiOiJJZGVudGl0eUNyZWRlbnRpYWwiLCJmYW1pbHlfbmFtZSI6IkRvZSIsInBob25lX251bWJlciI6IisxLTIwMi01NTUtMDEwMSIsImFkZHJlc3MiOnsic3RyZWV0X2FkZHJlc3MiOiIxMjMgTWFpbiBTdCIsImxvY2FsaXR5IjoiQW55dG93biIsIl9zZCI6WyJOSm5tY3QwQnFCTUUxSmZCbEM2alJRVlJ1ZXZwRU9OaVl3N0E3TUh1SnlRIiwib201Wnp0WkhCLUdkMDBMRzIxQ1ZfeE00RmFFTlNvaWFPWG5UQUpOY3pCNCJdfSwiY25mIjp7Imp3ayI6eyJrdHkiOiJPS1AiLCJjcnYiOiJFZDI1NTE5IiwieCI6Im9FTlZzeE9VaUg1NFg4d0pMYVZraWNDUmswMHdCSVE0c1JnYms1NE44TW8ifX0sImlzcyI6ImRpZDprZXk6ejZNa3RxdFhORzhDRFVZOVBycnRvU3RGemVDbmhwTW1neFlMMWdpa2NXM0J6dk5XIiwiaWF0IjoxNjk4MTUxNTMyLCJfc2RfYWxnIjoic2hhLTI1NiIsIl9zZCI6WyIxQ3VyMmsyQTJvSUI1Q3NoU0lmX0FfS2ctbDI2dV9xS3VXUTc5UDBWZGFzIiwiUjF6VFV2T1lIZ2NlcGowakh5cEdIejlFSHR0VktmdDB5c3diYzlFVFBiVSIsImVEcVFwZFRYSlhiV2hmLUVzSTd6dzVYNk92WW1GTi1VWlFRTWVzWHdLUHciLCJwZERrMl9YQUtIbzdnT0Fmd0YxYjdPZENVVlRpdDJrSkhheFNFQ1E5eGZjIiwicHNhdUtVTldFaTA5bnUzQ2w4OXhLWGdtcFdFTlpsNXV5MU4xbnluX2pNayIsInNOX2dlMHBIWEY2cW1zWW5YMUE5U2R3SjhjaDhhRU5reGJPRHNUNzRZd0kiXX0.coOK8NzJmEWz4qx-qRhjo-RK7aejrSkQM9La9Cw3eWmzcja9DXrkBoQZKbIJtNoSzSPLjwK2V71W78z0miZsDQ~WyJzYWx0IiwiaXNfb3Zlcl82NSIsdHJ1ZV0~WyJzYWx0IiwiaXNfb3Zlcl8yMSIsdHJ1ZV0~WyJzYWx0IiwiZW1haWwiLCJqb2huZG9lQGV4YW1wbGUuY29tIl0~WyJzYWx0IiwiY291bnRyeSIsIlVTIl0~WyJzYWx0IiwiZ2l2ZW5fbmFtZSIsIkpvaG4iXQ~eyJhbGciOiJFZERTQSIsInR5cCI6ImtiK2p3dCJ9.eyJpYXQiOjE2OTgxNTE1MzIsIm5vbmNlIjoic2FsdCIsImF1ZCI6ImRpZDprZXk6elVDNzRWRXFxaEVIUWNndjR6YWdTUGtxRkp4dU5XdW9CUEtqSnVIRVRFVWVITG9TcVd0OTJ2aVNzbWFXank4MnkiLCJfc2RfaGFzaCI6Ii1kTUd4OGZhUnpOQm91a2EwU0R6V2JkS3JYckw1TFVmUlNQTHN2Q2xPMFkifQ.TQQLqc4ZzoKjQfAghAzC_4aaU3KCS8YqzxAJtzT124guzkv9XSHtPN8d3z181_v-ca2ATXjTRoRciozitE6wBA',
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -76,6 +80,8 @@ describe('Database entities tests', (): void => {
     const addCredentialArgs1: AddCredentialArgs = {
       rawDocument:
         'eyJraWQiOiJkaWQ6a2V5Ono2TWtyaGt5M3B1c20yNk1laUZhWFUzbjJuZWtyYW13RlVtZ0dyZUdHa0RWNnpRaiN6Nk1rcmhreTNwdXNtMjZNZWlGYVhVM24ybmVrcmFtd0ZVbWdHcmVHR2tEVjZ6UWoiLCJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vc3BoZXJlb24tb3BlbnNvdXJjZS5naXRodWIuaW8vc3NpLW1vYmlsZS13YWxsZXQvY29udGV4dC9zcGhlcmVvbi13YWxsZXQtaWRlbnRpdHktdjEuanNvbmxkIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJTcGhlcmVvbldhbGxldElkZW50aXR5Q3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiZW1haWxBZGRyZXNzIjoic0BrIn19LCJzdWIiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJqdGkiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJuYmYiOjE3MDg0NDA4MDgsImlzcyI6ImRpZDprZXk6ejZNa3Joa3kzcHVzbTI2TWVpRmFYVTNuMm5la3JhbXdGVW1nR3JlR0drRFY2elFqIn0.G0M84XVAxSmzGY-NQuB9NBofNrINSn6lvxW6761Vlq6ypvYgtc2xNdpiRmw8ryVNfnpzrr4Z5cB1RlrC05rJAw',
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -86,6 +92,8 @@ describe('Database entities tests', (): void => {
     const addCredentialArgs2: AddCredentialArgs = {
       rawDocument:
         'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDkyMTQxNzgsInZjIjp7IkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJHdWVzdENyZWRlbnRpYWwiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsiZmlyc3ROYW1lIjoiUyIsImxhc3ROYW1lIjoiSyIsIkUtbWFpbCI6IiIsInR5cGUiOiJTcGhlcmVvbiBHdWVzdCIsImlkIjoiZGlkOmp3azpleUpoYkdjaU9pSkZVekkxTmtzaUxDSjFjMlVpT2lKemFXY2lMQ0pyZEhraU9pSkZReUlzSW1OeWRpSTZJbk5sWTNBeU5UWnJNU0lzSW5naU9pSldjWGhIZVhWUk5WUTBXVEpzZGpKSFkybE9TaTFEYURCVWFGVm1kVk5RWm0wdFJYVlNZbGRNWlVOM0lpd2llU0k2SW01T1FWQnBiR0V5VDBRNGRXOXBXbk5LVm1aUmFrbDJTMUZUZWxBelFqVlBXbVZSYkVoQ1VUbHliVFFpZlEifX0sIkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJHdWVzdENyZWRlbnRpYWwiXSwiZXhwaXJhdGlvbkRhdGUiOiIyMDI0LTAyLTI5VDEzOjQyOjU4LjgzNVoiLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiRS1tYWlsIjoiIiwidHlwZSI6IlNwaGVyZW9uIEd1ZXN0IiwiaWQiOiJkaWQ6andrOmV5SmhiR2NpT2lKRlV6STFOa3NpTENKMWMyVWlPaUp6YVdjaUxDSnJkSGtpT2lKRlF5SXNJbU55ZGlJNkluTmxZM0F5TlRack1TSXNJbmdpT2lKV2NYaEhlWFZSTlZRMFdUSnNkakpIWTJsT1NpMURhREJVYUZWbWRWTlFabTB0UlhWU1lsZE1aVU4zSWl3aWVTSTZJbTVPUVZCcGJHRXlUMFE0ZFc5cFduTktWbVpSYWtsMlMxRlRlbEF6UWpWUFdtVlJiRWhDVVRseWJUUWlmUSJ9LCJpc3N1ZXIiOiJkaWQ6andrOmV5SmhiR2NpT2lKRlV6STFOaUlzSW5WelpTSTZJbk5wWnlJc0ltdDBlU0k2SWtWRElpd2lZM0oySWpvaVVDMHlOVFlpTENKNElqb2lWRWN5U0RKNE1tUlhXRTR6ZFVOeFduQnhSakY1YzBGUVVWWkVTa1ZPWDBndFEwMTBZbWRxWWkxT1p5SXNJbmtpT2lJNVRUaE9lR1F3VUU0eU1rMDViRkJFZUdSd1JIQnZWRXg2TVRWM1pubGFTbk0yV21oTFNWVktNek00SW4wIiwiaXNzdWFuY2VEYXRlIjoiMjAyNC0wMi0yMlQxMzo0Mjo1OC44MzVaIiwic3ViIjoiZGlkOmp3azpleUpoYkdjaU9pSkZVekkxTmtzaUxDSjFjMlVpT2lKemFXY2lMQ0pyZEhraU9pSkZReUlzSW1OeWRpSTZJbk5sWTNBeU5UWnJNU0lzSW5naU9pSldjWGhIZVhWUk5WUTBXVEpzZGpKSFkybE9TaTFEYURCVWFGVm1kVk5RWm0wdFJYVlNZbGRNWlVOM0lpd2llU0k2SW01T1FWQnBiR0V5VDBRNGRXOXBXbk5LVm1aUmFrbDJTMUZUZWxBelFqVlBXbVZSYkVoQ1VUbHliVFFpZlEiLCJuYmYiOjE3MDg2MDkzNzgsImlzcyI6ImRpZDpqd2s6ZXlKaGJHY2lPaUpGVXpJMU5pSXNJblZ6WlNJNkluTnBaeUlzSW10MGVTSTZJa1ZESWl3aVkzSjJJam9pVUMweU5UWWlMQ0o0SWpvaVZFY3lTREo0TW1SWFdFNHpkVU54V25CeFJqRjVjMEZRVVZaRVNrVk9YMGd0UTAxMFltZHFZaTFPWnlJc0lua2lPaUk1VFRoT2VHUXdVRTR5TWswNWJGQkVlR1J3UkhCdlZFeDZNVFYzWm5sYVNuTTJXbWhMU1ZWS016TTRJbjAifQ.GgLRWHO674wu6QF_xUGbCi_2zDD8jNf_xoWNvH5K605xvBoz6qKx0ndmxLeGQWWUA-4VuAkznf3ROcp9wpgbEw',
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -107,6 +115,8 @@ describe('Database entities tests', (): void => {
     const addCredentialArgs1: AddCredentialArgs = {
       rawDocument:
         'eyJraWQiOiJkaWQ6a2V5Ono2TWtyaGt5M3B1c20yNk1laUZhWFUzbjJuZWtyYW13RlVtZ0dyZUdHa0RWNnpRaiN6Nk1rcmhreTNwdXNtMjZNZWlGYVhVM24ybmVrcmFtd0ZVbWdHcmVHR2tEVjZ6UWoiLCJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vc3BoZXJlb24tb3BlbnNvdXJjZS5naXRodWIuaW8vc3NpLW1vYmlsZS13YWxsZXQvY29udGV4dC9zcGhlcmVvbi13YWxsZXQtaWRlbnRpdHktdjEuanNvbmxkIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJTcGhlcmVvbldhbGxldElkZW50aXR5Q3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiZW1haWxBZGRyZXNzIjoic0BrIn19LCJzdWIiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJqdGkiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJuYmYiOjE3MDg0NDA4MDgsImlzcyI6ImRpZDprZXk6ejZNa3Joa3kzcHVzbTI2TWVpRmFYVTNuMm5la3JhbXdGVW1nR3JlR0drRFY2elFqIn0.G0M84XVAxSmzGY-NQuB9NBofNrINSn6lvxW6761Vlq6ypvYgtc2xNdpiRmw8ryVNfnpzrr4Z5cB1RlrC05rJAw',
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -155,6 +165,8 @@ describe('Database entities tests', (): void => {
     }
     const addCredentialArgs2: AddCredentialArgs = {
       rawDocument: JSON.stringify(sampleVP),
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:example:holder',
       subjectCorrelationType: CredentialCorrelationType.DID,
@@ -165,6 +177,8 @@ describe('Database entities tests', (): void => {
     const addCredentialArgs3: AddCredentialArgs = {
       rawDocument:
         'eyJhbGciOiJFZERTQSIsInR5cCI6InZjK3NkLWp3dCIsImtpZCI6IiN6Nk1rdHF0WE5HOENEVVk5UHJydG9TdEZ6ZUNuaHBNbWd4WUwxZ2lrY1czQnp2TlcifQ.eyJ2Y3QiOiJJZGVudGl0eUNyZWRlbnRpYWwiLCJmYW1pbHlfbmFtZSI6IkRvZSIsInBob25lX251bWJlciI6IisxLTIwMi01NTUtMDEwMSIsImFkZHJlc3MiOnsic3RyZWV0X2FkZHJlc3MiOiIxMjMgTWFpbiBTdCIsImxvY2FsaXR5IjoiQW55dG93biIsIl9zZCI6WyJOSm5tY3QwQnFCTUUxSmZCbEM2alJRVlJ1ZXZwRU9OaVl3N0E3TUh1SnlRIiwib201Wnp0WkhCLUdkMDBMRzIxQ1ZfeE00RmFFTlNvaWFPWG5UQUpOY3pCNCJdfSwiY25mIjp7Imp3ayI6eyJrdHkiOiJPS1AiLCJjcnYiOiJFZDI1NTE5IiwieCI6Im9FTlZzeE9VaUg1NFg4d0pMYVZraWNDUmswMHdCSVE0c1JnYms1NE44TW8ifX0sImlzcyI6ImRpZDprZXk6ejZNa3RxdFhORzhDRFVZOVBycnRvU3RGemVDbmhwTW1neFlMMWdpa2NXM0J6dk5XIiwiaWF0IjoxNjk4MTUxNTMyLCJfc2RfYWxnIjoic2hhLTI1NiIsIl9zZCI6WyIxQ3VyMmsyQTJvSUI1Q3NoU0lmX0FfS2ctbDI2dV9xS3VXUTc5UDBWZGFzIiwiUjF6VFV2T1lIZ2NlcGowakh5cEdIejlFSHR0VktmdDB5c3diYzlFVFBiVSIsImVEcVFwZFRYSlhiV2hmLUVzSTd6dzVYNk92WW1GTi1VWlFRTWVzWHdLUHciLCJwZERrMl9YQUtIbzdnT0Fmd0YxYjdPZENVVlRpdDJrSkhheFNFQ1E5eGZjIiwicHNhdUtVTldFaTA5bnUzQ2w4OXhLWGdtcFdFTlpsNXV5MU4xbnluX2pNayIsInNOX2dlMHBIWEY2cW1zWW5YMUE5U2R3SjhjaDhhRU5reGJPRHNUNzRZd0kiXX0.coOK8NzJmEWz4qx-qRhjo-RK7aejrSkQM9La9Cw3eWmzcja9DXrkBoQZKbIJtNoSzSPLjwK2V71W78z0miZsDQ~WyJzYWx0IiwiaXNfb3Zlcl82NSIsdHJ1ZV0~WyJzYWx0IiwiaXNfb3Zlcl8yMSIsdHJ1ZV0~WyJzYWx0IiwiZW1haWwiLCJqb2huZG9lQGV4YW1wbGUuY29tIl0~WyJzYWx0IiwiY291bnRyeSIsIlVTIl0~WyJzYWx0IiwiZ2l2ZW5fbmFtZSIsIkpvaG4iXQ~eyJhbGciOiJFZERTQSIsInR5cCI6ImtiK2p3dCJ9.eyJpYXQiOjE2OTgxNTE1MzIsIm5vbmNlIjoic2FsdCIsImF1ZCI6ImRpZDprZXk6elVDNzRWRXFxaEVIUWNndjR6YWdTUGtxRkp4dU5XdW9CUEtqSnVIRVRFVWVITG9TcVd0OTJ2aVNzbWFXank4MnkiLCJfc2RfaGFzaCI6Ii1kTUd4OGZhUnpOQm91a2EwU0R6V2JkS3JYckw1TFVmUlNQTHN2Q2xPMFkifQ.TQQLqc4ZzoKjQfAghAzC_4aaU3KCS8YqzxAJtzT124guzkv9XSHtPN8d3z181_v-ca2ATXjTRoRciozitE6wBA',
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -218,6 +232,8 @@ describe('Database entities tests', (): void => {
       'eyJraWQiOiJkaWQ6a2V5Ono2TWtyaGt5M3B1c20yNk1laUZhWFUzbjJuZWtyYW13RlVtZ0dyZUdHa0RWNnpRaiN6Nk1rcmhreTNwdXNtMjZNZWlGYVhVM24ybmVrcmFtd0ZVbWdHcmVHR2tEVjZ6UWoiLCJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vc3BoZXJlb24tb3BlbnNvdXJjZS5naXRodWIuaW8vc3NpLW1vYmlsZS13YWxsZXQvY29udGV4dC9zcGhlcmVvbi13YWxsZXQtaWRlbnRpdHktdjEuanNvbmxkIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJTcGhlcmVvbldhbGxldElkZW50aXR5Q3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiZW1haWxBZGRyZXNzIjoic0BrIn19LCJzdWIiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJqdGkiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJuYmYiOjE3MDg0NDA4MDgsImlzcyI6ImRpZDprZXk6ejZNa3Joa3kzcHVzbTI2TWVpRmFYVTNuMm5la3JhbXdGVW1nR3JlR0drRFY2elFqIn0.G0M84XVAxSmzGY-NQuB9NBofNrINSn6lvxW6761Vlq6ypvYgtc2xNdpiRmw8ryVNfnpzrr4Z5cB1RlrC05rJAw'
     const digitalCredential: AddCredentialArgs = {
       rawDocument: rawCredential,
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -241,6 +257,8 @@ describe('Database entities tests', (): void => {
       'eyJraWQiOiJkaWQ6a2V5Ono2TWtyaGt5M3B1c20yNk1laUZhWFUzbjJuZWtyYW13RlVtZ0dyZUdHa0RWNnpRaiN6Nk1rcmhreTNwdXNtMjZNZWlGYVhVM24ybmVrcmFtd0ZVbWdHcmVHR2tEVjZ6UWoiLCJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vc3BoZXJlb24tb3BlbnNvdXJjZS5naXRodWIuaW8vc3NpLW1vYmlsZS13YWxsZXQvY29udGV4dC9zcGhlcmVvbi13YWxsZXQtaWRlbnRpdHktdjEuanNvbmxkIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJTcGhlcmVvbldhbGxldElkZW50aXR5Q3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiZW1haWxBZGRyZXNzIjoic0BrIn19LCJzdWIiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJqdGkiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJuYmYiOjE3MDg0NDA4MDgsImlzcyI6ImRpZDprZXk6ejZNa3Joa3kzcHVzbTI2TWVpRmFYVTNuMm5la3JhbXdGVW1nR3JlR0drRFY2elFqIn0.G0M84XVAxSmzGY-NQuB9NBofNrINSn6lvxW6761Vlq6ypvYgtc2xNdpiRmw8ryVNfnpzrr4Z5cB1RlrC05rJAw'
     const digitalCredential: AddCredentialArgs = {
       rawDocument: rawCredential,
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -264,6 +282,8 @@ describe('Database entities tests', (): void => {
       'eyJraWQiOiJkaWQ6a2V5Ono2TWtyaGt5M3B1c20yNk1laUZhWFUzbjJuZWtyYW13RlVtZ0dyZUdHa0RWNnpRaiN6Nk1rcmhreTNwdXNtMjZNZWlGYVhVM24ybmVrcmFtd0ZVbWdHcmVHR2tEVjZ6UWoiLCJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vc3BoZXJlb24tb3BlbnNvdXJjZS5naXRodWIuaW8vc3NpLW1vYmlsZS13YWxsZXQvY29udGV4dC9zcGhlcmVvbi13YWxsZXQtaWRlbnRpdHktdjEuanNvbmxkIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJTcGhlcmVvbldhbGxldElkZW50aXR5Q3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiZW1haWxBZGRyZXNzIjoic0BrIn19LCJzdWIiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJqdGkiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJuYmYiOjE3MDg0NDA4MDgsImlzcyI6ImRpZDprZXk6ejZNa3Joa3kzcHVzbTI2TWVpRmFYVTNuMm5la3JhbXdGVW1nR3JlR0drRFY2elFqIn0.G0M84XVAxSmzGY-NQuB9NBofNrINSn6lvxW6761Vlq6ypvYgtc2xNdpiRmw8ryVNfnpzrr4Z5cB1RlrC05rJAw'
     const digitalCredential: AddCredentialArgs = {
       rawDocument: rawCredential,
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',
@@ -287,6 +307,8 @@ describe('Database entities tests', (): void => {
       'eyJraWQiOiJkaWQ6a2V5Ono2TWtyaGt5M3B1c20yNk1laUZhWFUzbjJuZWtyYW13RlVtZ0dyZUdHa0RWNnpRaiN6Nk1rcmhreTNwdXNtMjZNZWlGYVhVM24ybmVrcmFtd0ZVbWdHcmVHR2tEVjZ6UWoiLCJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vc3BoZXJlb24tb3BlbnNvdXJjZS5naXRodWIuaW8vc3NpLW1vYmlsZS13YWxsZXQvY29udGV4dC9zcGhlcmVvbi13YWxsZXQtaWRlbnRpdHktdjEuanNvbmxkIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJTcGhlcmVvbldhbGxldElkZW50aXR5Q3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJmaXJzdE5hbWUiOiJTIiwibGFzdE5hbWUiOiJLIiwiZW1haWxBZGRyZXNzIjoic0BrIn19LCJzdWIiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJqdGkiOiJ1cm46dXVpZDpkZGE3YmYyNC04ZTdhLTQxZjgtYjY2Yy1hNDhkYmM1YjEwZmEiLCJuYmYiOjE3MDg0NDA4MDgsImlzcyI6ImRpZDprZXk6ejZNa3Joa3kzcHVzbTI2TWVpRmFYVTNuMm5la3JhbXdGVW1nR3JlR0drRFY2elFqIn0.G0M84XVAxSmzGY-NQuB9NBofNrINSn6lvxW6761Vlq6ypvYgtc2xNdpiRmw8ryVNfnpzrr4Z5cB1RlrC05rJAw'
     const digitalCredential: AddCredentialArgs = {
       rawDocument: rawCredential,
+      kmsKeyRef: 'testRef',
+      identifierMethod: 'did',
       issuerCorrelationType: CredentialCorrelationType.DID,
       subjectCorrelationType: CredentialCorrelationType.DID,
       issuerCorrelationId: 'did:key:z6Mkrhky3pusm26MeiFaXU3n2nekramwFUmgGreGGkDV6zQj',

package/src/digitalCredential/DigitalCredentialStore.ts

@@ -1,14 +1,15 @@
 import { AbstractDigitalCredentialStore } from './AbstractDigitalCredentialStore'
 import {
   AddCredentialArgs,
+  CredentialRole,
+  CredentialStateType,
+  DigitalCredential,
   GetCredentialArgs,
   GetCredentialsArgs,
   GetCredentialsResponse,
+  NonPersistedDigitalCredential,
   RemoveCredentialArgs,
   UpdateCredentialStateArgs,
-  CredentialStateType,
-  DigitalCredential,
-  NonPersistedDigitalCredential,
 } from '../types'
 import { OrPromise } from '@sphereon/ssi-types'
 import { DataSource, FindOptionsOrder, Repository } from 'typeorm'
@@ -26,6 +27,7 @@ const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:credential-store')
 
 export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
   private readonly dbConnection: OrPromise<DataSource>
+  private dcRepo: Repository<DigitalCredentialEntity> | undefined
 
   constructor(dbConnection: OrPromise<DataSource>) {
     super()
@@ -34,14 +36,19 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
 
   addCredential = async (args: AddCredentialArgs): Promise<DigitalCredential> => {
     debug('Adding credential', args)
-    const digitalCredentialEntityRepository: Repository<DigitalCredentialEntity> = (await this.dbConnection).getRepository(DigitalCredentialEntity)
     const credentialEntity: NonPersistedDigitalCredential = nonPersistedDigitalCredentialEntityFromAddArgs(args)
-    const createdResult: DigitalCredentialEntity = await digitalCredentialEntityRepository.save(credentialEntity)
+    const validationError = this.assertValidDigitalCredential(credentialEntity)
+    if (validationError) {
+      return Promise.reject(validationError)
+    }
+    const dcRepo = await this.getRepository()
+    const createdResult: DigitalCredentialEntity = await dcRepo.save(credentialEntity)
     return Promise.resolve(digitalCredentialFrom(createdResult))
   }
 
   getCredential = async (args: GetCredentialArgs): Promise<DigitalCredential> => {
-    const result: DigitalCredentialEntity | null = await (await this.dbConnection).getRepository(DigitalCredentialEntity).findOne({
+    const dcRepo = await this.getRepository()
+    const result: DigitalCredentialEntity | null = await dcRepo.findOne({
       where: args,
     })
 
@@ -57,7 +64,8 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
       order && typeof order === 'string'
         ? parseAndValidateOrderOptions<DigitalCredentialEntity>(order)
         : <FindOptionsOrder<DigitalCredentialEntity>>order
-    const [result, total] = await (await this.dbConnection).getRepository(DigitalCredentialEntity).findAndCount({
+    const dcRepo = await this.getRepository()
+    const [result, total] = await dcRepo.findAndCount({
       where: filter,
       skip: offset,
       take: limit,
@@ -84,15 +92,42 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
       return false
     }
     try {
-      const connection = await this.dbConnection
-      const result = await connection.getRepository(DigitalCredentialEntity).delete(query)
-      return result.affected === 1
+      const dcRepo = await this.getRepository()
+      // TODO create a flag whether we want to delete recursively or return an error when there are child credentials?
+      const affected = await this.deleteTree(dcRepo, query)
+      return affected > 0
     } catch (error) {
       console.error('Error removing digital credential:', error)
       return false
     }
   }
 
+  private async deleteTree(dcRepo: Repository<DigitalCredentialEntity>, query: FindOptionsWhere<DigitalCredentialEntity>): Promise<number> {
+    let affected: number = 0
+    const findResult = await dcRepo.findBy(query)
+    for (const dc of findResult) {
+      if (dc.parentId !== null && dc.parentId !== undefined) {
+        affected += await this.deleteTree(dcRepo, { id: dc.parentId })
+      }
+      const result = await dcRepo.delete(dc.id)
+      if (result.affected) {
+        affected += result.affected
+      }
+    }
+    return affected
+  }
+
+  private async getRepository(): Promise<Repository<DigitalCredentialEntity>> {
+    if (this.dcRepo !== undefined) {
+      return Promise.resolve(this.dcRepo)
+    }
+    this.dcRepo = (await this.dbConnection).getRepository(DigitalCredentialEntity)
+    if (this.dcRepo === undefined) {
+      return Promise.reject(Error('Could not get DigitalCredentialEntity repository'))
+    }
+    return this.dcRepo
+  }
+
   updateCredentialState = async (args: UpdateCredentialStateArgs): Promise<DigitalCredential> => {
     const credentialRepository: Repository<DigitalCredentialEntity> = (await this.dbConnection).getRepository(DigitalCredentialEntity)
     const whereClause: Record<string, any> = {}
@@ -123,6 +158,7 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
       ...credential,
       ...(args.verifiedState !== CredentialStateType.REVOKED && { verifiedAt: args.verifiedAt }),
       ...(args.verifiedState === CredentialStateType.REVOKED && { revokedAt: args.revokedAt }),
+      identifierMethod: credential.identifierMethod,
       lastUpdatedAt: new Date(),
       verifiedState: args.verifiedState,
     }
@@ -130,4 +166,24 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
     const updatedResult: DigitalCredentialEntity = await credentialRepository.save(updatedCredential, { transaction: true })
     return digitalCredentialFrom(updatedResult)
   }
+
+  private assertValidDigitalCredential(credentialEntity: NonPersistedDigitalCredential): Error | undefined {
+    const { kmsKeyRef, identifierMethod, credentialRole, isIssuerSigned } = credentialEntity
+
+    const isRoleInvalid = credentialRole === CredentialRole.ISSUER || (credentialRole === CredentialRole.HOLDER && !isIssuerSigned)
+
+    if (isRoleInvalid && (!kmsKeyRef || !identifierMethod)) {
+      const missingFields = []
+
+      if (!kmsKeyRef) missingFields.push('kmsKeyRef')
+      if (!identifierMethod) missingFields.push('identifierMethod')
+
+      const fields = missingFields.join(' and ')
+      return new Error(
+        `DigitalCredential field(s) ${fields} is/are required for credential role ${credentialRole} with isIssuerSigned=${isIssuerSigned}.`,
+      )
+    }
+
+    return undefined
+  }
 }

package/src/entities/digitalCredential/DigitalCredentialEntity.ts

@@ -6,6 +6,7 @@ import {
   CredentialStateType,
   DigitalCredential,
   DocumentType,
+  RegulationType,
 } from '../../types'
 import { typeormDate, typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
@@ -14,9 +15,15 @@ export class DigitalCredentialEntity extends BaseEntity implements DigitalCreden
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
+  @Column('text', { name: 'parent_id', nullable: true })
+  parentId?: string
+
   @Column('simple-enum', { name: 'document_type', enum: DocumentType, nullable: false })
   documentType!: DocumentType
 
+  @Column('simple-enum', { name: 'regulation_type', enum: RegulationType, nullable: false })
+  regulationType!: RegulationType
+
   @Column('simple-enum', { name: 'document_format', enum: CredentialDocumentFormat, nullable: false })
   documentFormat!: CredentialDocumentFormat
 
@@ -35,18 +42,33 @@ export class DigitalCredentialEntity extends BaseEntity implements DigitalCreden
   @Column('text', { name: 'hash', nullable: false, unique: true })
   hash!: string
 
+  @Column('text', { name: 'kms_key_ref', nullable: true })
+  kmsKeyRef!: string
+
+  @Column('text', { name: 'identifier_method', nullable: true })
+  identifierMethod!: string
+
   @Column('simple-enum', { name: 'issuer_correlation_type', enum: CredentialCorrelationType, nullable: false })
   issuerCorrelationType!: CredentialCorrelationType
 
   @Column('simple-enum', { name: 'subject_correlation_type', enum: CredentialCorrelationType, nullable: true })
   subjectCorrelationType?: CredentialCorrelationType
 
+  @Column('simple-enum', { name: 'rp_correlation_type', enum: CredentialCorrelationType, nullable: true })
+  rpCorrelationType?: CredentialCorrelationType
+
+  @Column('boolean', { name: 'issuer_signed', nullable: true })
+  isIssuerSigned?: boolean
+
   @Column('text', { name: 'issuer_correlation_id', nullable: false })
   issuerCorrelationId!: string
 
   @Column('text', { name: 'subject_correlation_id', nullable: true })
   subjectCorrelationId?: string
 
+  @Column('text', { name: 'rp_correlation_id', nullable: true })
+  rpCorrelationId?: string
+
   @Column('simple-enum', { name: 'verified_state', enum: CredentialStateType, nullable: true })
   verifiedState?: CredentialStateType
 
@@ -56,6 +78,9 @@ export class DigitalCredentialEntity extends BaseEntity implements DigitalCreden
   @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 
+  @Column({ name: 'presented_at', nullable: true, type: typeormDate() })
+  presentedAt?: Date
+
   @UpdateDateColumn({ name: 'last_updated_at', nullable: false, type: typeOrmDateTime() })
   lastUpdatedAt!: Date
 

package/src/eventLogger/EventLoggerStore.ts

@@ -4,7 +4,6 @@ import { AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
 import { OrPromise } from '@sphereon/ssi-types'
 import { AbstractEventLoggerStore } from './AbstractEventLoggerStore'
 import { AuditEventEntity, auditEventEntityFrom } from '../entities/eventLogger/AuditEventEntity'
-import { auditEventFrom } from '../utils/eventLogger/MappingUtils'
 import { GetAuditEventsArgs, StoreAuditEventArgs } from '../types'
 
 const debug: Debugger = Debug('sphereon:ssi-sdk:event-store')
@@ -24,7 +23,7 @@ export class EventLoggerStore extends AbstractEventLoggerStore {
       ...(args?.filter && { where: args?.filter }),
     })
 
-    return result.map((event: AuditEventEntity) => auditEventFrom(event))
+    return result.map((event: AuditEventEntity) => this.auditEventFrom(event))
   }
 
   storeAuditEvent = async (args: StoreAuditEventArgs): Promise<AuditLoggingEvent> => {
@@ -35,6 +34,29 @@ export class EventLoggerStore extends AbstractEventLoggerStore {
     debug('Storing audit event', auditEventEntity)
     const createdResult: AuditEventEntity = await connection.getRepository(AuditEventEntity).save(auditEventEntity)
 
-    return auditEventFrom(createdResult)
+    return this.auditEventFrom(createdResult)
+  }
+
+  private auditEventFrom = (event: AuditEventEntity): AuditLoggingEvent => {
+    return {
+      id: event.id,
+      description: event.description,
+      timestamp: event.timestamp,
+      level: event.level,
+      correlationId: event.correlationId,
+      actionType: event.actionType,
+      actionSubType: event.actionSubType,
+      initiatorType: event.initiatorType,
+      partyAlias: event.partyAlias,
+      partyCorrelationId: event.partyCorrelationId,
+      partyCorrelationType: event.partyCorrelationType,
+      subSystemType: event.subSystemType,
+      system: event.system,
+      systemAlias: event.systemAlias,
+      systemCorrelationId: event.systemCorrelationId,
+      systemCorrelationIdType: event.systemCorrelationIdType,
+      ...(event.data && { data: JSON.parse(event.data) }),
+      ...(event.diagnosticData && { diagnosticData: JSON.parse(event.diagnosticData) }),
+    }
   }
 }

package/src/index.ts

@@ -156,3 +156,5 @@ export {
   isPresentationDefinitionEqual,
   ContactMetadataItemEntity,
 }
+
+export * from './utils/hasher'

package/src/issuanceBranding/IssuanceBrandingStore.ts

@@ -11,7 +11,6 @@ import { IssuerLocaleBrandingEntity, issuerLocaleBrandingEntityFrom } from '../e
 import { BaseLocaleBrandingEntity } from '../entities/issuanceBranding/BaseLocaleBrandingEntity'
 import { TextAttributesEntity } from '../entities/issuanceBranding/TextAttributesEntity'
 import { AbstractIssuanceBrandingStore } from './AbstractIssuanceBrandingStore'
-import { credentialBrandingFrom, issuerBrandingFrom, localeBrandingFrom } from '../utils/issuanceBranding/MappingUtils'
 import {
   IAddCredentialBrandingArgs,
   IAddCredentialLocaleBrandingArgs,
@@ -31,6 +30,7 @@ import {
   IIssuerBrandingFilter,
   IIssuerLocaleBranding,
   IIssuerLocaleBrandingFilter,
+  ILocaleBranding,
   IRemoveCredentialBrandingArgs,
   IRemoveCredentialLocaleBrandingArgs,
   IRemoveIssuerBrandingArgs,
@@ -42,7 +42,6 @@ import {
   ICredentialBrandingFilter,
 } from '../types'
 
-
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:issuance-branding-store')
 
 export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
@@ -72,7 +71,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Adding credential branding', credentialBrandingEntity)
     const createdResult: CredentialBrandingEntity = await repository.save(credentialBrandingEntity)
 
-    return credentialBrandingFrom(createdResult)
+    return this.credentialBrandingFrom(createdResult)
   }
 
   public getCredentialBranding = async (args?: IGetCredentialBrandingArgs): Promise<Array<ICredentialBranding>> => {
@@ -90,7 +89,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       ...(filter && { where: filter }),
     })
 
-    return result.map((credentialBranding: CredentialBrandingEntity) => credentialBrandingFrom(credentialBranding))
+    return result.map((credentialBranding: CredentialBrandingEntity) => this.credentialBrandingFrom(credentialBranding))
   }
 
   public removeCredentialBranding = async (args: IRemoveCredentialBrandingArgs): Promise<void> => {
@@ -134,7 +133,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating credential branding', branding)
     const result: CredentialBrandingEntity = await repository.save(branding, { transaction: true })
 
-    return credentialBrandingFrom(result)
+    return this.credentialBrandingFrom(result)
   }
 
   public addCredentialLocaleBranding = async (args: IAddCredentialLocaleBrandingArgs): Promise<ICredentialBranding> => {
@@ -189,7 +188,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       return Promise.reject(Error('Unable to get updated credential branding'))
     }
 
-    return credentialBrandingFrom(result)
+    return this.credentialBrandingFrom(result)
   }
 
   public getCredentialLocaleBranding = async (args?: IGetCredentialLocaleBrandingArgs): Promise<Array<ICredentialLocaleBranding>> => {
@@ -212,7 +211,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     return credentialBrandingLocale
       ? credentialBrandingLocale.map(
           (credentialLocaleBranding: CredentialLocaleBrandingEntity) =>
-            localeBrandingFrom(credentialLocaleBranding) as ICredentialLocaleBranding,
+            this.localeBrandingFrom(credentialLocaleBranding) as ICredentialLocaleBranding,
         )
       : []
   }
@@ -260,7 +259,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating credential locale branding', localeBranding)
     const updatedResult: CredentialLocaleBrandingEntity = await repository.save(localeBranding, { transaction: true })
 
-    return localeBrandingFrom(updatedResult) as ICredentialLocaleBranding
+    return this.localeBrandingFrom(updatedResult) as ICredentialLocaleBranding
   }
 
   public addIssuerBranding = async (args: IAddIssuerBrandingArgs): Promise<IIssuerBranding> => {
@@ -282,7 +281,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Adding issuer branding', issuerBrandingEntity)
     const createdResult: IssuerBrandingEntity = await repository.save(issuerBrandingEntity)
 
-    return issuerBrandingFrom(createdResult)
+    return this.issuerBrandingFrom(createdResult)
   }
 
   public getIssuerBranding = async (args?: IGetIssuerBrandingArgs): Promise<Array<IIssuerBranding>> => {
@@ -300,7 +299,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       ...(filter && { where: filter }),
     })
 
-    return result.map((issuerBranding: IssuerBrandingEntity) => issuerBrandingFrom(issuerBranding))
+    return result.map((issuerBranding: IssuerBrandingEntity) => this.issuerBrandingFrom(issuerBranding))
   }
 
   public removeIssuerBranding = async (args: IRemoveIssuerBrandingArgs): Promise<void> => {
@@ -344,7 +343,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating issuer branding', branding)
     const result: IssuerBrandingEntity = await repository.save(branding, { transaction: true })
 
-    return issuerBrandingFrom(result)
+    return this.issuerBrandingFrom(result)
   }
 
   public addIssuerLocaleBranding = async (args: IAddIssuerLocaleBrandingArgs): Promise<IIssuerBranding> => {
@@ -395,7 +394,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       return Promise.reject(Error('Unable to get updated issuer branding'))
     }
 
-    return issuerBrandingFrom(result)
+    return this.issuerBrandingFrom(result)
   }
 
   public getIssuerLocaleBranding = async (args?: IGetIssuerLocaleBrandingArgs): Promise<Array<IIssuerLocaleBranding>> => {
@@ -417,7 +416,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
 
     return issuerLocaleBranding
       ? issuerLocaleBranding.map(
-          (issuerLocaleBranding: IssuerLocaleBrandingEntity) => localeBrandingFrom(issuerLocaleBranding) as IIssuerLocaleBranding,
+          (issuerLocaleBranding: IssuerLocaleBrandingEntity) => this.localeBrandingFrom(issuerLocaleBranding) as IIssuerLocaleBranding,
         )
       : []
   }
@@ -463,7 +462,56 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating issuer locale branding', localeBranding)
     const updatedResult: IssuerLocaleBrandingEntity = await repository.save(localeBranding, { transaction: true })
 
-    return localeBrandingFrom(updatedResult) as IIssuerLocaleBranding
+    return this.localeBrandingFrom(updatedResult) as IIssuerLocaleBranding
+  }
+
+  private credentialBrandingFrom = (credentialBranding: CredentialBrandingEntity): ICredentialBranding => {
+    const result: ICredentialBranding = {
+      ...credentialBranding,
+      localeBranding: credentialBranding.localeBranding.map((localeBranding: BaseLocaleBrandingEntity) => this.localeBrandingFrom(localeBranding)),
+    }
+
+    return this.replaceNullWithUndefined(result)
+  }
+
+  private issuerBrandingFrom = (issuerBranding: IssuerBrandingEntity): IIssuerBranding => {
+    const result: IIssuerBranding = {
+      ...issuerBranding,
+      localeBranding: issuerBranding.localeBranding.map((localeBranding: BaseLocaleBrandingEntity) => this.localeBrandingFrom(localeBranding)),
+    }
+
+    return this.replaceNullWithUndefined(result)
+  }
+
+  private localeBrandingFrom = (localeBranding: BaseLocaleBrandingEntity): ILocaleBranding => {
+    const result: ILocaleBranding = {
+      ...localeBranding,
+      locale: localeBranding.locale === '' ? undefined : localeBranding.locale,
+    }
+
+    return this.replaceNullWithUndefined(result)
+  }
+
+  private replaceNullWithUndefined(obj: any): any {
+    if (obj === null) {
+      return undefined
+    }
+
+    if (typeof obj !== 'object' || obj instanceof Date) {
+      return obj
+    }
+
+    if (Array.isArray(obj)) {
+      return obj.map((value: any) => this.replaceNullWithUndefined(value))
+    }
+
+    const result: any = {}
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        result[key] = this.replaceNullWithUndefined(obj[key])
+      }
+    }
+    return result
   }
 
   private hasDuplicateLocales = async (localeBranding: Array<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding>): Promise<boolean> => {

package/src/migrations/postgres/1708525189001-CreateDigitalCredential.ts

@@ -5,34 +5,46 @@ export class CreateDigitalCredential1708525189001 implements MigrationInterface
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`CREATE TYPE "digital_document_type" AS ENUM('VC', 'VP', 'C', 'P')`)
-    await queryRunner.query(`CREATE TYPE "digital_credential_document_format" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MDOC')`)
+    await queryRunner.query(`CREATE TYPE "digital_regulation_type" AS ENUM('PID', 'QEAA', 'EAA', 'NON_REGULATED')`)
+    await queryRunner.query(`CREATE TYPE "digital_credential_document_format" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_credential_role" AS ENUM('ISSUER', 'VERIFIER', 'HOLDER')`)
-    await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID', 'URL', 'X509_CN')`)
+    await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID', 'KID', 'URL', 'X509_SAN')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_state_type" AS ENUM('REVOKED', 'VERIFIED', 'EXPIRED')`)
 
+    // TODO FK for parent
+
     await queryRunner.query(`
       CREATE TABLE "DigitalCredential" (
         "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+        "parent_id" text,
         "document_type" "digital_document_type" NOT NULL,
+        "regulation_type" "digital_regulation_type" NOT NULL DEFAULT 'NON_REGULATED'::"digital_regulation_type",
         "document_format" "digital_credential_document_format" NOT NULL,
         "credential_role" "digital_credential_credential_role" NOT NULL,
         "raw_document" text NOT NULL,
         "uniform_document" text NOT NULL,
         "credential_id" text,
-        "hash" text NOT NULL UNIQUE,
+        "hash" text NOT NULL,
+        "kms_key_ref" text,
+        "identifier_method" text,
         "issuer_correlation_type" "digital_credential_correlation_type" NOT NULL,
         "subject_correlation_type" "digital_credential_correlation_type",
         "issuer_correlation_id" text NOT NULL,
         "subject_correlation_id" text,
         "verified_state" "digital_credential_state_type",
+        "issuer_signed" boolean,
+        "rp_correlation_id" text,
+        "rp_correlation_type" "digital_credential_correlation_type",
         "tenant_id" text,
         "created_at" TIMESTAMP NOT NULL DEFAULT now(),
         "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
+        "presented_at" DATE,
         "valid_from" DATE,
         "valid_until" DATE,
         "verified_at" DATE,
         "revoked_at" DATE,
-        PRIMARY KEY ("id")
+        PRIMARY KEY ("id"),
+        UNIQUE ("hash", "credential_role")
       )
     `)
   }
@@ -43,6 +55,7 @@ export class CreateDigitalCredential1708525189001 implements MigrationInterface
     await queryRunner.query(`DROP TYPE "digital_credential_correlation_type"`)
     await queryRunner.query(`DROP TYPE "digital_credential_document_format"`)
     await queryRunner.query(`DROP TYPE "digital_credential_credential_role"`)
+    await queryRunner.query(`DROP TYPE "digital_regulation_type"`)
     await queryRunner.query(`DROP TYPE "digital_document_type"`)
   }
 }

package/src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts

@@ -4,28 +4,38 @@ export class CreateDigitalCredential1708525189002 implements MigrationInterface
   name = 'CreateDigitalCredential1708525189002'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
+    // TODO FK for parent
     await queryRunner.query(`
             CREATE TABLE "DigitalCredential" (
                 "id" varchar PRIMARY KEY NOT NULL,
+                "parent_id" text, 
                 "document_type" varchar CHECK( "document_type" IN ('VC', 'VP', 'C', 'P') ) NOT NULL,
-                "document_format" varchar CHECK( "document_format" IN ('JSON_LD', 'JWT', 'SD_JWT', 'MDOC') ) NOT NULL,
+                "regulation_type" varchar CHECK( "regulation_type" IN ('PID', 'QEAA', 'EAA', 'NON_REGULATED') ) NOT NULL DEFAULT 'NON_REGULATED',
+                "document_format" varchar CHECK( "document_format" IN ('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC') ) NOT NULL,
                 "credential_role" varchar CHECK( "credential_role" IN ('ISSUER', 'VERIFIER', 'HOLDER') ) NOT NULL,
                 "raw_document" text NOT NULL,
                 "uniform_document" text NOT NULL,
                 "credential_id" text,
-                "hash" text NOT NULL UNIQUE,
-                "issuer_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'URL', 'X509_CN') ) NOT NULL,
-                "subject_correlation_type" varchar CHECK( "subject_correlation_type" IN ('DID', 'URL', 'X509_CN') ),
+                "hash" text NOT NULL,
+                "kms_key_ref" text,
+                "identifier_method" text,
+                "issuer_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ) NOT NULL,
+                "subject_correlation_type" varchar CHECK( "subject_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ),
                 "issuer_correlation_id" text NOT NULL,
                 "subject_correlation_id" text,
+                "issuer_signed" boolean,
+                "rp_correlation_id" text,
+                "rp_correlation_type" varchar CHECK( "issuer_correlation_type" IN ('DID', 'KID', 'URL', 'X509_SAN') ),
                 "verified_state" varchar CHECK( "verified_state" IN ('REVOKED', 'VERIFIED', 'EXPIRED') ),
                 "tenant_id" text,
                 "created_at" datetime NOT NULL DEFAULT (datetime('now')),
                 "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                "presented_at" datetime,
                 "valid_from" datetime,
                 "valid_until" datetime,
                 "verified_at" datetime,
-                "revoked_at" datetime
+                "revoked_at" datetime,
+                UNIQUE ("hash", "credential_role")
             )
         `)
   }