Skip to content

Commit 16de4dc

Browse files
alextremealextreme
authored
Merge pull request #1448 from maykinmedia/task/2618-digid-eherkenning
[#2618] Replace digid_eherkenning_oidc_generics with library
2 parents ca2d969 + 637151c commit 16de4dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+772
-1414
lines changed

‎docs/configuration/admin_oidc.rst

+3-10
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ All settings:
3636
ADMIN_OIDC_DEFAULT_GROUPS
3737
ADMIN_OIDC_GROUPS_CLAIM
3838
ADMIN_OIDC_MAKE_USERS_STAFF
39-
ADMIN_OIDC_OIDC_EXEMPT_URLS
4039
ADMIN_OIDC_OIDC_NONCE_SIZE
4140
ADMIN_OIDC_OIDC_OP_AUTHORIZATION_ENDPOINT
4241
ADMIN_OIDC_OIDC_OP_DISCOVERY_ENDPOINT
@@ -65,12 +64,12 @@ Detailed Information
6564
Setting claim mapping
6665
Description Mapping from user-model fields to OIDC claims
6766
Possible values Mapping: {'some_key': 'Some value'}
68-
Default value {'email': 'email', 'first_name': 'given_name', 'last_name': 'family_name'}
67+
Default value {'email': ['email'], 'first_name': ['given_name'], 'last_name': ['family_name']}
6968
7069
Variable ADMIN_OIDC_GROUPS_CLAIM
7170
Setting groups claim
7271
Description The name of the OIDC claim that holds the values to map to local user groups.
73-
Possible values string
72+
Possible values No information available
7473
Default value roles
7574
7675
Variable ADMIN_OIDC_MAKE_USERS_STAFF
@@ -79,12 +78,6 @@ Detailed Information
7978
Possible values True, False
8079
Default value False
8180
82-
Variable ADMIN_OIDC_OIDC_EXEMPT_URLS
83-
Setting URLs exempt from session renewal
84-
Description This is a list of absolute url paths, regular expressions for url paths, or Django view names. This plus the mozilla-django-oidc urls are exempted from the session renewal by the SessionRefresh middleware.
85-
Possible values string, comma-delimited ('foo,bar,baz')
86-
Default value
87-
8881
Variable ADMIN_OIDC_OIDC_NONCE_SIZE
8982
Setting Nonce size
9083
Description Sets the length of the random string used for OpenID Connect nonce verification
@@ -190,5 +183,5 @@ Detailed Information
190183
Variable ADMIN_OIDC_USERNAME_CLAIM
191184
Setting username claim
192185
Description The name of the OIDC claim that is used as the username
193-
Possible values string
186+
Possible values No information available
194187
Default value sub

‎docs/configuration/digid_oidc.rst

+9-23
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ All settings:
3131

3232
::
3333

34+
DIGID_OIDC_BSN_CLAIM
3435
DIGID_OIDC_ENABLED
35-
DIGID_OIDC_ERROR_MESSAGE_MAPPING
36-
DIGID_OIDC_IDENTIFIER_CLAIM_NAME
37-
DIGID_OIDC_OIDC_EXEMPT_URLS
3836
DIGID_OIDC_OIDC_KEYCLOAK_IDP_HINT
3937
DIGID_OIDC_OIDC_NONCE_SIZE
4038
DIGID_OIDC_OIDC_OP_AUTHORIZATION_ENDPOINT
@@ -57,30 +55,18 @@ Detailed Information
5755

5856
::
5957

58+
Variable DIGID_OIDC_BSN_CLAIM
59+
Setting BSN-claim
60+
Description Naam van de claim die het BSN bevat van de ingelogde gebruiker.
61+
Possible values No information available
62+
Default value bsn
63+
6064
Variable DIGID_OIDC_ENABLED
6165
Setting inschakelen
62-
Description Geeft aan of OpenID Connect voor authenticatie/autorisatie is ingeschakeld. Deze overschrijft het gebruik van SAML voor DigiD-authenticatie.
66+
Description Indicates whether OpenID Connect for authentication/authorization is enabled
6367
Possible values True, False
6468
Default value False
6569
66-
Variable DIGID_OIDC_ERROR_MESSAGE_MAPPING
67-
Setting Foutmelding mapping
68-
Description Mapping die de door de identiteitsprovider geretourneerde foutmeldingen, omzet in leesbare meldingen die aan de gebruiker worden getoond
69-
Possible values Mapping: {'some_key': 'Some value'}
70-
Default value {}
71-
72-
Variable DIGID_OIDC_IDENTIFIER_CLAIM_NAME
73-
Setting BSN claim naam
74-
Description De naam van de claim waarin het BSN nummer van de gebruiker is opgeslagen
75-
Possible values string
76-
Default value bsn
77-
78-
Variable DIGID_OIDC_OIDC_EXEMPT_URLS
79-
Setting URLs exempt from session renewal
80-
Description This is a list of absolute url paths, regular expressions for url paths, or Django view names. This plus the mozilla-django-oidc urls are exempted from the session renewal by the SessionRefresh middleware.
81-
Possible values No information available
82-
Default value
83-
8470
Variable DIGID_OIDC_OIDC_KEYCLOAK_IDP_HINT
8571
Setting Keycloak-identiteitsprovider hint
8672
Description Specifiek voor Keycloak: parameter die aangeeft welke identiteitsprovider gebruikt moet worden (inlogscherm van Keycloak overslaan).
@@ -149,7 +135,7 @@ Detailed Information
149135
150136
Variable DIGID_OIDC_OIDC_RP_SCOPES_LIST
151137
Setting OpenID Connect scopes
152-
Description OpenID Connect-scopes die worden bevraagd tijdens het inloggen. Deze zijn hardcoded en moeten worden ondersteund door de identiteitsprovider.
138+
Description OpenID Connect scopes that are requested during login. These scopes are hardcoded and must be supported by the identity provider.
153139
Possible values No information available
154140
Default value openid, bsn
155141

‎docs/configuration/eherkenning_oidc.rst

+8-22
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ All settings:
3232
::
3333

3434
EHERKENNING_OIDC_ENABLED
35-
EHERKENNING_OIDC_ERROR_MESSAGE_MAPPING
36-
EHERKENNING_OIDC_IDENTIFIER_CLAIM_NAME
37-
EHERKENNING_OIDC_OIDC_EXEMPT_URLS
35+
EHERKENNING_OIDC_LEGAL_SUBJECT_CLAIM
3836
EHERKENNING_OIDC_OIDC_KEYCLOAK_IDP_HINT
3937
EHERKENNING_OIDC_OIDC_NONCE_SIZE
4038
EHERKENNING_OIDC_OIDC_OP_AUTHORIZATION_ENDPOINT
@@ -59,27 +57,15 @@ Detailed Information
5957

6058
Variable EHERKENNING_OIDC_ENABLED
6159
Setting inschakelen
62-
Description Geeft aan of OpenID Connect voor authenticatie/autorisatie is ingeschakeld. Deze heeft voorrang op het gebruik van SAML voor eHerkenning-authenticatie.
60+
Description Indicates whether OpenID Connect for authentication/authorization is enabled
6361
Possible values True, False
6462
Default value False
6563
66-
Variable EHERKENNING_OIDC_ERROR_MESSAGE_MAPPING
67-
Setting Foutmelding mapping
68-
Description Mapping die de door de identiteitsprovider geretourneerde foutmeldingen, omzet in leesbare meldingen die aan de gebruiker worden getoond
69-
Possible values Mapping: {'some_key': 'Some value'}
70-
Default value {}
71-
72-
Variable EHERKENNING_OIDC_IDENTIFIER_CLAIM_NAME
73-
Setting KVK claim naam
74-
Description De naam van de claim waarin het KVK nummer van de gebruiker is opgeslagen
75-
Possible values string
76-
Default value kvk
77-
78-
Variable EHERKENNING_OIDC_OIDC_EXEMPT_URLS
79-
Setting URLs exempt from session renewal
80-
Description This is a list of absolute url paths, regular expressions for url paths, or Django view names. This plus the mozilla-django-oidc urls are exempted from the session renewal by the SessionRefresh middleware.
81-
Possible values string, comma-delimited ('foo,bar,baz')
82-
Default value
64+
Variable EHERKENNING_OIDC_LEGAL_SUBJECT_CLAIM
65+
Setting bedrijfsidenticatie-claim
66+
Description Naam van de claim die de identificatie van het ingelogde/vertegenwoordigde bedrijf bevat.
67+
Possible values No information available
68+
Default value urn:etoegang:core:LegalSubjectID
8369
8470
Variable EHERKENNING_OIDC_OIDC_KEYCLOAK_IDP_HINT
8571
Setting Keycloak-identiteitsprovider hint
@@ -149,7 +135,7 @@ Detailed Information
149135
150136
Variable EHERKENNING_OIDC_OIDC_RP_SCOPES_LIST
151137
Setting OpenID Connect scopes
152-
Description OpenID Connect-scopes die worden bevraagd tijdens het inloggen. Deze zijn hardcoded en moeten worden ondersteund door de identiteitsprovider.
138+
Description OpenID Connect scopes that are requested during login. These scopes are hardcoded and must be supported by the identity provider.
153139
Possible values string, comma-delimited ('foo,bar,baz')
154140
Default value openid, kvk
155141

‎docs/configuration/eherkenning_saml.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Detailed Information
134134
135135
Variable EHERKENNING_SAML_EH_LOA
136136
Setting eHerkenning LoA
137-
Description Level of Assurance (LoA) to use for the eHerkenning service.
137+
Description Betrouwbaarheidsniveau (LoA) voor de eHerkenningservice.
138138
Possible values urn:etoegang:core:assurance-class:loa1, urn:etoegang:core:assurance-class:loa2, urn:etoegang:core:assurance-class:loa2plus, urn:etoegang:core:assurance-class:loa3, urn:etoegang:core:assurance-class:loa4
139139
Default value urn:etoegang:core:assurance-class:loa3
140140
@@ -164,7 +164,7 @@ Detailed Information
164164
165165
Variable EHERKENNING_SAML_EIDAS_LOA
166166
Setting eIDAS LoA
167-
Description Level of Assurance (LoA) to use for the eIDAS service.
167+
Description Betrouwbaarheidsniveau (LoA) voor de eIDAS-service.
168168
Possible values urn:etoegang:core:assurance-class:loa1, urn:etoegang:core:assurance-class:loa2, urn:etoegang:core:assurance-class:loa2plus, urn:etoegang:core:assurance-class:loa3, urn:etoegang:core:assurance-class:loa4
169169
Default value urn:etoegang:core:assurance-class:loa3
170170

‎requirements/base.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ elastic-apm # Elastic APM integration
7979
beautifulsoup4
8080

8181
# DigidLocal
82-
django-digid-eherkenning
82+
django-digid-eherkenning[oidc]
8383
maykin-python3-saml
8484
pyopenssl
8585
django-sessionprofile

‎requirements/base.txt

+7-4
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ django-csp==3.7
190190
# via -r requirements/base.in
191191
django-csp-reports==1.8.1
192192
# via -r requirements/base.in
193-
django-digid-eherkenning==0.13.1
193+
django-digid-eherkenning[oidc]==0.16.0
194194
# via -r requirements/base.in
195195
django-elasticsearch-dsl==7.4
196196
# via -r requirements/base.in
@@ -403,10 +403,12 @@ maykin-python3-saml==1.16.1
403403
# django-digid-eherkenning
404404
messagebird==2.1.0
405405
# via -r requirements/base.in
406-
mozilla-django-oidc==2.0.0
406+
mozilla-django-oidc==4.0.1
407407
# via mozilla-django-oidc-db
408-
mozilla-django-oidc-db==0.14.1
409-
# via -r requirements/base.in
408+
mozilla-django-oidc-db==0.19.0
409+
# via
410+
# -r requirements/base.in
411+
# django-digid-eherkenning
410412
notifications-api-common==0.2.2
411413
# via -r requirements/base.in
412414
oath==1.4.4
@@ -544,6 +546,7 @@ tinycss2==1.1.1
544546
typing-extensions==4.10.0
545547
# via
546548
# -r requirements/base.in
549+
# mozilla-django-oidc-db
547550
# pydantic
548551
# pydantic-core
549552
# pyee

‎requirements/ci.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,11 @@ django-csp-reports==1.8.1
314314
# via
315315
# -c requirements/base.txt
316316
# -r requirements/base.txt
317-
django-digid-eherkenning==0.13.1
317+
django-digid-eherkenning[oidc]==0.16.0
318318
# via
319319
# -c requirements/base.txt
320320
# -r requirements/base.txt
321+
# django-digid-eherkenning
321322
django-elasticsearch-dsl==7.4
322323
# via
323324
# -c requirements/base.txt
@@ -743,15 +744,16 @@ messagebird==2.1.0
743744
# via
744745
# -c requirements/base.txt
745746
# -r requirements/base.txt
746-
mozilla-django-oidc==2.0.0
747+
mozilla-django-oidc==4.0.1
747748
# via
748749
# -c requirements/base.txt
749750
# -r requirements/base.txt
750751
# mozilla-django-oidc-db
751-
mozilla-django-oidc-db==0.14.1
752+
mozilla-django-oidc-db==0.19.0
752753
# via
753754
# -c requirements/base.txt
754755
# -r requirements/base.txt
756+
# django-digid-eherkenning
755757
multidict==6.0.5
756758
# via yarl
757759
mypy-extensions==1.0.0
@@ -1066,6 +1068,7 @@ typing-extensions==4.10.0
10661068
# via
10671069
# -c requirements/base.txt
10681070
# -r requirements/base.txt
1071+
# mozilla-django-oidc-db
10691072
# polyfactory
10701073
# pydantic
10711074
# pydantic-core

‎requirements/dev.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,11 @@ django-csp-reports==1.8.1
356356
# -r requirements/ci.txt
357357
django-debug-toolbar==3.2.2
358358
# via -r requirements/dev.in
359-
django-digid-eherkenning==0.13.1
359+
django-digid-eherkenning[oidc]==0.16.0
360360
# via
361361
# -c requirements/ci.txt
362362
# -r requirements/ci.txt
363+
# django-digid-eherkenning
363364
django-elasticsearch-dsl==7.4
364365
# via
365366
# -c requirements/ci.txt
@@ -845,15 +846,16 @@ messagebird==2.1.0
845846
# via
846847
# -c requirements/ci.txt
847848
# -r requirements/ci.txt
848-
mozilla-django-oidc==2.0.0
849+
mozilla-django-oidc==4.0.1
849850
# via
850851
# -c requirements/ci.txt
851852
# -r requirements/ci.txt
852853
# mozilla-django-oidc-db
853-
mozilla-django-oidc-db==0.14.1
854+
mozilla-django-oidc-db==0.19.0
854855
# via
855856
# -c requirements/ci.txt
856857
# -r requirements/ci.txt
858+
# django-digid-eherkenning
857859
msgpack==1.0.7
858860
# via locust
859861
multidict==6.0.5
@@ -1269,6 +1271,7 @@ typing-extensions==4.10.0
12691271
# via
12701272
# -c requirements/ci.txt
12711273
# -r requirements/ci.txt
1274+
# mozilla-django-oidc-db
12721275
# polyfactory
12731276
# pydantic
12741277
# pydantic-core

‎src/digid_eherkenning_oidc_generics/__init__.py

Whitespace-only changes.

‎src/digid_eherkenning_oidc_generics/admin.py

-69
This file was deleted.

‎src/digid_eherkenning_oidc_generics/apps.py

-7
This file was deleted.

0 commit comments

Comments
 (0)