Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	packages/web-wallet/package.json
#	pnpm-lock.yaml
  • Loading branch information
@nklomp
nklomp committed Aug 1, 2024
2 parents 13ca5d9 + a0994cc commit 305ea0c
Show file tree
Hide file tree
Showing 33 changed files with 583 additions and 337 deletions.
24 changes: 11 additions & 13 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"devDependencies": {
"concurrently": "^1.0.0",
"husky": "^9.0.11",
"prettier": "^3.3.0",
"rimraf": "^5.0.7",
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"typescript": "4.9.5"
},
"engines": {
Expand All @@ -53,21 +53,20 @@
"did-jwt-vc": "3.1.3",
"ethr-did": "2.3.9",
"@sphereon/pex": "4.0.1",
"@sphereon/ssi-types": "0.28.1-next.13",
"@sphereon/ssi-sdk.core": "0.28.1-next.13",
"@sphereon/ssi-sdk.data-store": "0.28.1-next.13",
"@sphereon/ssi-sdk.oid4vci-issuer": "0.28.1-next.13",
"@sphereon/ssi-sdk.oid4vci-issuer-rest-api": "0.28.1-next.13",
"@sphereon/ssi-express-support": "0.28.1-next.13",
"@sphereon/ssi-sdk.issuance-branding": "0.28.1-next.13",
"@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.28.1-next.13",
"@sphereon/ssi-types": "0.28.1-next.39",
"@sphereon/ssi-sdk.core": "0.28.1-next.39",
"@sphereon/ssi-sdk.data-store": "0.28.1-next.39",
"@sphereon/ssi-sdk.oid4vci-issuer": "0.28.1-next.39",
"@sphereon/ssi-sdk.oid4vci-issuer-rest-api": "0.28.1-next.39",
"@sphereon/ssi-express-support": "0.28.1-next.39",
"@sphereon/ssi-sdk.issuance-branding": "0.28.1-next.39",
"@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.28.1-next.39",
"@sphereon/ssi-sdk-ext.key-utils": "0.23.1-next.5",
"@sphereon/ssi-sdk-ext.did-utils": "0.23.1-next.5",
"@sphereon/ssi-sdk.ebsi-support": "0.28.1-next.13",
"@sphereon/ssi-sdk.ebsi-support": "0.28.1-next.39",
"@sphereon/oid4vci-issuer": "0.15.1-next.9",
"@sphereon/oid4vci-common": "0.15.1-next.9",
"@sphereon/oid4vci-issuer-server": "0.15.1-next.9",
"@sphereon/oid4vci-client": "0.15.1-next.9",
"@codemirror/view": "6.28.4",
"@codemirror/state": "6.4.1",
"@codemirror/search": "6.5.6",
Expand Down Expand Up @@ -107,4 +106,3 @@
}
}
}

32 changes: 7 additions & 25 deletions packages/agent/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,7 @@ Example body:
"https://ref.sphereon.com/sphereon/vc/license-context/"
],
"id": "http://localhost/vc/license/company_prefix/8790171",
"type": [
"VerifiableCredential",
"SPHEREONCompanyPrefixLicenseCredential"
],
"type": ["VerifiableCredential", "SPHEREONCompanyPrefixLicenseCredential"],
"issuer": "did:jwk:eyJhbGciOiJFZERTQSIsInVzZSI6InNpZyIsImt0eSI6Ik9LUCIsImNydiI6IkVkMjU1MTkiLCJ4IjoiaWFSbUhrUnJSa0FUSmFPTk95QllMUjNTZC10RWlqR0JBU3BuRzNyaFdEYyJ9",
"issuanceDate": "2023-06-22T00:00:00Z",
"validUntil": "2024-06-22T00:00:00Z",
Expand Down Expand Up @@ -210,10 +207,7 @@ Response:
"https://w3id.org/security/suites/jws-2020/v1"
],
"id": "http://localhost/vc/license/company_prefix/8790171",
"type": [
"VerifiableCredential",
"SPHEREONCompanyPrefixLicenseCredential"
],
"type": ["VerifiableCredential", "SPHEREONCompanyPrefixLicenseCredential"],
"issuer": "did:jwk:eyJhbGciOiJFZERTQSIsInVzZSI6InNpZyIsImt0eSI6Ik9LUCIsImNydiI6IkVkMjU1MTkiLCJ4IjoiaWFSbUhrUnJSa0FUSmFPTk95QllMUjNTZC10RWlqR0JBU3BuRzNyaFdEYyJ9",
"issuanceDate": "2023-06-22T00:00:00Z",
"validUntil": "2024-06-22T00:00:00Z",
Expand Down Expand Up @@ -272,10 +266,7 @@ Example verification body:
"https://w3id.org/security/suites/jws-2020/v1"
],
"id": "http://localhost/vc/license/company_prefix/8790171",
"type": [
"VerifiableCredential",
"SPHEREONCompanyPrefixLicenseCredential"
],
"type": ["VerifiableCredential", "SPHEREONCompanyPrefixLicenseCredential"],
"issuer": "did:jwk:eyJhbGciOiJFZERTQSIsInVzZSI6InNpZyIsImt0eSI6Ik9LUCIsImNydiI6IkVkMjU1MTkiLCJ4IjoiaWFSbUhrUnJSa0FUSmFPTk95QllMUjNTZC10RWlqR0JBU3BuRzNyaFdEYyJ9",
"issuanceDate": "2023-06-22T00:00:00Z",
"validUntil": "2024-06-22T00:00:00Z",
Expand Down Expand Up @@ -510,10 +501,7 @@ The response:
],
"id": "http://localhost:5000/vc/status-lists/1",
"issuer": "did:jwk:eyJhbGciOiJFZERTQSIsInVzZSI6InNpZyIsImt0eSI6Ik9LUCIsImNydiI6IkVkMjU1MTkiLCJ4IjoiaWFSbUhrUnJSa0FUSmFPTk95QllMUjNTZC10RWlqR0JBU3BuRzNyaFdEYyJ9",
"type": [
"VerifiableCredential",
"StatusList2021Credential"
],
"type": ["VerifiableCredential", "StatusList2021Credential"],
"credentialSubject": {
"id": "http://localhost:5000/vc/status-lists/1",
"type": "StatusList2021",
Expand Down Expand Up @@ -753,9 +741,7 @@ Response example:
"assertionMethod": [
"did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"
],
"authentication": [
"did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"
]
"authentication": ["did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"]
},
"didResolutionMetadata": {},
"didDocumentMetadata": {
Expand Down Expand Up @@ -807,12 +793,8 @@ If a DID is found it will return the DID Document (not a resolution result)
"type": "JsonWebKey2020"
}
],
"assertionMethod": [
"did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"
],
"authentication": [
"did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"
]
"assertionMethod": ["did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"],
"authentication": ["did:web:verification.sphereon.com:did:party_gln:12345678#02925110021f5d53468136ad4bf2233596bc8ee22f07c4b37548a346d643fcb73d"]
}
```

Expand Down
178 changes: 81 additions & 97 deletions packages/agent/conf/examples/oid4vci_metadata/localhost.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@
],
"format": "jwt_vc_json",
"credential_definition": {
"type": [
"VerifiableCredential",
"NaturalPerson"
]
"type": ["VerifiableCredential", "NaturalPerson"]
},
"cryptographic_binding_methods_supported": ["did:web", "did:jwk", "did:ion"],
"cryptographic_suites_supported": ["ES256", "ES256K1"]
Expand Down Expand Up @@ -117,10 +114,7 @@
],
"format": "jwt_vc_json",
"credential_definition": {
"type": [
"VerifiableCredential",
"UBO"
]
"type": ["VerifiableCredential", "UBO"]
},
"cryptographic_binding_methods_supported": ["did:web", "did:jwk", "did:ion"],
"cryptographic_suites_supported": ["ES256", "ES256K1"]
Expand Down Expand Up @@ -478,128 +472,118 @@
},
"format": "jwt_vc_json",
"cryptographic_binding_methods_supported": ["did:jwk"],
"cryptographic_suites_supported": [
"ES256"
]
"cryptographic_suites_supported": ["ES256"]
}
]
},
},
"Omzetbelasting": {
"display": [
{
"name": "Omzetbelasting",
"description": "Omzetbelastingverklaring Belastingdienst",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://i.ibb.co/pyZpF8m/Belastingdienst.png",
"alt_text": "Belastingdienst logo"
},
"background_image": {
"url": "https://i.ibb.co/c6hQwRP/hector-j-rivas.jpg",
"alt_text": "Mirrors background"
}
},
{
"locale": "en-US",
"name": "Tax registration statement",
"description": "Tax registration statement Belastingdienst",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://i.ibb.co/pyZpF8m/Belastingdienst.png",
"alt_text": "Belastingdienst logo"
},
"background_image": {
"url": "https://i.ibb.co/c6hQwRP/hector-j-rivas.jpg",
"alt_text": "Mirrors background"
}
},
{
"locale": "nl-NL",
"name": "Omzetbelasting",
"description": "Omzetbelastingverklaring Belastingdienst",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://i.ibb.co/pyZpF8m/Belastingdienst.png",
"alt_text": "Belastingdienst logo"
},
"background_image": {
"url": "https://i.ibb.co/c6hQwRP/hector-j-rivas.jpg",
"alt_text": "Mirrors background"
}
}
],
"credential_definition": {
"type": [
"VerifiableCredential",
"Omzetbelasting"
]
},
"format": "jwt_vc_json",
"cryptographic_binding_methods_supported": ["did:jwk"],
"cryptographic_suites_supported": [
"ES256"
]
}
},
"CertificationOfOrigin": {
"display": [
"display": [
{
"name": "Certificate of Origin",
"description": "Certificate of Origin",
"name": "Omzetbelasting",
"description": "Omzetbelastingverklaring Belastingdienst",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://web-wallet.demo.sphereon.com/images/card_logo.png",
"alt_text": "RWS Logo"
"url": "https://i.ibb.co/pyZpF8m/Belastingdienst.png",
"alt_text": "Belastingdienst logo"
},
"background_image": {
"url": "https://web-wallet.demo.sphereon.com/images/card_background.png",
"alt_text": "RWS background"
"url": "https://i.ibb.co/c6hQwRP/hector-j-rivas.jpg",
"alt_text": "Mirrors background"
}
},
{
"locale": "en-US",
"name": "Certificate of Origin",
"description": "Certificate of Origin",
"name": "Tax registration statement",
"description": "Tax registration statement Belastingdienst",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://web-wallet.demo.sphereon.com/images/card_logo.png",
"alt_text": "RWS Logo"
"url": "https://i.ibb.co/pyZpF8m/Belastingdienst.png",
"alt_text": "Belastingdienst logo"
},
"background_image": {
"url": "https://web-wallet.demo.sphereon.com/images/card_background.png",
"alt_text": "RWS background"
"url": "https://i.ibb.co/c6hQwRP/hector-j-rivas.jpg",
"alt_text": "Mirrors background"
}
},
{
"locale": "nl-NL",
"name": "Certificaat van oorsprong",
"description": "Certificaat van oorsprong",
"name": "Omzetbelasting",
"description": "Omzetbelastingverklaring Belastingdienst",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://web-wallet.demo.sphereon.com/images/card_logo.png",
"alt_text": "RWS Logo"
"url": "https://i.ibb.co/pyZpF8m/Belastingdienst.png",
"alt_text": "Belastingdienst logo"
},
"background_image": {
"url": "https://web-wallet.demo.sphereon.com/images/card_background.png",
"alt_text": "RWS background"
"url": "https://i.ibb.co/c6hQwRP/hector-j-rivas.jpg",
"alt_text": "Mirrors background"
}
}
],
"credential_definition": {
"type": ["VerifiableCredential", "CertificationOfOrigin"]
"type": ["VerifiableCredential", "Omzetbelasting"]
},
"format": "jwt_vc_json",
"cryptographic_binding_methods_supported": ["did:web", "did:jwk", "did:ion"],
"cryptographic_suites_supported": [
"ES256",
"ES256K1"
]
"cryptographic_binding_methods_supported": ["did:jwk"],
"cryptographic_suites_supported": ["ES256"]
}
},
"CertificationOfOrigin": {
"display": [
{
"name": "Certificate of Origin",
"description": "Certificate of Origin",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://web-wallet.demo.sphereon.com/images/card_logo.png",
"alt_text": "RWS Logo"
},
"background_image": {
"url": "https://web-wallet.demo.sphereon.com/images/card_background.png",
"alt_text": "RWS background"
}
},
{
"locale": "en-US",
"name": "Certificate of Origin",
"description": "Certificate of Origin",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://web-wallet.demo.sphereon.com/images/card_logo.png",
"alt_text": "RWS Logo"
},
"background_image": {
"url": "https://web-wallet.demo.sphereon.com/images/card_background.png",
"alt_text": "RWS background"
}
},
{
"locale": "nl-NL",
"name": "Certificaat van oorsprong",
"description": "Certificaat van oorsprong",
"background_color": "rgba(0, 0, 0, 0.2)",
"text_color": "#FBFBFB",
"logo": {
"url": "https://web-wallet.demo.sphereon.com/images/card_logo.png",
"alt_text": "RWS Logo"
},
"background_image": {
"url": "https://web-wallet.demo.sphereon.com/images/card_background.png",
"alt_text": "RWS background"
}
}
],
"credential_definition": {
"type": ["VerifiableCredential", "CertificationOfOrigin"]
},
"format": "jwt_vc_json",
"cryptographic_binding_methods_supported": ["did:web", "did:jwk", "did:ion"],
"cryptographic_suites_supported": ["ES256", "ES256K1"]
}
}
}
Loading

0 comments on commit 305ea0c

Please sign in to comment.