From 8e9ae4e1add87a8518cf6d769e296da032c39d0e Mon Sep 17 00:00:00 2001 From: Manu Sporny Date: Sat, 6 Jul 2024 10:29:59 -0400 Subject: [PATCH] Refactor v2 context to favor VCDM terms and concepts first. --- contexts/credentials/v2 | 342 ++++++++++++++++++++-------------------- 1 file changed, 171 insertions(+), 171 deletions(-) diff --git a/contexts/credentials/v2 b/contexts/credentials/v2 index 794043c0b..b185daa29 100644 --- a/contexts/credentials/v2 +++ b/contexts/credentials/v2 @@ -6,81 +6,139 @@ "id": "@id", "type": "@type", - "...": { - "@id": "https://www.iana.org/assignments/jwt#..." - }, - "_sd": { - "@id": "https://www.iana.org/assignments/jwt#_sd", - "@type": "@json" + "description": "https://schema.org/description", + "digestMultibase": { + "@id": "https://w3id.org/security#digestMultibase", + "@type": "https://w3id.org/security#multibase" }, - "_sd_alg": { - "@id": "https://www.iana.org/assignments/jwt#_sd_alg" + "digestSRI": { + "@id": "https://www.w3.org/2018/credentials#digestSRI", + "@type": "https://www.w3.org/2018/credentials#sriString" }, - "aud": { - "@id": "https://www.iana.org/assignments/jwt#aud", - "@type": "@id" + "mediaType": { + "@id": "https://schema.org/encodingFormat" }, - "cnf": { - "@id": "https://www.iana.org/assignments/jwt#cnf", + "name": "https://schema.org/name", + + "VerifiableCredential": { + "@id": "https://www.w3.org/2018/credentials#VerifiableCredential", "@context": { "@protected": true, - "kid": { - "@id": "https://www.iana.org/assignments/jwt#kid", + "id": "@id", + "type": "@type", + + "confidenceMethod": { + "@id": "https://www.w3.org/2018/credentials#confidenceMethod", "@type": "@id" }, - "jwk": { - "@id": "https://www.iana.org/assignments/jwt#jwk", - "@type": "@json" + "credentialSchema": { + "@id": "https://www.w3.org/2018/credentials#credentialSchema", + "@type": "@id" + }, + "credentialStatus": { + "@id": "https://www.w3.org/2018/credentials#credentialStatus", + "@type": "@id" + }, + "credentialSubject": { + "@id": "https://www.w3.org/2018/credentials#credentialSubject", + "@type": "@id" + }, + "description": "https://schema.org/description", + "evidence": { + "@id": "https://www.w3.org/2018/credentials#evidence", + "@type": "@id" + }, + "issuer": { + "@id": "https://www.w3.org/2018/credentials#issuer", + "@type": "@id" + }, + "name": "https://schema.org/name", + "proof": { + "@id": "https://w3id.org/security#proof", + "@type": "@id", + "@container": "@graph" + }, + "refreshService": { + "@id": "https://www.w3.org/2018/credentials#refreshService", + "@type": "@id" + }, + "relatedResource": { + "@id": "https://www.w3.org/2018/credentials#relatedResource", + "@type": "@id" + }, + "renderMethod": { + "@id": "https://www.w3.org/2018/credentials#renderMethod", + "@type": "@id" + }, + "termsOfUse": { + "@id": "https://www.w3.org/2018/credentials#termsOfUse", + "@type": "@id" + }, + "validFrom": { + "@id": "https://www.w3.org/2018/credentials#validFrom", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "validUntil": { + "@id": "https://www.w3.org/2018/credentials#validUntil", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" } } }, - "exp": { - "@id": "https://www.iana.org/assignments/jwt#exp", - "@type": "https://www.w3.org/2001/XMLSchema#nonNegativeInteger" - }, - "iat": { - "@id": "https://www.iana.org/assignments/jwt#iat", - "@type": "https://www.w3.org/2001/XMLSchema#nonNegativeInteger" - }, - "iss": { - "@id": "https://www.iana.org/assignments/jose#iss", - "@type": "@id" - }, - "jku": { - "@id": "https://www.iana.org/assignments/jose#jku", - "@type": "@id" - }, - "kid": { - "@id": "https://www.iana.org/assignments/jose#kid", - "@type": "@id" - }, - "nbf": { - "@id": "https://www.iana.org/assignments/jwt#nbf", - "@type": "https://www.w3.org/2001/XMLSchema#nonNegativeInteger" - }, - "sub": { - "@id": "https://www.iana.org/assignments/jose#sub", - "@type": "@id" - }, - "x5u": { - "@id": "https://www.iana.org/assignments/jose#x5u", - "@type": "@id" - }, - "description": "https://schema.org/description", - "digestMultibase": { - "@id": "https://w3id.org/security#digestMultibase", - "@type": "https://w3id.org/security#multibase" - }, - "digestSRI": { - "@id": "https://www.w3.org/2018/credentials#digestSRI", - "@type": "https://www.w3.org/2018/credentials#sriString" + "EnvelopedVerifiableCredential": + "https://www.w3.org/2018/credentials#EnvelopedVerifiableCredential", + + "VerifiablePresentation": { + "@id": "https://www.w3.org/2018/credentials#VerifiablePresentation", + "@context": { + "@protected": true, + + "id": "@id", + "type": "@type", + + "holder": { + "@id": "https://www.w3.org/2018/credentials#holder", + "@type": "@id" + }, + "proof": { + "@id": "https://w3id.org/security#proof", + "@type": "@id", + "@container": "@graph" + }, + "termsOfUse": { + "@id": "https://www.w3.org/2018/credentials#termsOfUse", + "@type": "@id" + }, + "verifiableCredential": { + "@id": "https://www.w3.org/2018/credentials#verifiableCredential", + "@type": "@id", + "@container": "@graph", + "@context": null + } + } }, - "mediaType": { - "@id": "https://schema.org/encodingFormat" + + "EnvelopedVerifiablePresentation": + "https://www.w3.org/2018/credentials#EnvelopedVerifiablePresentation", + + "JsonSchemaCredential": + "https://www.w3.org/2018/credentials#JsonSchemaCredential", + + "JsonSchema": { + "@id": "https://www.w3.org/2018/credentials#JsonSchema", + "@context": { + "@protected": true, + + "id": "@id", + "type": "@type", + + "jsonSchema": { + "@id": "https://www.w3.org/2018/credentials#jsonSchema", + "@type": "@json" + } + } }, - "name": "https://schema.org/name", "BitstringStatusListCredential": "https://www.w3.org/ns/credentials/status#BitstringStatusListCredential", @@ -218,124 +276,66 @@ } }, - "EnvelopedVerifiableCredential": - "https://www.w3.org/2018/credentials#EnvelopedVerifiableCredential", - - "EnvelopedVerifiablePresentation": - "https://www.w3.org/2018/credentials#EnvelopedVerifiablePresentation", - - "JsonSchemaCredential": - "https://www.w3.org/2018/credentials#JsonSchemaCredential", - - "JsonSchema": { - "@id": "https://www.w3.org/2018/credentials#JsonSchema", - "@context": { - "@protected": true, - - "id": "@id", - "type": "@type", - - "jsonSchema": { - "@id": "https://www.w3.org/2018/credentials#jsonSchema", - "@type": "@json" - } - } + "...": { + "@id": "https://www.iana.org/assignments/jwt#..." }, - - "VerifiableCredential": { - "@id": "https://www.w3.org/2018/credentials#VerifiableCredential", - "@context": { - "@protected": true, - - "id": "@id", - "type": "@type", - - "confidenceMethod": { - "@id": "https://www.w3.org/2018/credentials#confidenceMethod", - "@type": "@id" - }, - "credentialSchema": { - "@id": "https://www.w3.org/2018/credentials#credentialSchema", - "@type": "@id" - }, - "credentialStatus": { - "@id": "https://www.w3.org/2018/credentials#credentialStatus", - "@type": "@id" - }, - "credentialSubject": { - "@id": "https://www.w3.org/2018/credentials#credentialSubject", - "@type": "@id" - }, - "description": "https://schema.org/description", - "evidence": { - "@id": "https://www.w3.org/2018/credentials#evidence", - "@type": "@id" - }, - "issuer": { - "@id": "https://www.w3.org/2018/credentials#issuer", - "@type": "@id" - }, - "name": "https://schema.org/name", - "proof": { - "@id": "https://w3id.org/security#proof", - "@type": "@id", - "@container": "@graph" - }, - "refreshService": { - "@id": "https://www.w3.org/2018/credentials#refreshService", - "@type": "@id" - }, - "relatedResource": { - "@id": "https://www.w3.org/2018/credentials#relatedResource", - "@type": "@id" - }, - "renderMethod": { - "@id": "https://www.w3.org/2018/credentials#renderMethod", - "@type": "@id" - }, - "termsOfUse": { - "@id": "https://www.w3.org/2018/credentials#termsOfUse", - "@type": "@id" - }, - "validFrom": { - "@id": "https://www.w3.org/2018/credentials#validFrom", - "@type": "http://www.w3.org/2001/XMLSchema#dateTime" - }, - "validUntil": { - "@id": "https://www.w3.org/2018/credentials#validUntil", - "@type": "http://www.w3.org/2001/XMLSchema#dateTime" - } - } + "_sd": { + "@id": "https://www.iana.org/assignments/jwt#_sd", + "@type": "@json" }, - - "VerifiablePresentation": { - "@id": "https://www.w3.org/2018/credentials#VerifiablePresentation", + "_sd_alg": { + "@id": "https://www.iana.org/assignments/jwt#_sd_alg" + }, + "aud": { + "@id": "https://www.iana.org/assignments/jwt#aud", + "@type": "@id" + }, + "cnf": { + "@id": "https://www.iana.org/assignments/jwt#cnf", "@context": { "@protected": true, - "id": "@id", - "type": "@type", - - "holder": { - "@id": "https://www.w3.org/2018/credentials#holder", - "@type": "@id" - }, - "proof": { - "@id": "https://w3id.org/security#proof", - "@type": "@id", - "@container": "@graph" - }, - "termsOfUse": { - "@id": "https://www.w3.org/2018/credentials#termsOfUse", + "kid": { + "@id": "https://www.iana.org/assignments/jwt#kid", "@type": "@id" }, - "verifiableCredential": { - "@id": "https://www.w3.org/2018/credentials#verifiableCredential", - "@type": "@id", - "@container": "@graph", - "@context": null + "jwk": { + "@id": "https://www.iana.org/assignments/jwt#jwk", + "@type": "@json" } } + }, + "exp": { + "@id": "https://www.iana.org/assignments/jwt#exp", + "@type": "https://www.w3.org/2001/XMLSchema#nonNegativeInteger" + }, + "iat": { + "@id": "https://www.iana.org/assignments/jwt#iat", + "@type": "https://www.w3.org/2001/XMLSchema#nonNegativeInteger" + }, + "iss": { + "@id": "https://www.iana.org/assignments/jose#iss", + "@type": "@id" + }, + "jku": { + "@id": "https://www.iana.org/assignments/jose#jku", + "@type": "@id" + }, + "kid": { + "@id": "https://www.iana.org/assignments/jose#kid", + "@type": "@id" + }, + "nbf": { + "@id": "https://www.iana.org/assignments/jwt#nbf", + "@type": "https://www.w3.org/2001/XMLSchema#nonNegativeInteger" + }, + "sub": { + "@id": "https://www.iana.org/assignments/jose#sub", + "@type": "@id" + }, + "x5u": { + "@id": "https://www.iana.org/assignments/jose#x5u", + "@type": "@id" } } -} +} \ No newline at end of file