support attached COSE payloads and presentations

index.html

@@ -81,6 +81,40 @@ <h1>Basic Example</h1>
  }
 }
  </pre>
+ </pre>
+ <pre class="example nohighlight vc" data-vc-tabs="jose sd-jwt cose" title="A Verifiable Presentation example">
+{
+ <span class='comment'>// set the context, which establishes the special terms we will be using.</span>
+ "@context": [
+ "https://www.w3.org/ns/credentials/v2",
+ "https://www.w3.org/ns/credentials/examples/v2"
+ ],
+ <span class='comment'>// specify the identifier for the presentation</span>
+ "id": "http://example.edu/presentations/1872",
+ <span class='comment'>// the presentation type, which declare what data to expect in the presentation</span>
+ "type": "VerifiablePresentation",
+ <span class='comment'>// when the presentation was issued</span>
+ "validFrom": "2010-01-01T19:23:24Z",
+ <span class='comment'>// credentials in the presentation</span>
+ "verifiableCredential": [
+ {
+ "@context": "https://www.w3.org/ns/credentials/v2",
+ "id": "data:application/vc+cose;base64url,UXpWalYuLi5STWpV",
+ "type": "EnvelopedVerifiableCredential"
+ },
+ {
+ "@context": "https://www.w3.org/ns/credentials/v2",
+ "id": "data:application/vc+jwt;eyVjV...RMjU",
+ "type": "EnvelopedVerifiableCredential"
+ },
+ {
+ "@context": "https://www.w3.org/ns/credentials/v2",
+ "id": "data:application/vc+sd-jwt;eyVjV...RMjU",
+ "type": "EnvelopedVerifiableCredential"
+ }
+ ]
+}
+ </pre>
 </section>
 
 <section>

index.js

@@ -616,11 +616,12 @@ async function createVcExamples() {
  try {
  verifiableCredentialProof = await attachProof({credential, suite});
  const mediaType =
- (verifiableCredentialProof.type.includes('VerifiablePresentation'))
- ? 'application/vp' : 'application/vc';
+ (verifiableCredentialProof.type
+ .includes('VerifiablePresentation')) ?
+ 'application/vp' : 'application/vc';
  return `<h1>${mediaType}</h1>
  <pre>${JSON.stringify(verifiableCredentialProof, null, 2)
-  .match(/.{1,75}/g).join('\n')}</pre>`;
+ .match(/.{1,75}/g).join('\n')}</pre>`;
  } catch(e) {
  console.error(
  'respec-vc error: Failed to attach proof to Verifiable Credential.',
@@ -634,12 +635,21 @@ async function createVcExamples() {
  }
 
  // set up the unsigned button
- addTab(
- 'unsigned',
- 'Unsecured credential',
- 'Credential',
- () => example.outerHTML,
- );
+ if(credential.type.includes('VerifiablePresentation')) {
+ addTab(
+ 'unsigned',
+ 'Unsecured presentation',
+ 'Presentation',
+ () => example.outerHTML,
+ );
+ } else {
+ addTab(
+ 'unsigned',
+ 'Unsecured credential',
+ 'Credential',
+ () => example.outerHTML,
+ );
+ }
 
  for(const {proof, key, label} of exampleProofs) {
  if(hasTab(proof.cryptosuite)) {

src/cose.js

@@ -11,15 +11,11 @@ function buf2hex(buffer) {
 const getCredential = async (
  privateKey,
  byteSigner,
- messageType,
  messageJson,
 ) => {
- let oldMessageType = (messageType === 'application/vc+cose')
- ? 'application/vc+ld+json+cose' : 'application/vp+ld+json+cose';
-
  return issuer({
  alg: privateKey.alg,
- type: oldMessageType,
+ type: 'application/vc+ld+json+cose',
  signer: byteSigner,
  }).issue({
  claimset: new TextEncoder().encode(JSON.stringify(messageJson, null, 2)),
@@ -29,7 +25,6 @@ const getCredential = async (
 const getPresentation = async (
  privateKey,
  byteSigner,
- messageType,
  message,
 ) => {
  const disclosures = (message.verifiableCredential || []).map(enveloped => {
@@ -45,11 +40,9 @@ const getPresentation = async (
  credential: content,
  };
  });
- let oldMessageType = (messageType === 'application/vc+cose')
- ? 'application/vc+ld+json+cose' : 'application/vp+ld+json+cose';
  return holder({
  alg: privateKey.alg,
- type: oldMessageType,
+ type: 'application/vp+ld+json+cose',
  }).issue({
  signer: byteSigner,
  presentation: message,
@@ -58,7 +51,7 @@ const getPresentation = async (
 };
 
 const getBinaryMessage = async (privateKey, messageType, messageJson) => {
- const signer = cose.detached.signer({
+ const signer = cose.signer({
  remote: cose.crypto.signer({
  secretKeyJwk: privateKey,
  }),
@@ -74,10 +67,10 @@ const getBinaryMessage = async (privateKey, messageType, messageJson) => {
  };
  switch(messageType) {
  case 'application/vc+cose': {
- return getCredential(privateKey, byteSigner, messageType, messageJson);
+ return getCredential(privateKey, byteSigner, messageJson);
  }
  case 'application/vp+cose': {
- return getPresentation(privateKey, byteSigner, messageType, messageJson);
+ return getPresentation(privateKey, byteSigner, messageJson);
  }
  default: {
  throw new Error('Unknown message type');
@@ -104,7 +97,7 @@ ${JSON.stringify(messageJson, null, 2)}
 <div class="cose-text">
 <pre><code>${diagnostic.trim()}</code></pre>
 </div>
-<h1>${messageType} (detached payload)</h1>
+<h1>${messageType}</h1>
 <div class="cose-text">
 ${messageHex}
 </div>

src/jose.js

@@ -10,14 +10,11 @@ import * as jose from 'jose';
 const getCredential = async (
  privateKey,
  byteSigner,
- messageType,
  messageJson
 ) => {
- let oldMessageType = (messageType === 'application/vc+jwt')
- ? 'application/vc+ld+json+jwt' : 'application/vp+ld+json+jwt';
  return issuer({
  alg: privateKey.alg,
- type: oldMessageType,
+ type: 'application/vc+ld+json+jwt',
  signer: byteSigner,
  }).issue({
  claimset: new TextEncoder().encode(JSON.stringify(messageJson, null, 2)),
@@ -27,7 +24,6 @@ const getCredential = async (
 const getPresentation = async (
  privateKey,
  byteSigner,
- messageType,
  message
 ) => {
  const disclosures = (message.verifiableCredential || []).map(enveloped => {
@@ -44,7 +40,7 @@ const getPresentation = async (
  });
  return holder({
  alg: privateKey.alg,
- type: messageType,
+ type: 'application/vp+ld+json+jwt',
  }).issue({
  signer: byteSigner,
  presentation: message,
@@ -76,10 +72,10 @@ const getBinaryMessage = async (privateKey, messageType, messageJson) => {
  };
  switch(messageType) {
  case 'application/vc+jwt': {
- return getCredential(privateKey, byteSigner, messageType, messageJson);
+ return getCredential(privateKey, byteSigner, messageJson);
  }
  case 'application/vp+jwt': {
- return getPresentation(privateKey, byteSigner, messageType, messageJson);
+ return getPresentation(privateKey, byteSigner, messageJson);
  }
  default: {
  throw new Error('Unknown message type');

src/sd-jwt.js

@@ -77,31 +77,17 @@ export const generateIssuerClaims = example => {
 const getCredential = async (
  privateKey,
  byteSigner,
- messageType,
  messageJson,
 ) => {
- let oldMessageType = (messageType === 'application/vc+sd-jwt')
- ? 'application/vc+ld+json+sd-jwt' : 'application/vp+ld+json+sd-jwt';
-
  return issuer({
  alg: privateKey.alg,
- type: oldMessageType,
+ type: 'application/vc+ld+json+sd-jwt',
  signer: byteSigner,
  }).issue({
  claimset: new TextEncoder().encode(generateIssuerClaims(messageJson)),
  });
 };
 
-const getPresentation = async (
- privateKey,
- byteSigner,
- messageType,
- messageJson,
-) => {
- const mediaType = 'application/vc+sd-jwt';
- return getCredential(privateKey, byteSigner, mediaType, messageJson);
-};
-
 export const getBinaryMessage = async (
  privateKey,
  messageType,
@@ -120,10 +106,10 @@ export const getBinaryMessage = async (
  };
  switch(messageType) {
  case 'application/vc+sd-jwt': {
- return getCredential(privateKey, byteSigner, messageType, messageJson);
+ return getCredential(privateKey, byteSigner, messageJson);
  }
  case 'application/vp+sd-jwt': {
- return getPresentation(privateKey, byteSigner, messageType, messageJson);
+ return getCredential(privateKey, byteSigner, messageJson);
  }
  default: {
  throw new Error('Unknown message type');