From 6d894676eeb8eff47c768c4bee4789c15446d59b Mon Sep 17 00:00:00 2001 From: Wout Slakhorst Date: Tue, 3 Sep 2024 15:13:45 +0200 Subject: [PATCH] some fixes --- auth/api/iam/generated.go | 3 +++ docs/_static/auth/v2.yaml | 5 +++++ e2e-tests/browser/client/iam/generated.go | 3 +++ e2e-tests/oauth-flow/rfc021/do-test.sh | 1 + 4 files changed, 12 insertions(+) diff --git a/auth/api/iam/generated.go b/auth/api/iam/generated.go index 17b48ab685..2f3d246c40 100644 --- a/auth/api/iam/generated.go +++ b/auth/api/iam/generated.go @@ -137,6 +137,9 @@ type ServiceAccessTokenRequest struct { // used to locate the OAuth2 Authorization Server metadata. AuthorizationServer string `json:"authorization_server"` + // ClientId The client ID that will be used to request the access token. + ClientId string `json:"client_id"` + // Credentials Additional credentials to present (if required by the authorizer), in addition to those in the requester's wallet. // They must be in the form of a Verifiable Credential in JSON form. // The serialized form (JWT or JSON-LD) in the resulting Verifiable Presentation depends on the capability of the authorizing party. diff --git a/docs/_static/auth/v2.yaml b/docs/_static/auth/v2.yaml index 5d07494448..94db875f7a 100644 --- a/docs/_static/auth/v2.yaml +++ b/docs/_static/auth/v2.yaml @@ -391,6 +391,7 @@ components: description: Request for an access token for a service. required: - authorization_server + - client_id - scope properties: authorization_server: @@ -399,6 +400,10 @@ components: used to locate the OAuth2 Authorization Server metadata. type: string example: https://example.com/oauth2 + client_id: + type: string + description: The client ID that will be used to request the access token. + example: https://example.com/oauth2/client scope: type: string description: The scope that will be the service for which this access token can be used. diff --git a/e2e-tests/browser/client/iam/generated.go b/e2e-tests/browser/client/iam/generated.go index 8cf939b8ba..efa610c24f 100644 --- a/e2e-tests/browser/client/iam/generated.go +++ b/e2e-tests/browser/client/iam/generated.go @@ -131,6 +131,9 @@ type ServiceAccessTokenRequest struct { // used to locate the OAuth2 Authorization Server metadata. AuthorizationServer string `json:"authorization_server"` + // ClientId The client ID that will be used to request the access token. + ClientId string `json:"client_id"` + // Credentials Additional credentials to present (if required by the authorizer), in addition to those in the requester's wallet. // They must be in the form of a Verifiable Credential in JSON form. // The serialized form (JWT or JSON-LD) in the resulting Verifiable Presentation depends on the capability of the authorizing party. diff --git a/e2e-tests/oauth-flow/rfc021/do-test.sh b/e2e-tests/oauth-flow/rfc021/do-test.sh index 3180d723c2..1100cd93cf 100755 --- a/e2e-tests/oauth-flow/rfc021/do-test.sh +++ b/e2e-tests/oauth-flow/rfc021/do-test.sh @@ -70,6 +70,7 @@ REQUEST=$( cat << EOF { "authorization_server": "https://nodeA/oauth2/vendorA", + "client_id": "https://nodeB/oauth2/vendorB", "scope": "test", "credentials": [ {