Skip to content

Commit 64362c9

Browse files
fix: use partitioned vault (#5384)
1 parent c1d75f3 commit 64362c9

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

extensions/common/iam/decentralized-claims/decentralized-claims-sts/lib/decentralized-claims-sts-remote-lib/src/main/java/org/eclipse/edc/iam/decentralizedclaims/sts/remote/RemoteSecureTokenService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private Result<Oauth2CredentialsRequest> createRequest(String participantContext
6262

6363
var config = configResolver.apply(participantContextId);
6464

65-
var secret = vault.resolveSecret(config.clientSecretAlias());
65+
var secret = vault.resolveSecret(participantContextId, config.clientSecretAlias());
6666
if (secret != null) {
6767
var builder = SharedSecretOauth2CredentialsRequest.Builder.newInstance()
6868
.url(config.tokenUrl())

extensions/common/iam/decentralized-claims/decentralized-claims-sts/lib/decentralized-claims-sts-remote-lib/src/test/java/org/eclipse/edc/iam/decentralizedclaims/sts/remote/RemoteSecureTokenServiceTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
3535
import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE;
3636
import static org.mockito.ArgumentMatchers.any;
37+
import static org.mockito.ArgumentMatchers.anyString;
38+
import static org.mockito.ArgumentMatchers.eq;
3739
import static org.mockito.Mockito.mock;
3840
import static org.mockito.Mockito.verify;
3941
import static org.mockito.Mockito.when;
@@ -57,7 +59,7 @@ void createToken() {
5759
var audience = "aud";
5860
var secret = "secret";
5961
when(oauth2Client.requestToken(any())).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().build()));
60-
when(vault.resolveSecret(configuration.clientSecretAlias())).thenReturn(secret);
62+
when(vault.resolveSecret(anyString(), eq(configuration.clientSecretAlias()))).thenReturn(secret);
6163

6264
assertThat(secureTokenService.createToken(participantContextId, Map.of(AUDIENCE, audience), null)).isSucceeded();
6365

@@ -81,7 +83,7 @@ void createToken_withAccessScope() {
8183
var secret = "secret";
8284

8385
when(oauth2Client.requestToken(any())).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().build()));
84-
when(vault.resolveSecret(configuration.clientSecretAlias())).thenReturn(secret);
86+
when(vault.resolveSecret(anyString(), eq(configuration.clientSecretAlias()))).thenReturn(secret);
8587

8688
assertThat(secureTokenService.createToken(participantContextId, Map.of(AUDIENCE, audience), bearerAccessScope)).isSucceeded();
8789

@@ -106,7 +108,7 @@ void createToken_withAccessToken() {
106108
var secret = "secret";
107109

108110
when(oauth2Client.requestToken(any())).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().build()));
109-
when(vault.resolveSecret(configuration.clientSecretAlias())).thenReturn(secret);
111+
when(vault.resolveSecret(anyString(), eq(configuration.clientSecretAlias()))).thenReturn(secret);
110112

111113
assertThat(secureTokenService.createToken(participantContextId, Map.of(AUDIENCE, audience, PRESENTATION_TOKEN_CLAIM, accessToken), null)).isSucceeded();
112114

0 commit comments

Comments
 (0)