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

✨ [#4788] Add ConfigurationStep for Admin OIDC login #4891

Merged
merged 3 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions docker/setup_configuration/data.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
oidc_db_config_enable: True
oidc_db_config_admin_auth:
items:
- identifier: admin-oidc
enabled: True
oidc_rp_client_id: testid
oidc_rp_client_secret: 7DB3KUAAizYCcmZufpHRVOcD0TOkNO3I
oidc_rp_scopes_list:
- openid
- email
- profile
oidc_rp_sign_algo: RS256
endpoint_config:
oidc_op_discovery_endpoint: http://keycloak.open-forms.local:8080/realms/test/
username_claim:
- sub
groups_claim:
- roles
claim_mapping:
first_name:
- given_name
sync_groups: true
sync_groups_glob_pattern: "*"
default_groups:
- Functioneel beheer
make_users_staff: true
superuser_group_names:
- superuser
oidc_use_nonce: true
oidc_nonce_size: 32
oidc_state_size: 32
userinfo_claims_source: id_token

zgw_consumers_config_enable: True
zgw_consumers:
services:
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ django-solo
django-tinymce
django-treebeard
django-yubin
mozilla-django-oidc-db
mozilla-django-oidc-db[setup-configuration]
maykin-2fa
django-timeline-logger
django-csp
Expand Down
6 changes: 4 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ django-sendfile2==0.7.1
django-sessionprofile==2.0.0
# via django-digid-eherkenning
django-setup-configuration==0.4.0
# via zgw-consumers
# via
# mozilla-django-oidc-db
# zgw-consumers
django-simple-certmanager==2.4.1
# via
# -r requirements/base.in
Expand Down Expand Up @@ -327,7 +329,7 @@ maykin-python3-saml==1.16.1
# via django-digid-eherkenning
mozilla-django-oidc==4.0.0
# via mozilla-django-oidc-db
mozilla-django-oidc-db==0.19.0
mozilla-django-oidc-db==0.21.0
# via
# -r requirements/base.in
# django-digid-eherkenning
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ mozilla-django-oidc==4.0.0
# -c requirements/base.txt
# -r requirements/base.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.19.0
mozilla-django-oidc-db==0.21.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ mozilla-django-oidc==4.0.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.19.0
mozilla-django-oidc-db==0.21.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/extensions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ mozilla-django-oidc==4.0.0
# -c requirements/base.txt
# -r requirements/base.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.19.0
mozilla-django-oidc-db==0.21.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/type-checking.txt
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ mozilla-django-oidc==4.0.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.19.0
mozilla-django-oidc-db==0.21.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down
1 change: 1 addition & 0 deletions src/openforms/conf/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,7 @@
# DJANGO-SETUP-CONFIGURATION
#
SETUP_CONFIGURATION_STEPS = [
"mozilla_django_oidc_db.setup_configuration.steps.AdminOIDCConfigurationStep",
"zgw_consumers.contrib.setup_configuration.steps.ServiceConfigurationStep",
"openforms.contrib.objects_api.setup_configuration.steps.ObjectsAPIConfigurationStep",
"openforms.registrations.contrib.zgw_apis.setup_configuration.steps.ZGWApiConfigurationStep",
Expand Down
Loading