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.

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

[#3950] Make service catalogue more consistent with Signicat template #63

Merged
merged 16 commits into from
Mar 13, 2024

Conversation

SilviaAmAm
Copy link
Contributor

@SilviaAmAm SilviaAmAm commented Mar 5, 2024

Fixes open-formulieren/open-forms#3950 (first checkbox)

Context
Signicat, one of the Identity Providers for eHerkenning, said that the service catalogue that we generated was 'invalid'. The Signicat template can be found here: https://developer.signicat.com/broker/eherkenning-broker/eherkenning-service-catalogue.html#introduction

The noticed differences are mentioned in the ticket.

The service catalogue gets validated against this XSD: https://afsprakenstelsel.etoegang.nl/display/as/Service+catalog (under XML schema Service Catalog)

@SilviaAmAm SilviaAmAm marked this pull request as draft March 5, 2024 11:58
@SilviaAmAm SilviaAmAm force-pushed the fix/3950-make-catalogus-signicat-correct branch from 0c48e8b to 2acd1ed Compare March 5, 2024 14:51
Copy link

codecov bot commented Mar 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.10%. Comparing base (970d3ed) to head (38ef6ed).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master      #63      +/-   ##
==========================================
+ Coverage   96.01%   96.10%   +0.08%     
==========================================
  Files          72       73       +1     
  Lines        3216     3260      +44     
==========================================
+ Hits         3088     3133      +45     
+ Misses        128      127       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SilviaAmAm SilviaAmAm marked this pull request as ready for review March 5, 2024 14:59
@SilviaAmAm SilviaAmAm requested a review from vaszig March 5, 2024 14:59
Copy link
Contributor

@vaszig vaszig left a comment

Choose a reason for hiding this comment

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

Don't have a lot of experience in xml-xsd so I don't find something weird.

I am not sure about the last bullet in the task "They don't have the signature node => The XSD has no value for the minOccurs and the default is 1 (https://www.w3.org/TR/xmlschema-0/#OccurrenceConstraints). So I think we need to leave this field in?"

I guess you are right.

@SilviaAmAm
Copy link
Contributor Author

SilviaAmAm commented Mar 6, 2024

Discussion with Joeri:

  • Re-add the sets for entity concernde types allowed
  • Update tests with requested attributes. These should have been for eIDAS, not eH. Also, add them to the defaults. And add documentation.
  • Make a new ticket in OF about using every requestedAttribute in the auth variable => Include all RequestedAttribute in the auth variable open-formulieren/open-forms#3985
  • Update the esc:Version at the top of the catalogue (check also metadata)

@SilviaAmAm SilviaAmAm marked this pull request as draft March 6, 2024 16:03
@SilviaAmAm SilviaAmAm force-pushed the fix/3950-make-catalogus-signicat-correct branch from 2acd1ed to b35e6e3 Compare March 7, 2024 17:21
@SilviaAmAm SilviaAmAm marked this pull request as ready for review March 8, 2024 08:33
@SilviaAmAm SilviaAmAm requested a review from vaszig March 8, 2024 08:34
@SilviaAmAm SilviaAmAm merged commit 0985701 into master Mar 13, 2024
14 checks passed
@SilviaAmAm SilviaAmAm deleted the fix/3950-make-catalogus-signicat-correct branch March 13, 2024 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add multiple LoAs to eHerkenning and eIDAS and update the service catalog template
2 participants