change/clientcredential_factory #3695
Merged
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
- Added factory for autoconfiguration of ClientCredential beans. - Added default beans for "test" profile.
Merged
# Conflicts: # libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java # libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java # libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java # libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java # libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
… naming of configuration properties.
# Conflicts: # libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java # libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java # libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java # libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java # libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
… (which is actually used), not AZURE_OPENID_CONFIG_TOKEN_ENDPOINT (which should be used). - All subclasses of ClientCredential now takes tokenEndpoint. AzureClientCredential just doesn't use it (yet). Simpler code. - Cleaned up for readability in ClientCredentialConfig.
…ureAdTokenService and NavAzureAdTokenService.
…nts TokenService, similar to AzureAdTokenService.
…TrygdeetatenAzureAdTokenService to be available as a bean (similar to AzureAdTokenService).
… separate prod config).
…the necessary requirements are not set.
…the necessary requirements are not set.
…n and TokenServiceAutoConfiguration having different conditionals.
…r related beans to actually work. - Added test beans to TokenServiceAutoConfiguration to avoid placeholders in config.
…cationConfiguredFor*.
…ation.description.
…nvironment, with meta.
…on to be able to instantiate a dummy TrygdeetatenAzureAdTokenService.
…tion report." This reverts commit d05a9fa.
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.
Fullfører ny TODO i #3693.
Samler
extends ClientCredentiali security-core, og skriver om til factoryClientCredentialAutoConfiguration, med meta-dok. Ønsker å unngå@Import. Fail fast og defaults for test profile.Har også gått gjennom
extends TokenService(unntattTokenXService) og laget factoryTokenServiceAutoConfigurationfor disse. Defaults for test profile, for å unngå boilerplate i test config.Har testa
pdl-proxymed opprettelse/import etter arbeidstid.Fjerner samtidig et par ubrukte klasser i
reactive-security.Merk at det er noe off i hvordan
AzureTokenServicesettes opp. Den bruker en propertyAAD_ISSUER_URIsom vi setter opp, men burde refaktoreres til å brukeAZURE_OPENID_CONFIG_TOKEN_ENDPOINT(somAzureNavTokenServiceogAzureTrygdeetatenTokenService). Det tas evt. i annen PR.