Adapt single tenant token keys requests #1407
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: liga-oz <[email protected]>
Signed-off-by: liga-oz <[email protected]>
…oken_keys_requests
| @@ -94,11 +94,21 @@ private PublicKey fetchPublicKey(Token token, JwtSignatureAlgorithm algorithm) t | |||
| return tokenKeyService.getPublicKey(algorithm, keyId, uri, params); | |||
| } | |||
|
|
|||
| private String composeZidQueryParameter(Token token) { | |||
| String composeQueryParameters(Token token) { | |||
There was a problem hiding this comment.
How about one of the following alternatives that, albeit not shorter, are probably more expressive / easier to maintain? Too much overhead?
String composeQueryParameters(Token token) {
String query =
Map.of("zid", Objects.requireNonNullElse(token.getAppTid(), ""),
"client_id", Objects.requireNonNullElse(configuration.getClientId(), ""))
.entrySet().stream()
.filter(entry -> !entry.getValue().isBlank())
.map(entry -> entry.getKey() + "=" + entry.getValue())
.sorted()
.collect(Collectors.joining("&", "?", ""));
query = Objects.equals("?", query) ? "" : query;
LOGGER.debug("Composed query parameter for token keys: {}", query);
return query;
}String composeQueryParameters(Token token) {
List<Map.Entry<String, String>> parameters =
Map.of("zid", Objects.requireNonNullElse(token.getAppTid(), ""),
"client_id", Objects.requireNonNullElse(configuration.getClientId(), ""))
.entrySet().stream()
.filter(entry -> !entry.getValue().isBlank())
.collect(Collectors.toList());
String query = parameters.isEmpty()
? ""
: parameters.stream()
.map(entry -> entry.getKey() + "=" + entry.getValue())
.sorted()
.collect(Collectors.joining("&", "?", ""));
LOGGER.debug("Composed query parameter for token keys: {}", query);
return query;
}| String zid = token.getAppTid(); | ||
| String clientId = token.getClientId(); |
There was a problem hiding this comment.
This must be changed to
configuration.getClientId()| }) | ||
| void composeQueryParams(String clientId, String appTid, String query) { | ||
| Token tokenMock = Mockito.mock(Token.class); | ||
| Mockito.when(tokenMock.getClientId()).thenReturn(clientId); |
There was a problem hiding this comment.
this must be changed to
Mockito.when(mockConfiguration.getClientId()).thenReturn(clientId);Signed-off-by: liga-oz <[email protected]>
Signed-off-by: liga-oz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.