feat: Added credentialType to the Claim

decentralized-identity · Mar 30, 2020 · 45a4da2 · 45a4da2
1 parent d940429
commit 45a4da2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/packages/daf-core/src/entities/claim.ts b/packages/daf-core/src/entities/claim.ts
@@ -1,10 +1,4 @@
-import {
-  Entity,
-  Column,
-  BaseEntity,
-  ManyToOne,
-  PrimaryColumn,
-} from 'typeorm'
+import { Entity, Column, BaseEntity, ManyToOne, PrimaryColumn } from 'typeorm'
 import { Identity } from './identity'
 import { Credential } from './credential'
 
@@ -15,17 +9,19 @@ export class Claim extends BaseEntity {
 
   @ManyToOne(
     type => Identity,
-    identity => identity.issuedPresentations, {
-      eager: true
-    }
+    identity => identity.issuedPresentations,
+    {
+      eager: true,
+    },
   )
   issuer: Identity
 
   @ManyToOne(
     type => Identity,
-    identity => identity.receivedPresentations, {
-      eager: true
-    }
+    identity => identity.receivedPresentations,
+    {
+      eager: true,
+    },
   )
   subject: Identity
 
@@ -35,6 +31,18 @@ export class Claim extends BaseEntity {
   )
   credential: Credential
 
+  @Column()
+  issuanceDate: Date
+
+  @Column({ nullable: true })
+  expirationDate?: Date
+
+  @Column('simple-array')
+  context: string[]
+
+  @Column('simple-array')
+  credentialType: string[]
+
   @Column()
   type: string
 

diff --git a/packages/daf-core/src/entities/credential.ts b/packages/daf-core/src/entities/credential.ts
@@ -1,13 +1,5 @@
 import { blake2bHex } from 'blakejs'
-import {
-  Entity,
-  Column,
-  BaseEntity,
-  ManyToOne,
-  PrimaryColumn,
-  OneToMany,
-  ManyToMany,
-} from 'typeorm'
+import { Entity, Column, BaseEntity, ManyToOne, PrimaryColumn, OneToMany, ManyToMany } from 'typeorm'
 import { Identity } from './identity'
 import { Message } from './message'
 import { Presentation } from './presentation'
@@ -51,6 +43,10 @@ export class Credential extends BaseEntity {
         claim.isObj = isObj
         claim.issuer = this.issuer
         claim.subject = this.subject
+        claim.expirationDate = this.expirationDate
+        claim.issuanceDate = this.issuanceDate
+        claim.credentialType = this.type
+        claim.context = this.context
         this.claims.push(claim)
       }
     }
@@ -61,20 +57,22 @@ export class Credential extends BaseEntity {
     identity => identity.issuedCredentials,
     {
       cascade: ['insert'],
-      eager: true
+      eager: true,
     },
   )
   issuer: Identity
 
+  // Subject can be null https://w3c.github.io/vc-data-model/#credential-uniquely-identifies-a-subject
   @ManyToOne(
     type => Identity,
     identity => identity.receivedCredentials,
     {
       cascade: ['insert'],
-      eager: true
+      eager: true,
+      nullable: true,
     },
   )
-  subject: Identity
+  subject?: Identity
 
   @Column()
   issuanceDate: Date
@@ -105,7 +103,7 @@ export class Credential extends BaseEntity {
 
   @ManyToMany(
     type => Message,
-    message => message.credentials
+    message => message.credentials,
   )
   messages: Message[]
 }