From fd402344afd796b1e82af9a6a292b2011298b3b5 Mon Sep 17 00:00:00 2001 From: gabe Date: Fri, 30 Jun 2023 08:51:06 -0700 Subject: [PATCH 1/3] add vc-json-schema to vocab and context --- contexts/credentials/v2 | 22 ++++++++++++++++++++++ vocab/credentials/credentials.jsonld | 2 ++ vocab/credentials/credentials.ttl | 8 ++++++++ vocab/credentials/v2/vocabulary.yml | 10 ++++++++++ vocab/credentials/vocab.csv | 2 ++ 5 files changed, 44 insertions(+) diff --git a/contexts/credentials/v2 b/contexts/credentials/v2 index 9c0d9d238..aa0ae2b08 100644 --- a/contexts/credentials/v2 +++ b/contexts/credentials/v2 @@ -92,6 +92,28 @@ } }, + "JsonSchema2023": { + "@id": + "https://www.w3.org/ns/credentials#JsonSchema2023", + "@context": { + "@protected": true, + + "id": "@id", + "type": "@type" + } + }, + + "CredentialSchema2023": { + "@id": + "https://www.w3.org/ns/credentials#CredentialSchema2023", + "@context": { + "@protected": true, + + "id": "@id", + "type": "@type" + } + }, + "StatusList2021Credential": { "@id": "https://w3id.org/vc/status-list#StatusList2021Credential", diff --git a/vocab/credentials/credentials.jsonld b/vocab/credentials/credentials.jsonld index 305f7d275..19f13abc5 100644 --- a/vocab/credentials/credentials.jsonld +++ b/vocab/credentials/credentials.jsonld @@ -11,6 +11,8 @@ "odrl": "http://www.w3.org/ns/odrl/2/", "xsd": "http://www.w3.org/2001/XMLSchema#", "JsonSchemaValidator2018": "cred:JsonSchemaValidator2018", + "JsonSchema2023": "cred:JsonSchema2023", + "CredentialSchema2023": "cred:CredentialSchema2023", "ManualRefreshService2018": "cred:ManualRefreshService2018", "RefreshService": "cred:RefreshService", "VerifiableCredential": "cred:VerifiableCredential", diff --git a/vocab/credentials/credentials.ttl b/vocab/credentials/credentials.ttl index 8f6c0abd6..dd44bd96d 100644 --- a/vocab/credentials/credentials.ttl +++ b/vocab/credentials/credentials.ttl @@ -19,6 +19,14 @@ cred:JsonSchemaValidator2018 a rdfs:Class; rdfs:label ""@en; rdfs:comment """A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language."""@en; rdfs:isDefinedBy cred: . +cred:JsonSchema2023 a rdfs:Class; + rdfs:label ""@en; + rdfs:comment """A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language."""@en; + rdfs:isDefinedBy cred: . +cred:CredentialSchema2023 a rdfs:Class; + rdfs:label ""@en; + rdfs:comment """A type of validator that can be used to syntactically validate JSON documents using the JSON Schemas packaged as Verifiable Credentials language."""@en; + rdfs:isDefinedBy cred: . cred:ManualRefreshService2018 a rdfs:Class; rdfs:label ""@en; rdfs:comment """A type of refresh service that must be interacted with in a manual fashion."""@en; diff --git a/vocab/credentials/v2/vocabulary.yml b/vocab/credentials/v2/vocabulary.yml index 4230eb139..c6a662da6 100644 --- a/vocab/credentials/v2/vocabulary.yml +++ b/vocab/credentials/v2/vocabulary.yml @@ -23,6 +23,16 @@ class: deprecated: true comment: A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. + - id: JsonSchema2023 + label: JSON schema validator 2023 + upper_value: cred:CredentialSchema + comment: A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. + + - id: CredentialSchema2023 + label: Credential schema validator 2023 + upper_value: cred:CredentialSchema + comment: A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language. + - id: ManualRefreshService2018 label: Manual refresh service 2018 upper_value: cred:RefreshService diff --git a/vocab/credentials/vocab.csv b/vocab/credentials/vocab.csv index e93782f8d..e4db12aab 100644 --- a/vocab/credentials/vocab.csv +++ b/vocab/credentials/vocab.csv @@ -5,6 +5,8 @@ odrl,prefix,,http://www.w3.org/ns/odrl/2/,,,,, xsd,prefix,,http://www.w3.org/2001/XMLSchema#,,,,, ,rdfs:seeAlso,,https://www.w3.org/TR/vc-data-model/,,,,, JsonSchemaValidator2018,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. +JsonSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. +CredentialSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema. ManualRefreshService2018,rdfs:Class,,cred:RefreshService,,,,,A type of refresh service that must be interacted with in a manual fashion. RefreshService,rdfs:Class,Refresh Service,,,,,,A refresh service is a mechanism that can be utilized by software agents to retrieve an updated copy of a `verifiable credential`. VerifiableCredential,rdfs:Class,Verifiable Credential,,,,,,"A `credential` is a set of one or more claims made by an issuer. A `verifiable credential` is a tamper-evident credential that has authorship that can be cryptographically verified. Verifiable credentials can be used to build `verifiable presentations`, which can also be cryptographically verified. The claims in a credential can be about different subjects." From 2fc18cafeeb9700819ad7fd4fb0201eb652dc42d Mon Sep 17 00:00:00 2001 From: Gabe <7622243+decentralgabe@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:33:08 -0500 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Ted Thibodeau Jr --- vocab/credentials/credentials.ttl | 2 +- vocab/credentials/vocab.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vocab/credentials/credentials.ttl b/vocab/credentials/credentials.ttl index dd44bd96d..0adf6b6ec 100644 --- a/vocab/credentials/credentials.ttl +++ b/vocab/credentials/credentials.ttl @@ -25,7 +25,7 @@ cred:JsonSchema2023 a rdfs:Class; rdfs:isDefinedBy cred: . cred:CredentialSchema2023 a rdfs:Class; rdfs:label ""@en; - rdfs:comment """A type of validator that can be used to syntactically validate JSON documents using the JSON Schemas packaged as Verifiable Credentials language."""@en; + rdfs:comment """A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language."""@en; rdfs:isDefinedBy cred: . cred:ManualRefreshService2018 a rdfs:Class; rdfs:label ""@en; diff --git a/vocab/credentials/vocab.csv b/vocab/credentials/vocab.csv index e4db12aab..0348e322f 100644 --- a/vocab/credentials/vocab.csv +++ b/vocab/credentials/vocab.csv @@ -6,7 +6,7 @@ xsd,prefix,,http://www.w3.org/2001/XMLSchema#,,,,, ,rdfs:seeAlso,,https://www.w3.org/TR/vc-data-model/,,,,, JsonSchemaValidator2018,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. JsonSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. -CredentialSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema. +CredentialSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language. ManualRefreshService2018,rdfs:Class,,cred:RefreshService,,,,,A type of refresh service that must be interacted with in a manual fashion. RefreshService,rdfs:Class,Refresh Service,,,,,,A refresh service is a mechanism that can be utilized by software agents to retrieve an updated copy of a `verifiable credential`. VerifiableCredential,rdfs:Class,Verifiable Credential,,,,,,"A `credential` is a set of one or more claims made by an issuer. A `verifiable credential` is a tamper-evident credential that has authorship that can be cryptographically verified. Verifiable credentials can be used to build `verifiable presentations`, which can also be cryptographically verified. The claims in a credential can be about different subjects." From 0475bb3e99ccb3b53c87869d3b56d2448da65146 Mon Sep 17 00:00:00 2001 From: Gabe <7622243+decentralgabe@users.noreply.github.com> Date: Mon, 10 Jul 2023 11:00:32 -0500 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Manu Sporny --- contexts/credentials/v2 | 6 +++--- vocab/credentials/credentials.jsonld | 2 -- vocab/credentials/credentials.ttl | 8 -------- vocab/credentials/v2/vocabulary.yml | 3 +-- vocab/credentials/vocab.csv | 2 -- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/contexts/credentials/v2 b/contexts/credentials/v2 index aa0ae2b08..a6c43f7eb 100644 --- a/contexts/credentials/v2 +++ b/contexts/credentials/v2 @@ -94,7 +94,7 @@ "JsonSchema2023": { "@id": - "https://www.w3.org/ns/credentials#JsonSchema2023", + "https://w3.org/2018/credentials#JsonSchema2023", "@context": { "@protected": true, @@ -103,9 +103,9 @@ } }, - "CredentialSchema2023": { + "VerifiableCredentialSchema2023": { "@id": - "https://www.w3.org/ns/credentials#CredentialSchema2023", + "https://w3.org/2018/credentials#VerifiableCredentialSchema2023", "@context": { "@protected": true, diff --git a/vocab/credentials/credentials.jsonld b/vocab/credentials/credentials.jsonld index 19f13abc5..305f7d275 100644 --- a/vocab/credentials/credentials.jsonld +++ b/vocab/credentials/credentials.jsonld @@ -11,8 +11,6 @@ "odrl": "http://www.w3.org/ns/odrl/2/", "xsd": "http://www.w3.org/2001/XMLSchema#", "JsonSchemaValidator2018": "cred:JsonSchemaValidator2018", - "JsonSchema2023": "cred:JsonSchema2023", - "CredentialSchema2023": "cred:CredentialSchema2023", "ManualRefreshService2018": "cred:ManualRefreshService2018", "RefreshService": "cred:RefreshService", "VerifiableCredential": "cred:VerifiableCredential", diff --git a/vocab/credentials/credentials.ttl b/vocab/credentials/credentials.ttl index 0adf6b6ec..8f6c0abd6 100644 --- a/vocab/credentials/credentials.ttl +++ b/vocab/credentials/credentials.ttl @@ -19,14 +19,6 @@ cred:JsonSchemaValidator2018 a rdfs:Class; rdfs:label ""@en; rdfs:comment """A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language."""@en; rdfs:isDefinedBy cred: . -cred:JsonSchema2023 a rdfs:Class; - rdfs:label ""@en; - rdfs:comment """A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language."""@en; - rdfs:isDefinedBy cred: . -cred:CredentialSchema2023 a rdfs:Class; - rdfs:label ""@en; - rdfs:comment """A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language."""@en; - rdfs:isDefinedBy cred: . cred:ManualRefreshService2018 a rdfs:Class; rdfs:label ""@en; rdfs:comment """A type of refresh service that must be interacted with in a manual fashion."""@en; diff --git a/vocab/credentials/v2/vocabulary.yml b/vocab/credentials/v2/vocabulary.yml index c6a662da6..f4b56e7df 100644 --- a/vocab/credentials/v2/vocabulary.yml +++ b/vocab/credentials/v2/vocabulary.yml @@ -28,9 +28,8 @@ class: upper_value: cred:CredentialSchema comment: A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. - - id: CredentialSchema2023 + - id: VerifiableCredentialSchema2023 label: Credential schema validator 2023 - upper_value: cred:CredentialSchema comment: A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language. - id: ManualRefreshService2018 diff --git a/vocab/credentials/vocab.csv b/vocab/credentials/vocab.csv index 0348e322f..e93782f8d 100644 --- a/vocab/credentials/vocab.csv +++ b/vocab/credentials/vocab.csv @@ -5,8 +5,6 @@ odrl,prefix,,http://www.w3.org/ns/odrl/2/,,,,, xsd,prefix,,http://www.w3.org/2001/XMLSchema#,,,,, ,rdfs:seeAlso,,https://www.w3.org/TR/vc-data-model/,,,,, JsonSchemaValidator2018,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. -JsonSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language. -CredentialSchema2023,rdfs:Class,,,,,,,A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language. ManualRefreshService2018,rdfs:Class,,cred:RefreshService,,,,,A type of refresh service that must be interacted with in a manual fashion. RefreshService,rdfs:Class,Refresh Service,,,,,,A refresh service is a mechanism that can be utilized by software agents to retrieve an updated copy of a `verifiable credential`. VerifiableCredential,rdfs:Class,Verifiable Credential,,,,,,"A `credential` is a set of one or more claims made by an issuer. A `verifiable credential` is a tamper-evident credential that has authorship that can be cryptographically verified. Verifiable credentials can be used to build `verifiable presentations`, which can also be cryptographically verified. The claims in a credential can be about different subjects."