Skip to content

Conversation

ugrave
Copy link
Contributor

@ugrave ugrave commented Feb 24, 2022

This PR does the following:

  • Adds a new Jackson Module org.springframework.security.saml2.jackson2.Saml2Jackson2Module which contains mixins for SAML2 classes
  • Add new mixin for Collections.modifiableMap to org.springframework.security.jackson2.CoreJackson2Module

Closes gh-10905

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Feb 24, 2022
@ugrave ugrave marked this pull request as ready for review February 25, 2022 06:50
@ugrave
Copy link
Contributor Author

ugrave commented Feb 25, 2022

I have added a org.springframework.security.jackson2.UnmodifiableMapMixin to the CoreJackson2Module. Now i see there is already a mixin for UnmodifiableMaps bur this is placed in the OAuth2ClientJackson2Module (org.springframework.security.oauth2.client.jackson2.UnmodifiableMapMixin)
Question is how sould i handle it. Move/Copy the mixing from the OAuth2 module to the general jackson module and replace my version.

@eleftherias eleftherias added in: saml2 An issue in SAML2 modules status: duplicate A duplicate of another issue type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels Feb 25, 2022
Copy link
Contributor

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Thanks, @ugrave! I appreciate your thoroughness in the PR, I've left some feedback inline.

In preparation for merging, will you please squash your commits?

@ugrave ugrave requested a review from jzheaux March 1, 2022 12:02
@jzheaux
Copy link
Contributor

jzheaux commented Mar 1, 2022

Thanks, @ugrave!

This is merged via df84826. I also added a polish of 6c3d183 and 931fb6a to remove some duplication and remove the authenticated attribute from Saml2AuthenticationMixin.

@jzheaux jzheaux closed this Mar 1, 2022
@jzheaux jzheaux added this to the 5.7.0-M3 milestone Mar 1, 2022
@ugrave ugrave deleted the gh-10905 branch March 2, 2022 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in: saml2 An issue in SAML2 modules status: duplicate A duplicate of another issue type: enhancement A general enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add Jackson Support for saml2 Module

4 participants