Skip to content

Commit

Permalink
Merge branch 'docs/oidvci-contract' into create-pull-request/patch-b4…
Browse files Browse the repository at this point in the history
…a1c822
  • Loading branch information
patlo-iog committed Jul 16, 2024
2 parents 60790bb + b46f574 commit 02443a1
Show file tree
Hide file tree
Showing 22 changed files with 119 additions and 119 deletions.
2 changes: 1 addition & 1 deletion examples/.nickel/caddy.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ in
handle_path /didcomm* {
reverse_proxy %{args.agent.host}:%{std.to_string args.agent.didcommPort}
}
handle_path /agent* {
handle_path /cloud-agent* {
reverse_proxy %{args.agent.host}:%{std.to_string args.agent.restPort}
}
handle_path /keycloak* {
Expand Down
2 changes: 1 addition & 1 deletion examples/.nickel/root.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ in
name = "issuer",
port = 9980,
realm = "students",
extraEnvs = { IDENTUS_URL = "http://caddy-issuer:8080/agent" }
extraEnvs = { IDENTUS_URL = "http://caddy-issuer:8080/cloud-agent" }
}
),

Expand Down
2 changes: 1 addition & 1 deletion examples/.nickel/stack.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ in
agentDb = makeSharedDbConfig "agent",
node = { host = "node" },
didcommServiceUrl = "http://%{hosts.caddy}:%{std.to_string args.port}/didcomm",
restServiceUrl = "http://%{hosts.caddy}:%{std.to_string args.port}/agent",
restServiceUrl = "http://%{hosts.caddy}:%{std.to_string args.port}/cloud-agent",
apikeyEnabled = args.apikeyEnabled,
}
& (
Expand Down
2 changes: 1 addition & 1 deletion examples/mt-keycloak-vault/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Exposed Service | Description |
|---------------------------------|--------------------------|
| `localhost:8080/agent` | Multi-tenant Cloud Agent |
| `localhost:8080/cloudagent` | Multi-tenant Cloud Agent |
| `localhost:8080/keycloak/admin` | Keycloak |
| `localhost:8200` | Vault |

Expand Down
6 changes: 3 additions & 3 deletions examples/mt-keycloak-vault/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ configs:
handle_path /didcomm* {
reverse_proxy agent-default:8090
}
handle_path /agent* {
handle_path /cloud-agent* {
reverse_proxy agent-default:8085
}
handle_path /keycloak* {
Expand Down Expand Up @@ -46,10 +46,10 @@ services:
POLLUX_DB_PASSWORD: postgres
POLLUX_DB_PORT: '5432'
POLLUX_DB_USER: postgres
POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL: http://caddy-default:8080/agent
POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL: http://caddy-default:8080/cloud-agent
PRISM_NODE_HOST: node
PRISM_NODE_PORT: '50053'
REST_SERVICE_URL: http://caddy-default:8080/agent
REST_SERVICE_URL: http://caddy-default:8080/cloud-agent
SECRET_STORAGE_BACKEND: vault
VAULT_ADDR: http://vault-default:8200
VAULT_TOKEN: admin
Expand Down
6 changes: 3 additions & 3 deletions examples/mt-keycloak-vault/hurl/01_create_users.hurl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ HTTP 200
issuer_access_token: jsonpath "$.access_token"

# Create Issuer wallet
POST {{ agent_url }}/agent/wallets
POST {{ agent_url }}/cloud-agent/wallets
Authorization: Bearer {{ issuer_access_token }}
{
"name": "issuer-wallet"
Expand All @@ -85,7 +85,7 @@ HTTP 200
holder_access_token: jsonpath "$.access_token"

# Create Holder wallet
POST {{ agent_url }}/agent/wallets
POST {{ agent_url }}/cloud-agent/wallets
Authorization: Bearer {{ holder_access_token }}
{
"name": "holder-wallet"
Expand All @@ -104,7 +104,7 @@ HTTP 200
verifier_access_token: jsonpath "$.access_token"

# Create Verifier wallet
POST {{ agent_url }}/agent/wallets
POST {{ agent_url }}/cloud-agent/wallets
Authorization: Bearer {{ verifier_access_token }}
{
"name": "verifier-wallet"
Expand Down
40 changes: 20 additions & 20 deletions examples/mt-keycloak-vault/hurl/02_jwt_flow.hurl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ verifier_access_token: jsonpath "$.access_token"
# Prerequisites
##############################
# Issuer create DID
POST {{ agent_url }}/agent/did-registrar/dids
POST {{ agent_url }}/cloud-agent/did-registrar/dids
Authorization: Bearer {{ issuer_access_token }}
{
"documentTemplate": {
Expand All @@ -57,7 +57,7 @@ HTTP 201
issuer_did: jsonpath "$.longFormDid" # regex "(did:prism:[a-z0-9]+):.+$"

# Holder create DID
POST {{ agent_url }}/agent/did-registrar/dids
POST {{ agent_url }}/cloud-agent/did-registrar/dids
Authorization: Bearer {{ holder_access_token }}
{
"documentTemplate": {
Expand All @@ -78,7 +78,7 @@ holder_did: jsonpath "$.longFormDid" regex "(did:prism:[a-z0-9]+):.+$"
# Issuance Connection
##############################
# Inviter create connection
POST {{ agent_url }}/agent/connections
POST {{ agent_url }}/cloud-agent/connections
Authorization: Bearer {{ issuer_access_token }}
{
"label": "My Connection"
Expand All @@ -89,7 +89,7 @@ raw_invitation: jsonpath "$.invitation.invitationUrl" regex ".*_oob=(.*)$"
issuer_connection_id: jsonpath "$.connectionId"

# Invitee accept connection
POST {{ agent_url }}/agent/connection-invitations
POST {{ agent_url }}/cloud-agent/connection-invitations
Authorization: Bearer {{ holder_access_token }}
{
"invitation": "{{ raw_invitation }}"
Expand All @@ -99,7 +99,7 @@ HTTP 200
holder_connection_id: jsonpath "$.connectionId"

# Wait for inviter connection status
GET {{ agent_url }}/agent/connections/{{ issuer_connection_id }}
GET {{ agent_url }}/cloud-agent/connections/{{ issuer_connection_id }}
Authorization: Bearer {{ issuer_access_token }}
[Options]
retry: -1
Expand All @@ -108,7 +108,7 @@ HTTP 200
jsonpath "$.state" == "ConnectionResponseSent"

# Wait for invitee connection status
GET {{ agent_url }}/agent/connections/{{ holder_connection_id }}
GET {{ agent_url }}/cloud-agent/connections/{{ holder_connection_id }}
Authorization: Bearer {{ holder_access_token }}
[Options]
retry: -1
Expand All @@ -120,7 +120,7 @@ jsonpath "$.state" == "ConnectionResponseReceived"
# Issuance
##############################
# Issuer create credential offer
POST {{ agent_url }}/agent/issue-credentials/credential-offers
POST {{ agent_url }}/cloud-agent/issue-credentials/credential-offers
Authorization: Bearer {{ issuer_access_token }}
{
"claims": {
Expand All @@ -138,7 +138,7 @@ issuer_cred_record_id: jsonpath "$.recordId"
didcomm_issuing_thid: jsonpath "$.thid"

# Holder wait for OfferReceived state
GET {{ agent_url }}/agent/issue-credentials/records
GET {{ agent_url }}/cloud-agent/issue-credentials/records
Authorization: Bearer {{ holder_access_token }}
[QueryStringParams]
thid: {{ didcomm_issuing_thid }}
Expand All @@ -151,15 +151,15 @@ jsonpath "$.contents[0].protocolState" == "OfferReceived"
holder_cred_record_id: jsonpath "$.contents[0].recordId"

# Holder accept a credential-offer
POST {{ agent_url }}/agent/issue-credentials/records/{{ holder_cred_record_id }}/accept-offer
POST {{ agent_url }}/cloud-agent/issue-credentials/records/{{ holder_cred_record_id }}/accept-offer
Authorization: Bearer {{ holder_access_token }}
{
"subjectId": "{{ holder_did }}"
}
HTTP 200

# Holder wait for CredentialReceived state
GET {{ agent_url }}/agent/issue-credentials/records/{{ holder_cred_record_id }}
GET {{ agent_url }}/cloud-agent/issue-credentials/records/{{ holder_cred_record_id }}
Authorization: Bearer {{ holder_access_token }}
[Options]
retry: -1
Expand All @@ -168,7 +168,7 @@ HTTP 200
jsonpath "$.protocolState" == "CredentialReceived"

# Issuer wait for CredentialSent state
GET {{ agent_url }}/agent/issue-credentials/records/{{ issuer_cred_record_id }}
GET {{ agent_url }}/cloud-agent/issue-credentials/records/{{ issuer_cred_record_id }}
Authorization: Bearer {{ issuer_access_token }}
[Options]
retry: -1
Expand All @@ -180,7 +180,7 @@ jsonpath "$.protocolState" == "CredentialSent"
# Presentation Connection
##############################
# Inviter create connection
POST {{ agent_url }}/agent/connections
POST {{ agent_url }}/cloud-agent/connections
Authorization: Bearer {{ verifier_access_token }}
{
"label": "My Connection"
Expand All @@ -191,7 +191,7 @@ raw_invitation: jsonpath "$.invitation.invitationUrl" regex ".*_oob=(.*)$"
verifier_connection_id: jsonpath "$.connectionId"

# Invitee accept connection
POST {{ agent_url }}/agent/connection-invitations
POST {{ agent_url }}/cloud-agent/connection-invitations
Authorization: Bearer {{ holder_access_token }}
{
"invitation": "{{ raw_invitation }}"
Expand All @@ -201,7 +201,7 @@ HTTP 200
holder_connection_id: jsonpath "$.connectionId"

# Wait for inviter connection status
GET {{ agent_url }}/agent/connections/{{ verifier_connection_id }}
GET {{ agent_url }}/cloud-agent/connections/{{ verifier_connection_id }}
Authorization: Bearer {{ verifier_access_token }}
[Options]
retry: -1
Expand All @@ -210,7 +210,7 @@ HTTP 200
jsonpath "$.state" == "ConnectionResponseSent"

# Wait for invitee connection status
GET {{ agent_url }}/agent/connections/{{ holder_connection_id }}
GET {{ agent_url }}/cloud-agent/connections/{{ holder_connection_id }}
Authorization: Bearer {{ holder_access_token }}
[Options]
retry: -1
Expand All @@ -222,7 +222,7 @@ jsonpath "$.state" == "ConnectionResponseReceived"
# Presentation
##############################
# Verifier create presentation request
POST {{ agent_url }}/agent/present-proof/presentations
POST {{ agent_url }}/cloud-agent/present-proof/presentations
Authorization: Bearer {{ verifier_access_token }}
{
"connectionId": "{{ verifier_connection_id }}",
Expand All @@ -238,7 +238,7 @@ verifier_presentation_id: jsonpath "$.presentationId"
didcomm_presentation_thid: jsonpath "$.thid"

# Holder wait for RequestReceived state
GET {{ agent_url }}/agent/present-proof/presentations
GET {{ agent_url }}/cloud-agent/present-proof/presentations
Authorization: Bearer {{ holder_access_token }}
[QueryStringParams]
thid: {{ didcomm_presentation_thid }}
Expand All @@ -251,7 +251,7 @@ jsonpath "$.contents[0].status" == "RequestReceived"
holder_presentation_id: jsonpath "$.contents[0].presentationId"

# Holder accept presentation request
PATCH {{ agent_url }}/agent/present-proof/presentations/{{ holder_presentation_id }}
PATCH {{ agent_url }}/cloud-agent/present-proof/presentations/{{ holder_presentation_id }}
Authorization: Bearer {{ holder_access_token }}
{
"action": "request-accept",
Expand All @@ -260,7 +260,7 @@ Authorization: Bearer {{ holder_access_token }}
HTTP 200

# Holder wait for PresentationSent state
GET {{ agent_url }}/agent/present-proof/presentations
GET {{ agent_url }}/cloud-agent/present-proof/presentations
Authorization: Bearer {{ holder_access_token }}
[QueryStringParams]
thid: {{ didcomm_presentation_thid }}
Expand All @@ -271,7 +271,7 @@ HTTP 200
jsonpath "$.contents[0].status" == "PresentationSent"

# Verfiier wait for PresentationVerified state
GET {{ agent_url }}/agent/present-proof/presentations
GET {{ agent_url }}/cloud-agent/present-proof/presentations
Authorization: Bearer {{ verifier_access_token }}
[QueryStringParams]
thid: {{ didcomm_presentation_thid }}
Expand Down
2 changes: 1 addition & 1 deletion examples/mt-keycloak/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Exposed Service | Description |
|---------------------------------|--------------------------|
| `localhost:8080/agent` | Multi-tenant Cloud Agent |
| `localhost:8080/cloud-agent` | Multi-tenant Cloud Agent |
| `localhost:8080/keycloak/admin` | Keycloak |

__Keycloak__
Expand Down
6 changes: 3 additions & 3 deletions examples/mt-keycloak/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ configs:
handle_path /didcomm* {
reverse_proxy agent-default:8090
}
handle_path /agent* {
handle_path /cloud-agent* {
reverse_proxy agent-default:8085
}
handle_path /keycloak* {
Expand Down Expand Up @@ -46,10 +46,10 @@ services:
POLLUX_DB_PASSWORD: postgres
POLLUX_DB_PORT: '5432'
POLLUX_DB_USER: postgres
POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL: http://caddy-default:8080/agent
POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL: http://caddy-default:8080/cloud-agent
PRISM_NODE_HOST: node
PRISM_NODE_PORT: '50053'
REST_SERVICE_URL: http://caddy-default:8080/agent
REST_SERVICE_URL: http://caddy-default:8080/cloud-agent
SECRET_STORAGE_BACKEND: postgres
image: ghcr.io/hyperledger/identus-cloud-agent:1.38.0
restart: always
Expand Down
6 changes: 3 additions & 3 deletions examples/mt-keycloak/hurl/01_create_users.hurl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ HTTP 200
issuer_access_token: jsonpath "$.access_token"

# Create Issuer wallet
POST {{ agent_url }}/agent/wallets
POST {{ agent_url }}/cloud-agent/wallets
Authorization: Bearer {{ issuer_access_token }}
{
"name": "issuer-wallet"
Expand All @@ -85,7 +85,7 @@ HTTP 200
holder_access_token: jsonpath "$.access_token"

# Create Holder wallet
POST {{ agent_url }}/agent/wallets
POST {{ agent_url }}/cloud-agent/wallets
Authorization: Bearer {{ holder_access_token }}
{
"name": "holder-wallet"
Expand All @@ -104,7 +104,7 @@ HTTP 200
verifier_access_token: jsonpath "$.access_token"

# Create Verifier wallet
POST {{ agent_url }}/agent/wallets
POST {{ agent_url }}/cloud-agent/wallets
Authorization: Bearer {{ verifier_access_token }}
{
"name": "verifier-wallet"
Expand Down
Loading

0 comments on commit 02443a1

Please sign in to comment.