Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhance the token authentication converter to accept the custom jwt granted authorities converter #32335

Merged
merged 11 commits into from
Dec 6, 2022
Merged

Enhance the token authentication converter to accept the custom jwt granted authorities converter #32335

merged 11 commits into from
Dec 6, 2022

Conversation

moarychan
Copy link
Member

Description

Fixes #28665

All SDK Contribution checklist:

  • The pull request does not introduce [breaking changes]
  • CHANGELOG is updated for new features, bug fixes or other significant changes.
  • I have read the contribution guidelines.

General Guidelines and Best Practices

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

@ghost ghost added the azure-spring All azure-spring related issues label Nov 25, 2022
@azure-sdk
Copy link
Collaborator

API change check

APIView has identified API level changes in this PR and created following API reviews.

spring-cloud-azure-autoconfigure

@moarychan moarychan changed the title Enhance the token authentication converter to accept the custom jwt granted authority converter Enhance the token authentication converter to accept the custom jwt granted authorities converter Nov 29, 2022
@moarychan moarychan marked this pull request as ready for review November 30, 2022 06:56
@moarychan
Copy link
Member Author

@stliu ， please help review the API changes in this PR, thanks~

stliu
stliu reviewed Dec 2, 2022
View reviewed changes
.../com/azure/spring/cloud/autoconfigure/aad/AadResourceServerWebSecurityConfigurerAdapter.java Outdated
public AadResourceServerWebSecurityConfigurerAdapter(AadResourceServerProperties properties,
Converter<Jwt, Collection<GrantedAuthority>> jwtGrantedAuthorityConverter) {
this.properties = properties;
this.jwtGrantedAuthorityConverter = jwtGrantedAuthorityConverter;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're checking NotNull at here https://github.com/Azure/azure-sdk-for-java/pull/32335/files#diff-ce112d381fe58ed8f9480c52baed5571933351148ab89b75987aaf0dc8658214R94 but why not here?

stliu
stliu reviewed Dec 2, 2022
View reviewed changes
.../com/azure/spring/cloud/autoconfigure/aad/AadResourceServerWebSecurityConfigurerAdapter.java
converter.setJwtGrantedAuthoritiesConverter(jwtGrantedAuthorityConverter);
} else {
converter.setJwtGrantedAuthoritiesConverter(
new AadJwtGrantedAuthoritiesConverter(properties.getClaimToAuthorityPrefixMap()));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a little wired, why this new AadJwtGrantedAuthoritiesConverter(properties.getClaimToAuthorityPrefixMap()) here instead of in the constructor?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's required a Map to construct the granted authorities converter, the AadJwtGrantedAuthoritiesConverter only accepts a constructor parameter.

@moarychan moarychan enabled auto-merge (squash) December 6, 2022 03:11
@moarychan
Copy link
Member Author

/check-enforcer override

@moarychan moarychan merged commit dc962ce into Azure:main Dec 6, 2022
@moarychan
Copy link
Member Author

Move the design doc to wiki page https://github.com/Azure/azure-sdk-for-java/wiki/Design-for-Enhance-AAD-token-authentication-converter-to-customized-granted-authorities-converter

@moarychan moarychan deleted the moary/support-accept-jwt-granted-authority-converter-4.x branch December 9, 2022 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stliu stliu stliu approved these changes

@mssfang mssfang Awaiting requested review from mssfang mssfang is a code owner

@JonathanGiles JonathanGiles Awaiting requested review from JonathanGiles JonathanGiles is a code owner

@backwind1233 backwind1233 Awaiting requested review from backwind1233

@chenrujun chenrujun Awaiting requested review from chenrujun

@hui1110 hui1110 Awaiting requested review from hui1110

@Netyyyy Netyyyy Awaiting requested review from Netyyyy Netyyyy is a code owner

@saragluna saragluna Awaiting requested review from saragluna saragluna is a code owner

@yiliuTo yiliuTo Awaiting requested review from yiliuTo

@fangjian0423 fangjian0423 Awaiting requested review from fangjian0423

Assignees
No one assigned
Labels
azure-spring All azure-spring related issues
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEATURE REQUEST] AadJwtBearerTokenAuthenticationConverter Change In Public Methods
3 participants
@moarychan @azure-sdk @stliu