diff --git a/docs/credentials-with-issuer-dependent-terms.json b/docs/credentials-with-issuer-dependent-terms.json index c9be7261c..db6838472 100644 --- a/docs/credentials-with-issuer-dependent-terms.json +++ b/docs/credentials-with-issuer-dependent-terms.json @@ -120,7 +120,7 @@ "count": 0 }, { - "type": "GS1PrefixLicenceCredential", + "type": "GS1PrefixLicenseCredential", "count": 0 }, { @@ -128,7 +128,7 @@ "count": 0 }, { - "type": "GS1IdentificationKeyLicenceCredential", + "type": "GS1IdentificationKeyLicenseCredential", "count": 0 }, { @@ -140,11 +140,11 @@ "count": 0 }, { - "type": "GS1CompanyPrefixLicenceCredential", + "type": "GS1CompanyPrefixLicenseCredential", "count": 0 }, { - "type": "GS18PrefixLicenceCredential", + "type": "GS18PrefixLicenseCredential", "count": 0 }, { diff --git a/docs/index.html b/docs/index.html index 72f3ee462..2feddec22 100644 --- a/docs/index.html +++ b/docs/index.html @@ -821,7 +821,7 @@
Product Identifier Verification from Company Prefix License
Product Identifier Verification from Company Prefix License

- A GS1 Member Organization issues GS1 Company Prefix Licence Credential (1), which is presented to the GS1 User Company (2). + A GS1 Member Organization issues GS1 Company Prefix License Credential (1), which is presented to the GS1 User Company (2).

The GS1 User Company issues GS1 Key Credential (3) for GTIN identification of a product. @@ -841,7 +841,7 @@

Product Identifier Verification from Identification Key License
Product Identifier Verification from Identification Key License

- A GS1 Member Organization issues GS1 Company Identification Key Licence Credential (1), which is presented to the GS1 User Company (2). + A GS1 Member Organization issues GS1 Company Identification Key License Credential (1), which is presented to the GS1 User Company (2).

The GS1 User Company issues GS1 Key Credential (3) for GTIN identification of a product. @@ -861,10 +861,10 @@

GS1 Prefix License Verification
GS1 Prefix License Verification

- GS1 Global Office issues GS1 Prefix Licence Credential (1) about a GS1 Member Organization. + GS1 Global Office issues GS1 Prefix License Credential (1) about a GS1 Member Organization.

- In conjunction with verification of a GS1 User Company's claims, if the GS1 Prefix Licence Credential of an issuing GS1 Member Organization is not already cached, or if a cached GS1 Prefix Licence Credential has been revoked, the verifier fetches the corresponding GS1 Prefix Licence Credential which is publicly avaiable from GS1 Global Office (2). + In conjunction with verification of a GS1 User Company's claims, if the GS1 Prefix License Credential of an issuing GS1 Member Organization is not already cached, or if a cached GS1 Prefix License Credential has been revoked, the verifier fetches the corresponding GS1 Prefix License Credential which is publicly avaiable from GS1 Global Office (2).

diff --git a/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml index 21ffa0273..0b5c49bb1 100644 --- a/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml +++ b/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml @@ -1,11 +1,11 @@ $linkedData: - term: GS18PrefixLicenceCredential - '@id': https://w3id.org/traceability#GS18PrefixLicenceCredential -title: GS1-8 Prefix Licence Credential + term: GS18PrefixLicenseCredential + '@id': https://w3id.org/traceability#GS18PrefixLicenseCredential +title: GS1-8 Prefix License Credential tags: - eCommerce description: >- - A GS1-8 Prefix is issued by GS1 Global Office and allocated a GS1 Member Organization or to itself for the purpose of issuing GS1 identification key licences for GTIN-8s. + A GS1-8 Prefix is issued by GS1 Global Office and allocated a GS1 Member Organization or to itself for the purpose of issuing GS1 identification key licenses for GTIN-8s. type: object properties: '@context': @@ -13,29 +13,29 @@ properties: readOnly: true const: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ default: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ items: type: string enum: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ type: type: array readOnly: true const: - VerifiableCredential - - GS18PrefixLicenceCredential + - GS18PrefixLicenseCredential default: - VerifiableCredential - - GS18PrefixLicenceCredential + - GS18PrefixLicenseCredential items: type: string enum: - VerifiableCredential - - GS18PrefixLicenceCredential + - GS18PrefixLicenseCredential id: description: A resolvable URI where this credential is stored. Note that the URI contains the GS1-8 Prefix. type: string @@ -54,8 +54,8 @@ properties: description: The url of the schema file to validate the shape of the json object type: string format: uri - example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenceCredential.yml - default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenceCredential.yml + example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml + default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml readOnly: true type: title: Type @@ -86,16 +86,16 @@ properties: organizationName: description: The name of the organization expressed in text. type: string - licenceValue: + licenseValue: description: The GS1-8 Prefix. type: string - alternativeLicenceValue: - description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero. + alternativeLicenseValue: + description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero. type: string required: - partyGLN - organizationName - - licenceValue + - licenseValue credentialStatus: type: object proof: @@ -111,12 +111,12 @@ example: |- { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://ref.gs1.org/gs1/vc/licence-context/" + "https://ref.gs1.org/gs1/vc/license-context/" ], - "id": "https://id.gs1.org/vc/licence/gs1_8_prefix/754", + "id": "https://id.gs1.org/vc/license/gs1_8_prefix/754", "type": [ "VerifiableCredential", - "GS18PrefixLicenceCredential" + "GS18PrefixLicenseCredential" ], "issuer": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "issuanceDate": "2005-01-01T00:00:00Z", @@ -124,10 +124,10 @@ example: |- "id": "did:web:www.gs1ca.org", "partyGLN": "7541230000000", "organizationName": "GS1 Canada", - "licenceValue": "754" + "licenseValue": "754" }, "credentialStatus": { - "id": "https://id.gs1.org/vc/licence/status/gs1_8_prefix/754", + "id": "https://id.gs1.org/vc/license/status/gs1_8_prefix/754", "type": "CredentialStatusList2021" } } \ No newline at end of file diff --git a/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml index 29ba13280..1acd86e29 100644 --- a/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml +++ b/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml @@ -1,11 +1,11 @@ $linkedData: - term: GS1CompanyPrefixLicenceCredential - '@id': https://w3id.org/traceability#GS1CompanyPrefixLicenceCredential -title: GS1 Company Prefix Licence Credential + term: GS1CompanyPrefixLicenseCredential + '@id': https://w3id.org/traceability#GS1CompanyPrefixLicenseCredential +title: GS1 Company Prefix License Credential tags: - eCommerce description: >- - A GS1 Company Prefix Licence is issued by a GS1 Member Organization or GS1 Global Office and allocated to a user company or to itself for the purpose of generating tier 1 GS1 identification keys. + A GS1 Company Prefix License is issued by a GS1 Member Organization or GS1 Global Office and allocated to a user company or to itself for the purpose of generating tier 1 GS1 identification keys. type: object properties: '@context': @@ -13,29 +13,29 @@ properties: readOnly: true const: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ default: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ items: type: string enum: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ type: type: array readOnly: true const: - VerifiableCredential - - GS1CompanyPrefixLicenceCredential + - GS1CompanyPrefixLicenseCredential default: - VerifiableCredential - - GS1CompanyPrefixLicenceCredential + - GS1CompanyPrefixLicenseCredential items: type: string enum: - VerifiableCredential - - GS1CompanyPrefixLicenceCredential + - GS1CompanyPrefixLicenseCredential id: description: A DID for this credential. The ID is not resolvable because the credential is sensitive information and only the user company can decide when it is presented. type: string @@ -54,8 +54,8 @@ properties: description: The url of the schema file to validate the shape of the json object type: string format: uri - example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenceCredential.yml - default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenceCredential.yml + example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml + default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml readOnly: true type: title: Type @@ -74,18 +74,18 @@ properties: description: The name of the organization expressed in text. type: string extendsCredential: - description: Reference to the credential that this one extends. Provides a complete chain to the GS1 Prefix or GS1-8 Prefix licence credential issued by GS1 Global Office. + description: Reference to the credential that this one extends. Provides a complete chain to the GS1 Prefix or GS1-8 Prefix license credential issued by GS1 Global Office. type: string - licenceValue: + licenseValue: description: The GS1 Prefix. type: string - alternativeLicenceValue: - description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero. + alternativeLicenseValue: + description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero. type: string required: - partyGLN - organizationName - - licenceValue + - licenseValue credentialStatus: type: object proof: @@ -101,12 +101,12 @@ example: |- { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://ref.gs1.org/gs1/vc/licence-context/" + "https://ref.gs1.org/gs1/vc/license-context/" ], "id": "did:example:b6d13abe-464d-4bb9-a568-b6d81efd57e3", "type": [ "VerifiableCredential", - "GS1CompanyPrefixLicenceCredential" + "GS1CompanyPrefixLicenseCredential" ], "issuer": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "issuanceDate": "2020-11-19T14:56:37Z", @@ -114,8 +114,8 @@ example: |- "id": "did:web:www.example.ca", "partyGLN": "7541234000006", "organizationName": "Example Company", - "extendsCredential": "https://id.gs1.org/vc/licence/gs1_prefix/754", - "licenceValue": "7541234" + "extendsCredential": "https://id.gs1.org/vc/license/gs1_prefix/754", + "licenseValue": "7541234" }, "credentialStatus": { "id": "https://www.gs1ca.org/credentials/gs1_company_prefix/status/7541234", diff --git a/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml b/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml index 68726fe64..1a8678883 100644 --- a/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml +++ b/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml @@ -72,7 +72,7 @@ properties: description: URI of the party to which the authority to declare data is delegated. type: string delegation: - description: References to the licence or key credentials that have been delegated to the credential subject. Within GS1, provides a complete chain to the GS1 Prefix licence credential issued by GS1 Global Office. If a URI is to a licence credential, all keys within the licence are delegated to the credential subject. If a key entry is incomplete (e.g., the delegation is for serial-level data but only the GTIN key credential is provided), all additional attributes below the path in the key are delegated to the credential subject. The delegation URIs do not need to be resolvable, and the fact that this credential is presented does not require that the delegation credentials be presented as well. It is up to the holder to decide whether to present the delegation credentials alongside this one. + description: References to the license or key credentials that have been delegated to the credential subject. Within GS1, provides a complete chain to the GS1 Prefix license credential issued by GS1 Global Office. If a URI is to a license credential, all keys within the license are delegated to the credential subject. If a key entry is incomplete (e.g., the delegation is for serial-level data but only the GTIN key credential is provided), all additional attributes below the path in the key are delegated to the credential subject. The delegation URIs do not need to be resolvable, and the fact that this credential is presented does not require that the delegation credentials be presented as well. It is up to the holder to decide whether to present the delegation credentials alongside this one. type: array items: type: string diff --git a/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml index 90d80866f..8316a36f2 100644 --- a/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml +++ b/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml @@ -1,11 +1,11 @@ $linkedData: - term: GS1IdentificationKeyLicenceCredential - '@id': https://w3id.org/traceability#GS1IdentificationKeyLicenceCredential -title: GS1 Identification Key Licence Credential + term: GS1IdentificationKeyLicenseCredential + '@id': https://w3id.org/traceability#GS1IdentificationKeyLicenseCredential +title: GS1 Identification Key License Credential tags: - eCommerce description: >- - A GS1 identification key licence is issued by a GS1 Member Organization or GS1 Global Office and entitles the user company to allocate that key to an object. + A GS1 identification key license is issued by a GS1 Member Organization or GS1 Global Office and entitles the user company to allocate that key to an object. type: object properties: '@context': @@ -13,32 +13,32 @@ properties: readOnly: true const: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://w3id.org/vc/status-list/2021/v1 default: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://w3id.org/vc/status-list/2021/v1 items: type: string enum: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://w3id.org/vc/status-list/2021/v1 type: type: array readOnly: true const: - VerifiableCredential - - GS1IdentificationKeyLicenceCredential + - GS1IdentificationKeyLicenseCredential default: - VerifiableCredential - - GS1IdentificationKeyLicenceCredential + - GS1IdentificationKeyLicenseCredential items: type: string enum: - VerifiableCredential - - GS1IdentificationKeyLicenceCredential + - GS1IdentificationKeyLicenseCredential id: description: A DID for this credential. The ID is not resolvable because the credential is sensitive information and only the user company can decide when it is presented. type: string @@ -57,8 +57,8 @@ properties: description: The url of the schema file to validate the shape of the json object type: string format: uri - example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1IdentificationKeyLicenceCredential.yml - default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1IdentificationKeyLicenceCredential.yml + example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml + default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml readOnly: true type: title: Type @@ -73,7 +73,7 @@ properties: description: URI of the user company to whom the GTIN has been licensed. type: string extendsCredential: - description: URI of the GS1 Prefix licence that this GTIN licence extends. + description: URI of the GS1 Prefix license that this GTIN license extends. type: string partyGLN: description: A Global Location Number (GLN) is the GS1 Identification Key used to identify physical locations or parties. The key comprises a GS1 Company Prefix, Location Reference and Check Digit. For more information see https://www.gs1.org/gln. @@ -81,11 +81,11 @@ properties: organizationName: description: The name of the organization expressed in text. type: string - licenceValue: + licenseValue: description: Identification key. type: string - alternativeLicenceValue: - description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero. + alternativeLicenseValue: + description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero. type: string identificationKeyType: type: string @@ -104,7 +104,7 @@ properties: - GMN required: - id - - licenceValue + - licenseValue credentialStatus: type: object proof: @@ -121,13 +121,13 @@ example: |- { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://ref.gs1.org/gs1/vc/licence-context/", + "https://ref.gs1.org/gs1/vc/license-context/", "https://w3id.org/vc/status-list/2021/v1" ], "id": "did:example:3b306a01-eada-420e-bf5d-caa603042a61", "type": [ "VerifiableCredential", - "GS1IdentificationKeyLicenceCredential" + "GS1IdentificationKeyLicenseCredential" ], "issuer": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "issuanceDate": "2020-11-19T14:56:37Z", @@ -135,9 +135,9 @@ example: |- "id": "did:web:www.example.ca", "partyGLN": "7541234000006", "organizationName": "Example Company", - "extendsCredential": "https://id.gs1.org/vc/licence/gs1_prefix/754", - "licenceValue": "7541234555551", - "alternativeLicenceValue": "754123455555", + "extendsCredential": "https://id.gs1.org/vc/license/gs1_prefix/754", + "licenseValue": "7541234555551", + "alternativeLicenseValue": "754123455555", "identificationKeyType": "GTIN" }, "credentialStatus": { diff --git a/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml b/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml index c7961dd56..1904fcb30 100644 --- a/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml +++ b/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml @@ -15,19 +15,19 @@ properties: const: - https://www.w3.org/2018/credentials/v1 - https://ref.gs1.org/gs1/vc/declaration-context/ - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://w3id.org/vc/status-list/2021/v1 default: - https://www.w3.org/2018/credentials/v1 - https://ref.gs1.org/gs1/vc/declaration-context/ - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://w3id.org/vc/status-list/2021/v1 items: type: string enum: - https://www.w3.org/2018/credentials/v1 - https://ref.gs1.org/gs1/vc/declaration-context/ - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://w3id.org/vc/status-list/2021/v1 type: type: array @@ -77,13 +77,13 @@ properties: description: The GS1 Digital Link URI for the GTIN. type: string extendsCredential: - description: Reference to the credential that this one extends. Provides a complete chain to the GS1 Prefix or GS1-8 Prefix licence credential issued by GS1 Global Office. + description: Reference to the credential that this one extends. Provides a complete chain to the GS1 Prefix or GS1-8 Prefix license credential issued by GS1 Global Office. type: string - licenceValue: + licenseValue: description: The GS1 Prefix. type: string - alternativeLicenceValue: - description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero. + alternativeLicenseValue: + description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero. type: string required: - id @@ -104,7 +104,7 @@ example: |- "@context": [ "https://www.w3.org/2018/credentials/v1", "https://ref.gs1.org/gs1/vc/declaration-context/", - "https://ref.gs1.org/gs1/vc/licence-context/", + "https://ref.gs1.org/gs1/vc/license-context/", "https://w3id.org/vc/status-list/2021/v1" ], "id": "did:example:60cda318-a0a7-4e39-b600-ea38bf68a31f", diff --git a/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml index ae70e4c34..38ca42375 100644 --- a/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml +++ b/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml @@ -1,11 +1,11 @@ $linkedData: - term: GS1PrefixLicenceCredential - '@id': https://w3id.org/traceability#GS1PrefixLicenceCredential -title: GS1 Prefix Licence Credential + term: GS1PrefixLicenseCredential + '@id': https://w3id.org/traceability#GS1PrefixLicenseCredential +title: GS1 Prefix License Credential tags: - eCommerce description: >- - A GS1 Prefix is issued by GS1 Global Office and allocated a GS1 Member Organization or to itself for the purpose of issuing GS1 Company Prefix or GS1 identification key licences. + A GS1 Prefix is issued by GS1 Global Office and allocated a GS1 Member Organization or to itself for the purpose of issuing GS1 Company Prefix or GS1 identification key licenses. type: object properties: '@context': @@ -13,29 +13,29 @@ properties: readOnly: true const: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ default: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ items: type: string enum: - https://www.w3.org/2018/credentials/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ type: type: array readOnly: true const: - VerifiableCredential - - GS1PrefixLicenceCredential + - GS1PrefixLicenseCredential default: - VerifiableCredential - - GS1PrefixLicenceCredential + - GS1PrefixLicenseCredential items: type: string enum: - VerifiableCredential - - GS1PrefixLicenceCredential + - GS1PrefixLicenseCredential id: description: A resolvable URI where this credential is stored. Note that the URI contains the GS1 Prefix. type: string @@ -54,8 +54,8 @@ properties: description: The url of the schema file to validate the shape of the json object type: string format: uri - example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1PrefixLicenceCredential.yml - default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1PrefixLicenceCredential.yml + example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml + default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml readOnly: true type: title: Type @@ -73,16 +73,16 @@ properties: organizationName: description: The name of the organization expressed in text. type: string - licenceValue: + licenseValue: description: The GS1 Prefix. type: string - alternativeLicenceValue: - description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero. + alternativeLicenseValue: + description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero. type: string required: - partyGLN - organizationName - - licenceValue + - licenseValue credentialStatus: type: object proof: @@ -98,12 +98,12 @@ example: |- { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://ref.gs1.org/gs1/vc/licence-context/" + "https://ref.gs1.org/gs1/vc/license-context/" ], - "id": "https://id.gs1.org/vc/licence/gs1_prefix/754", + "id": "https://id.gs1.org/vc/license/gs1_prefix/754", "type": [ "VerifiableCredential", - "GS1PrefixLicenceCredential" + "GS1PrefixLicenseCredential" ], "issuer": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "issuanceDate": "2005-01-01T00:00:00Z", @@ -111,10 +111,10 @@ example: |- "id": "did:web:www.gs1ca.org", "partyGLN": "7541230000000", "organizationName": "GS1 Canada", - "licenceValue": "754" + "licenseValue": "754" }, "credentialStatus": { - "id": "https://id.gs1.org/vc/licence/status/gs1_prefix/754", + "id": "https://id.gs1.org/vc/license/status/gs1_prefix/754", "type": "CredentialStatusList2021" } } \ No newline at end of file diff --git a/docs/sections/workflows.html b/docs/sections/workflows.html index f8d2b775e..1cfbec8f0 100644 --- a/docs/sections/workflows.html +++ b/docs/sections/workflows.html @@ -55,8 +55,6 @@

CBP Steel Tech Demo 2023

B-->>B: issue Mill Test Report Credential B->>A: present Mill Test Report Credential B->>F: present Mill Test Report Credential - C-->>C: issue SIMA Import License Application Credential - C->>D: present SIMA Import License Application Credential D-->>D: issue SIMA Import License Credential D->>F: present SIMA Import License Credential D->>C: present SIMA Import License Credential @@ -71,7 +69,7 @@

CBP Steel Tech Demo 2023

CBP Steel Tech Demo 2023

Credentials Used:
    -
  1. Purchase Order Credential
  2. Intent To Import Credential
  3. CTPAT Credential
  4. Commercial Invoice Credential
  5. Mill Test Report Credential
  6. SIMA Import License Application Credential
  7. SIMA Import License Credential
  8. Entry Number Credential
  9. Multimodal Bill Of Lading Credential
  10. +
  11. Purchase Order Credential
  12. Intent To Import Credential
  13. CTPAT Credential
  14. Commercial Invoice Credential
  15. Mill Test Report Credential
  16. SIMA Import License Credential
  17. Entry Number Credential
  18. Multimodal Bill Of Lading Credential
id: https://w3id.org/traceability/#cbp-steel-tech-demo-2023
 title: CBP Steel Tech Demo 2023
@@ -90,8 +88,6 @@ 

CBP Steel Tech Demo 2023

name: Commercial Invoice Credential - id: https://w3id.org/traceability/#MillTestReportCredential name: Mill Test Report Credential - - id: https://w3id.org/traceability/#SIMASteelImportLicenseApplicationCredential - name: SIMA Import License Application Credential - id: https://w3id.org/traceability/#SIMASteelImportLicenseCredential name: SIMA Import License Credential - id: https://w3id.org/traceability/#EntryNumberCredential @@ -119,8 +115,6 @@

CBP Steel Tech Demo 2023

B-->>B: issue Mill Test Report Credential B->>A: present Mill Test Report Credential B->>F: present Mill Test Report Credential - C-->>C: issue SIMA Import License Application Credential - C->>D: present SIMA Import License Application Credential D-->>D: issue SIMA Import License Credential D->>F: present SIMA Import License Credential D->>C: present SIMA Import License Credential diff --git a/packages/traceability-schemas/services/contexts.js b/packages/traceability-schemas/services/contexts.js index ea12e82d1..73798eef9 100644 --- a/packages/traceability-schemas/services/contexts.js +++ b/packages/traceability-schemas/services/contexts.js @@ -4,7 +4,7 @@ const path = require('path'); const contexts = { 'https://www.w3.org/ns/activitystreams': require('./contexts/activity-pub.json'), 'https://www.w3.org/2018/credentials/v1': require('./contexts/vc-v1.json'), - 'https://ref.gs1.org/gs1/vc/licence-context/': require('./contexts/gs1-license-context.json'), + 'https://ref.gs1.org/gs1/vc/license-context/': require('./contexts/gs1-license-context.json'), 'https://ref.gs1.org/gs1/vc/declaration-context/': require('./contexts/declaration-context.json'), 'https://ref.gs1.org/gs1/vc/trade-item-context/': require('./contexts/trade-item-context.json'), 'https://w3id.org/vc/status-list/2021/v1': require('./contexts/status-list-v1.json'), diff --git a/packages/traceability-schemas/services/contexts/gs1-license-context.json b/packages/traceability-schemas/services/contexts/gs1-license-context.json index b308f38a0..43e83a32e 100644 --- a/packages/traceability-schemas/services/contexts/gs1-license-context.json +++ b/packages/traceability-schemas/services/contexts/gs1-license-context.json @@ -8,23 +8,23 @@ "gs1": "https://gs1.org/voc/", "language": "@language", "value": "@value", - "GS1PrefixLicenceCredential": { - "@id": "gs1:GS1PrefixLicenceCredential" + "GS1PrefixLicenseCredential": { + "@id": "gs1:GS1PrefixLicenseCredential" }, - "GS18PrefixLicenceCredential": { - "@id": "gs1:GS18PrefixLicenceCredential" + "GS18PrefixLicenseCredential": { + "@id": "gs1:GS18PrefixLicenseCredential" }, - "GS1CompanyPrefixLicenceCredential": { - "@id": "gs1:GS1CompanyPrefixLicenceCredential" + "GS1CompanyPrefixLicenseCredential": { + "@id": "gs1:GS1CompanyPrefixLicenseCredential" }, - "GS1IdentificationKeyLicenceCredential": { - "@id": "gs1:GS1IdentificationKeyLicenceCredential" + "GS1IdentificationKeyLicenseCredential": { + "@id": "gs1:GS1IdentificationKeyLicenseCredential" }, - "GS1DelegatedPrefixLicenceCredential": { - "@id": "gs1:GS1DelegatedPrefixLicenceCredential" + "GS1DelegatedPrefixLicenseCredential": { + "@id": "gs1:GS1DelegatedPrefixLicenseCredential" }, - "GS1DelegatedIdentificationKeyLicenceCredential": { - "@id": "gs1:GS1DelegatedIdentificationKeyLicenceCredential" + "GS1DelegatedIdentificationKeyLicenseCredential": { + "@id": "gs1:GS1DelegatedIdentificationKeyLicenseCredential" }, "partyGLN": { "@id": "gs1:partyGLN" @@ -36,23 +36,23 @@ "@id": "gs1:extendsCredential", "@type": "@id" }, - "licenceValue": { - "@id": "gs1:licenceValue" + "licenseValue": { + "@id": "gs1:licenseValue" }, - "alternativeLicenceValue": { - "@id": "gs1:alternativeLicenceValue" + "alternativeLicenseValue": { + "@id": "gs1:alternativeLicenseValue" }, "identificationKeyType": { "@id": "gs1:identificationKeyType" }, - "isGS1CompanyPrefixLicenceAllowed": { - "@id": "gs1:isGS1CompanyPrefixLicenceAllowed" + "isGS1CompanyPrefixLicenseAllowed": { + "@id": "gs1:isGS1CompanyPrefixLicenseAllowed" }, "isExactMatchRequired": { "@id": "gs1:isExactMatchRequired" }, - "isGS1IdentificationKeyLicenceAllowed": { - "@id": "gs1:isGS1IdentificationKeyLicenceAllowed" + "isGS1IdentificationKeyLicenseAllowed": { + "@id": "gs1:isGS1IdentificationKeyLicenseAllowed" } } } \ No newline at end of file diff --git a/packages/traceability-tests/examples/v2.json b/packages/traceability-tests/examples/v2.json index 4ca84d62d..7c9237772 100644 --- a/packages/traceability-tests/examples/v2.json +++ b/packages/traceability-tests/examples/v2.json @@ -9,7 +9,7 @@ }, "examples": [ { - "issued": "eyJpc3MiOiJkaWQ6andrOmV5SnJkSGtpT2lKRlF5SXNJbU55ZGlJNklsQXRNemcwSWl3aVlXeG5Jam9pUlZNek9EUWlMQ0o0SWpvaU9XcHpSbEpXVm1weFNsazFTa2w1U25JMU9HZEZRblZ5YW10emFreHdUVUp2V1ZaRFpUWmxNRUo2VXpoQlV6Tk1RWGx5TjNoTGVGTm5VRTlwVUdOSFRTSXNJbmtpT2lKaWRIUk1YMlpWYTNSa2NpMU1hSGhOWTNwSmFtbDBaRnBXY0c5cGFYcHBVR2xuT0cxbk9ERmlkR1ZVVW0welFtcGFMV3c0ZFU1cWRrcExZV3RuVWpOQ0luMCIsImtpZCI6IiMwIiwiYWxnIjoiRVMzODQiLCJjdHkiOiJ2YytsZCtqc29uIn0.eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vd3d3LnczLm9yZy9ucy9hY3Rpdml0eXN0cmVhbXMiXSwiaWQiOiJ1cm46dXVpZDo2NmM3Y2I3MC03MDJhLTRjMWMtOTg3ZC02NmU1NjQ2YzQ3MjkiLCJ0eXBlIjpbIlZlcmlmaWFibGVDcmVkZW50aWFsIiwiQWN0aXZpdHlQdWJBY3RvckNhcmQiXSwiY3JlZGVudGlhbFNjaGVtYSI6eyJpZCI6Imh0dHBzOi8vdzNjLWNjZy5naXRodWIuaW8vdHJhY2VhYmlsaXR5LXZvY2FiL29wZW5hcGkvY29tcG9uZW50cy9zY2hlbWFzL2NyZWRlbnRpYWxzL0FjdGl2aXR5UHViQWN0b3JDYXJkLnltbCIsInR5cGUiOiJKc29uU2NoZW1hIn0sImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDUtMjFUMTU6Mzk6NTcuOTQ0WiIsImlzc3VlciI6eyJpZCI6ImRpZDpqd2s6ZXlKcmRIa2lPaUpGUXlJc0ltTnlkaUk2SWxBdE16ZzBJaXdpWVd4bklqb2lSVk16T0RRaUxDSjRJam9pT1dwelJsSldWbXB4U2xrMVNrbDVTbkkxT0dkRlFuVnlhbXR6YWt4d1RVSnZXVlpEWlRabE1FSjZVemhCVXpOTVFYbHlOM2hMZUZOblVFOXBVR05IVFNJc0lua2lPaUppZEhSTVgyWlZhM1JrY2kxTWFIaE5ZM3BKYW1sMFpGcFdjRzlwYVhwcFVHbG5PRzFuT0RGaWRHVlVVbTB6UW1wYUxXdzRkVTVxZGtwTFlXdG5Vak5DSW4wIn0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7InR5cGUiOlsiUGVyc29uIl0sImlkIjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tLyIsImZvbGxvd2luZyI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mb2xsb3dpbmcuanNvbiIsImZvbGxvd2VycyI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mb2xsb3dlcnMuanNvbiIsImxpa2VkIjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2xpa2VkLmpzb24iLCJpbmJveCI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9pbmJveC5qc29uIiwib3V0Ym94IjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2ZlZWQuanNvbiIsInByZWZlcnJlZFVzZXJuYW1lIjoia2Vuem9pc2hpaSIsIm5hbWUiOiLnn7PkupXlgaXolLUiLCJzdW1tYXJ5Ijoi44GT44Gu5pa544Gv44Gf44Gg44Gu5L6L44Gn44GZIiwiaWNvbiI6WyJodHRwczovL2tlbnpvaXNoaWkuZXhhbXBsZS5jb20vaW1hZ2UvMTY1OTg3YWtscmU0Il19fQ.Ui-7SiFYBY3pwFdq1EJknRsY05iAMtFO3sIjhuWqC1lD_i2VCHv0nZgXy4VPwkdMhDhOSXBaY-mAOk_Li-OVT3D580Fkr_USadCjgYg3jAgiEqAWtwg75eDbkw4dEq7N", + "issued": "eyJpc3MiOiJkaWQ6andrOmV5SnJkSGtpT2lKRlF5SXNJbU55ZGlJNklsQXRNemcwSWl3aVlXeG5Jam9pUlZNek9EUWlMQ0o0SWpvaU9XcHpSbEpXVm1weFNsazFTa2w1U25JMU9HZEZRblZ5YW10emFreHdUVUp2V1ZaRFpUWmxNRUo2VXpoQlV6Tk1RWGx5TjNoTGVGTm5VRTlwVUdOSFRTSXNJbmtpT2lKaWRIUk1YMlpWYTNSa2NpMU1hSGhOWTNwSmFtbDBaRnBXY0c5cGFYcHBVR2xuT0cxbk9ERmlkR1ZVVW0welFtcGFMV3c0ZFU1cWRrcExZV3RuVWpOQ0luMCIsImtpZCI6IiMwIiwiYWxnIjoiRVMzODQiLCJjdHkiOiJ2YytsZCtqc29uIn0.eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vd3d3LnczLm9yZy9ucy9hY3Rpdml0eXN0cmVhbXMiXSwiaWQiOiJ1cm46dXVpZDoxNmQ1YTY2Yy1kNDIxLTRmZGUtOGY0Yy02YWIxNTkwODIyNzQiLCJ0eXBlIjpbIlZlcmlmaWFibGVDcmVkZW50aWFsIiwiQWN0aXZpdHlQdWJBY3RvckNhcmQiXSwiY3JlZGVudGlhbFNjaGVtYSI6eyJpZCI6Imh0dHBzOi8vdzNjLWNjZy5naXRodWIuaW8vdHJhY2VhYmlsaXR5LXZvY2FiL29wZW5hcGkvY29tcG9uZW50cy9zY2hlbWFzL2NyZWRlbnRpYWxzL0FjdGl2aXR5UHViQWN0b3JDYXJkLnltbCIsInR5cGUiOiJKc29uU2NoZW1hIn0sImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDUtMjFUMTU6Mzk6NTcuOTQ0WiIsImlzc3VlciI6eyJpZCI6ImRpZDpqd2s6ZXlKcmRIa2lPaUpGUXlJc0ltTnlkaUk2SWxBdE16ZzBJaXdpWVd4bklqb2lSVk16T0RRaUxDSjRJam9pT1dwelJsSldWbXB4U2xrMVNrbDVTbkkxT0dkRlFuVnlhbXR6YWt4d1RVSnZXVlpEWlRabE1FSjZVemhCVXpOTVFYbHlOM2hMZUZOblVFOXBVR05IVFNJc0lua2lPaUppZEhSTVgyWlZhM1JrY2kxTWFIaE5ZM3BKYW1sMFpGcFdjRzlwYVhwcFVHbG5PRzFuT0RGaWRHVlVVbTB6UW1wYUxXdzRkVTVxZGtwTFlXdG5Vak5DSW4wIn0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7InR5cGUiOlsiUGVyc29uIl0sImlkIjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tLyIsImZvbGxvd2luZyI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mb2xsb3dpbmcuanNvbiIsImZvbGxvd2VycyI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mb2xsb3dlcnMuanNvbiIsImxpa2VkIjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2xpa2VkLmpzb24iLCJpbmJveCI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9pbmJveC5qc29uIiwib3V0Ym94IjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2ZlZWQuanNvbiIsInByZWZlcnJlZFVzZXJuYW1lIjoia2Vuem9pc2hpaSIsIm5hbWUiOiLnn7PkupXlgaXolLUiLCJzdW1tYXJ5Ijoi44GT44Gu5pa544Gv44Gf44Gg44Gu5L6L44Gn44GZIiwiaWNvbiI6WyJodHRwczovL2tlbnpvaXNoaWkuZXhhbXBsZS5jb20vaW1hZ2UvMTY1OTg3YWtscmU0Il19fQ.dwHaTFPMwWHuz45UJmnBD6k1au-uGeI6nw-xWI_4ZWsZCbGSho0GRsr531i2FsqYb4q4eav8JRTLPYZZMp2UZ-WMg7_JVXMGl4VsUaUQ20d73XKnXLpnVhRO9VR7C3cP", "verified": { "protectedHeader": { "iss": "did:jwk:eyJrdHkiOiJFQyIsImNydiI6IlAtMzg0IiwiYWxnIjoiRVMzODQiLCJ4IjoiOWpzRlJWVmpxSlk1Skl5SnI1OGdFQnVyamtzakxwTUJvWVZDZTZlMEJ6UzhBUzNMQXlyN3hLeFNnUE9pUGNHTSIsInkiOiJidHRMX2ZVa3Rkci1MaHhNY3pJaml0ZFpWcG9paXppUGlnOG1nODFidGVUUm0zQmpaLWw4dU5qdkpLYWtnUjNCIn0", @@ -22,7 +22,7 @@ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/ns/activitystreams" ], - "id": "urn:uuid:66c7cb70-702a-4c1c-987d-66e5646c4729", + "id": "urn:uuid:16d5a66c-d421-4fde-8f4c-6ab159082274", "type": [ "VerifiableCredential", "ActivityPubActorCard" diff --git a/packages/traceability-tests/tests/sanity/context-validation.test.js b/packages/traceability-tests/tests/sanity/context-validation.test.js index bc7143332..2ce96552e 100644 --- a/packages/traceability-tests/tests/sanity/context-validation.test.js +++ b/packages/traceability-tests/tests/sanity/context-validation.test.js @@ -29,7 +29,7 @@ properties: enum: - https://w3id.org/traceability/v1 - https://w3id.org/vc/status-list/2021/v1 - - https://ref.gs1.org/gs1/vc/licence-context/ + - https://ref.gs1.org/gs1/vc/license-context/ - https://ref.gs1.org/gs1/vc/trade-item-context/ - https://ref.gs1.org/gs1/vc/declaration-context/ `) @@ -65,11 +65,11 @@ properties: const validation1 = validate(instance1); expect(validation1).toBe(true); }); - it('https://ref.gs1.org/gs1/vc/licence-context/', async () => { + it('https://ref.gs1.org/gs1/vc/license-context/', async () => { const instance1 = { '@context': [ 'https://www.w3.org/2018/credentials/v2', - 'https://ref.gs1.org/gs1/vc/licence-context/', + 'https://ref.gs1.org/gs1/vc/license-context/', ], }; const validation1 = validate(instance1);