feat: Multiple audience dids

BREAKING CHANGE: DB Schema change
decentralized-identity · Apr 30, 2020 · eaa1a40 · eaa1a40
1 parent 9e54a45
commit eaa1a40
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 35 deletions.
diff --git a/packages/daf-cli/src/credential.ts b/packages/daf-cli/src/credential.ts
@@ -28,7 +28,7 @@ program
         type: 'input',
         name: 'sub',
         message: 'Subject DID',
-        default: identities[0].did
+        default: identities[0].did,
       },
       {
         type: 'input',
@@ -62,7 +62,7 @@ program
       issuer: answers.iss,
       '@context': ['https://www.w3.org/2018/credentials/v1'],
       type: ['VerifiableCredential'],
-      credentialSubject
+      credentialSubject,
     }
 
     if (answers.addStatus) {
@@ -83,14 +83,14 @@ program
 
       data['credentialStatus'] = {
         type: statusAnswers.type,
-        id: statusAnswers.id
+        id: statusAnswers.id,
       }
     }
 
     const signAction: W3c.ActionSignW3cVc = {
       type: W3c.ActionTypes.signCredentialJwt,
       save: true,
-      data
+      data,
     }
 
     const credential: Daf.Credential = await (await agent).handleAction(signAction)
@@ -141,7 +141,7 @@ program
       },
     ]
     for (const id of ids) {
-      const name = await id.getLatestClaimValue((await agent).dbConnection, { type: 'name'})
+      const name = await id.getLatestClaimValue((await agent).dbConnection, { type: 'name' })
       identities.push({
         value: id.did,
         name: `${id.did} - ${name}`,
@@ -182,9 +182,9 @@ program
       aud = answers.aud
     }
 
-    const credentials = await Daf.Credential.find({ 
-      where: { subject: answers.iss}, 
-      relations: ['claims'] 
+    const credentials = await Daf.Credential.find({
+      where: { subject: answers.iss },
+      relations: ['claims'],
     })
     const list: any = []
     if (credentials.length > 0) {
@@ -230,11 +230,11 @@ program
         save: true,
         data: {
           issuer: answers.iss,
-          audience: aud,
+          audience: [aud],
           tag: answers.tag,
           '@context': ['https://www.w3.org/2018/credentials/v1'],
           type: ['VerifiablePresentation'],
-          verifiableCredential
+          verifiableCredential,
         },
       }
 

diff --git a/packages/daf-core/src/entities/identity.ts b/packages/daf-core/src/entities/identity.ts
@@ -4,6 +4,7 @@ import {
   PrimaryColumn,
   BaseEntity,
   OneToMany,
+  ManyToMany,
   CreateDateColumn,
   UpdateDateColumn,
 } from 'typeorm'
@@ -55,7 +56,7 @@ export class Identity extends BaseEntity {
   )
   issuedPresentations: Presentation[]
 
-  @OneToMany(
+  @ManyToMany(
     type => Presentation,
     presentation => presentation.audience,
   )

diff --git a/packages/daf-core/src/entities/presentation.ts b/packages/daf-core/src/entities/presentation.ts
@@ -40,15 +40,16 @@ export class Presentation extends BaseEntity {
   )
   issuer: Identity
 
-  @ManyToOne(
+  @ManyToMany(
     type => Identity,
     identity => identity.receivedPresentations,
     {
       cascade: ['insert'],
       eager: true,
     },
   )
-  audience: Identity
+  @JoinTable()
+  audience: Identity[]
 
   @Column({ nullable: true })
   id?: String

diff --git a/packages/daf-core/src/graphql/graphql-core.ts b/packages/daf-core/src/graphql/graphql-core.ts
@@ -119,7 +119,10 @@ function decorateQB(
 
   if (input?.order) {
     for (const item of input.order) {
-      qb = qb.orderBy(`${qb.connection.driver.escape(tablename)}.${qb.connection.driver.escape(item.column)}`, item.direction)
+      qb = qb.orderBy(
+        `${qb.connection.driver.escape(tablename)}.${qb.connection.driver.escape(item.column)}`,
+        item.direction,
+      )
     }
   }
   return qb
@@ -234,9 +237,12 @@ const credentials = async (_: any, args: FindArgs, ctx: Context) => {
   if (ctx.authenticatedDid) {
     qb = qb.andWhere(
       new Brackets(qb => {
-        qb.where('credential.subject = :ident', { ident: ctx.authenticatedDid }).orWhere('credential.issuer = :ident', {
-          ident: ctx.authenticatedDid,
-        })
+        qb.where('credential.subject = :ident', { ident: ctx.authenticatedDid }).orWhere(
+          'credential.issuer = :ident',
+          {
+            ident: ctx.authenticatedDid,
+          },
+        )
       }),
     )
   }
@@ -255,9 +261,12 @@ const credentialsCount = async (_: any, args: FindArgs, ctx: Context) => {
   if (ctx.authenticatedDid) {
     qb = qb.andWhere(
       new Brackets(qb => {
-        qb.where('credential.subject = :ident', { ident: ctx.authenticatedDid }).orWhere('credential.issuer = :ident', {
-          ident: ctx.authenticatedDid,
-        })
+        qb.where('credential.subject = :ident', { ident: ctx.authenticatedDid }).orWhere(
+          'credential.issuer = :ident',
+          {
+            ident: ctx.authenticatedDid,
+          },
+        )
       }),
     )
   }
@@ -321,7 +330,7 @@ export const resolvers = {
 
   Query: {
     identity: async (_: any, { did }, ctx: Context) =>
-      (checkAuthIdentity(did, ctx.authenticatedDid)) &&
+      checkAuthIdentity(did, ctx.authenticatedDid) &&
       (await ctx.agent.dbConnection).getRepository(Identity).findOne(did),
     identities: async (_: any, { input }, ctx: Context) => {
       if (ctx.authenticatedDid) {
@@ -339,9 +348,12 @@ export const resolvers = {
       if (ctx.authenticatedDid) {
         qb = qb.andWhere(
           new Brackets(qb => {
-            qb.where('message.to = :ident', { ident: ctx.authenticatedDid }).orWhere('message.from = :ident', {
-              ident: ctx.authenticatedDid,
-            })
+            qb.where('message.to = :ident', { ident: ctx.authenticatedDid }).orWhere(
+              'message.from = :ident',
+              {
+                ident: ctx.authenticatedDid,
+              },
+            )
           }),
         )
       }
@@ -400,9 +412,12 @@ export const resolvers = {
       if (ctx.authenticatedDid) {
         qb = qb.andWhere(
           new Brackets(qb => {
-            qb.where('claim.subject = :ident', { ident: ctx.authenticatedDid }).orWhere('claim.issuer = :ident', {
-              ident: ctx.authenticatedDid,
-            })
+            qb.where('claim.subject = :ident', { ident: ctx.authenticatedDid }).orWhere(
+              'claim.issuer = :ident',
+              {
+                ident: ctx.authenticatedDid,
+              },
+            )
           }),
         )
       }
@@ -715,7 +730,7 @@ export const typeDefs = `
     id: String
     raw: String!
     issuer: Identity!
-    audience: Identity!
+    audience: [Identity]!
     issuanceDate: Date!
     expirationDate: Date
     context: [String]

diff --git a/packages/daf-selective-disclosure/src/__tests__/helper.test.ts b/packages/daf-selective-disclosure/src/__tests__/helper.test.ts
@@ -78,7 +78,7 @@ describe('daf-selective-disclosure-helper', () => {
 
     const presentation = new Presentation()
     presentation.issuer = identity
-    presentation.audience = identity
+    presentation.audience = [identity]
     presentation.context = ['https://www.w3.org/2018/credentials/v1']
     presentation.type = ['VerifiablePresentation']
     presentation.credentials = [credential1, credential3]
@@ -120,7 +120,7 @@ describe('daf-selective-disclosure-helper', () => {
 
     const presentation = new Presentation()
     presentation.issuer = identity
-    presentation.audience = identity
+    presentation.audience = [identity]
     presentation.context = ['https://www.w3.org/2018/credentials/v1']
     presentation.type = ['VerifiablePresentation']
     presentation.credentials = [credential1]

diff --git a/packages/daf-w3c/src/action-handler.ts b/packages/daf-w3c/src/action-handler.ts
@@ -110,7 +110,7 @@ export interface PresentationInput {
   type: string[]
   id?: string
   issuer: string
-  audience: string
+  audience: string[]
   tag?: string
   expirationDate?: string
   verifiableCredential: string[]

diff --git a/packages/daf-w3c/src/graphql.ts b/packages/daf-w3c/src/graphql.ts
@@ -69,7 +69,7 @@ export const typeDefs = `
     expirationDate: Date
     tag: String
     issuer: String!
-    audience: String!
+    audience: [String]!
     context: [String]!
     type: [String]!
     verifiableCredential: [String]!

diff --git a/packages/daf-w3c/src/message-handler.ts b/packages/daf-w3c/src/message-handler.ts
@@ -106,7 +106,6 @@ export function createCredential(payload: VerifiableCredentialPayload, jwt: stri
     vc.expirationDate = timestampToDate(payload.exp)
   }
 
-
   if (payload.vc.credentialStatus) {
     vc.credentialStatus = payload.vc.credentialStatus
   }
@@ -129,8 +128,13 @@ export function createPresentation(
   vp.issuer = new Identity()
   vp.issuer.did = payload.iss
 
-  vp.audience = new Identity()
-  vp.audience.did = payload.aud
+  const audArray = Array.isArray(payload.aud) ? (payload.aud as string[]) : [payload.aud]
+
+  vp.audience = audArray.map((did: string) => {
+    const id = new Identity()
+    id.did = did
+    return id
+  })
 
   vp.raw = jwt