feat: Added id and tag fields

decentralized-identity · Apr 15, 2020 · 0b62eaa · 0b62eaa
1 parent f491371
commit 0b62eaa
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 6 deletions.
diff --git a/packages/daf-core/src/entities/credential.ts b/packages/daf-core/src/entities/credential.ts
@@ -74,6 +74,9 @@ export class Credential extends BaseEntity {
   )
   subject?: Identity
 
+  @Column({ nullable: true })
+  id?: String
+
   @Column()
   issuanceDate: Date
 

diff --git a/packages/daf-core/src/entities/message.ts b/packages/daf-core/src/entities/message.ts
@@ -4,11 +4,13 @@ import {
   BaseEntity,
   ManyToOne,
   ManyToMany,
-  PrimaryGeneratedColumn,
+  PrimaryColumn,
   JoinTable,
   CreateDateColumn,
   UpdateDateColumn,
+  BeforeInsert,
 } from 'typeorm'
+import { blake2bHex } from 'blakejs'
 import { Identity } from './identity'
 import { Presentation } from './presentation'
 import { Credential } from './credential'
@@ -30,7 +32,14 @@ export class Message extends BaseEntity {
     }
   }
 
-  @PrimaryGeneratedColumn('uuid')
+  @BeforeInsert()
+  setId() {
+    if (!this.id) {
+      this.id = blake2bHex(this.raw)
+    }
+  }
+
+  @PrimaryColumn()
   id: string
 
   @CreateDateColumn()

diff --git a/packages/daf-core/src/entities/presentation.ts b/packages/daf-core/src/entities/presentation.ts
@@ -35,7 +35,7 @@ export class Presentation extends BaseEntity {
     identity => identity.issuedPresentations,
     {
       cascade: ['insert'],
-      eager: true
+      eager: true,
     },
   )
   issuer: Identity
@@ -45,11 +45,14 @@ export class Presentation extends BaseEntity {
     identity => identity.receivedPresentations,
     {
       cascade: ['insert'],
-      eager: true
+      eager: true,
     },
   )
   audience: Identity
 
+  @Column({ nullable: true })
+  id?: String
+
   @Column()
   issuanceDate: Date
 

diff --git a/packages/daf-w3c/src/action-handler.ts b/packages/daf-w3c/src/action-handler.ts
@@ -93,6 +93,7 @@ export interface CredentialInput {
   '@context'?: string[]
   context?: string[]
   type: string[]
+  id?: string
   issuer: string
   expirationDate?: string
   credentialSubject: CredentialSubjectInput
@@ -102,6 +103,7 @@ export interface PresentationInput {
   '@context'?: string[]
   context?: string[]
   type: string[]
+  id?: string
   issuer: string
   audience: string
   tag?: string
@@ -115,28 +117,46 @@ const transformCredentialInput = (input: CredentialInput): VerifiableCredentialP
   delete credentialSubject.id
   const result: VerifiableCredentialPayload = {
     sub: input.credentialSubject.id,
-    // exp: input.expirationDate,
     vc: {
       '@context': input['@context'] || input['context'],
       type: input.type,
       credentialSubject,
     },
   }
 
+  if (input.expirationDate) {
+    result['exp'] = new Date(input.expirationDate).getUTCSeconds()
+  }
+
+  if (input.id) {
+    result['jti'] = input.id
+  }
+
   return result
 }
 
 const transformPresentationInput = (input: PresentationInput): PresentationPayload => {
   // TODO validate input
   const result: PresentationPayload = {
     aud: input.audience,
-    // exp: input.expirationDate,
     vp: {
       '@context': input['@context'] || input['context'],
       type: input.type,
       verifiableCredential: input.verifiableCredential,
     },
   }
 
+  if (input.expirationDate) {
+    result['exp'] = new Date(input.expirationDate).getUTCSeconds()
+  }
+
+  if (input.id) {
+    result['jti'] = input.id
+  }
+
+  if (input.tag) {
+    result['tag'] = input.tag
+  }
+
   return result
 }
diff --git a/packages/daf-w3c/src/graphql.ts b/packages/daf-w3c/src/graphql.ts
@@ -50,13 +50,16 @@ export const typeDefs = `
   scalar CredentialSubject
 
   input SignCredentialInput {
+    id: String
     issuer: String!
     context: [String]!
     type: [String]!
     credentialSubject: CredentialSubject!
   }
   
   input SignPresentationInput {
+    id: String
+    tag: String
     issuer: String!
     audience: String!
     context: [String]!

diff --git a/packages/daf-w3c/src/message-handler.ts b/packages/daf-w3c/src/message-handler.ts
@@ -94,6 +94,10 @@ export function createCredential(payload: VerifiableCredentialPayload, jwt: stri
 
   vc.raw = jwt
 
+  if (payload.jti) {
+    vc.id = payload.jti
+  }
+
   if (payload.nbf || payload.iat) {
     vc.issuanceDate = timestampToDate(payload.nbf || payload.iat)
   }
@@ -125,6 +129,10 @@ export function createPresentation(
 
   vp.raw = jwt
 
+  if (payload.jti) {
+    vp.id = payload.jti
+  }
+
   if (payload.nbf || payload.iat) {
     vp.issuanceDate = timestampToDate(payload.nbf || payload.iat)
   }