Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
961ffa8
#769 Make affiliation email more configurable
Liemine Nov 17, 2025
0960373
Merge branch 'main' into feature/#769-make-scopedaffiliation-configur…
oharsta Nov 18, 2025
234b5d9
Merge remote-tracking branch 'origin/feature/#769-make-scopedaffiliat…
oharsta Nov 18, 2025
3d1f884
Fixed indentation for myconext
oharsta Nov 18, 2025
06a6381
WIP for https://github.com/OpenConext/OpenConext-attribute-aggregatio…
oharsta Nov 19, 2025
6a43eec
Merge remote-tracking branch 'origin/feature/add_eduid_acr_values' in…
oharsta Nov 20, 2025
6b68917
Fixes https://github.com/OpenConext/OpenConext-attribute-aggregation/…
oharsta Nov 20, 2025
05b0831
Fixes https://github.com/OpenConext/OpenConext-myconext/issues/757
Nov 20, 2025
c930adf
#757 Replaces hardcoded value with variable
Nov 20, 2025
14bff9a
Merge pull request #567 from OpenConext/feature/757-feature-toggle-en…
oharsta Nov 20, 2025
48bdd9a
Fixes https://github.com/OpenConext/OpenConext-myconext/issues/759 Ad…
ricardovdheijden Nov 24, 2025
f048ae3
Merge pull request #571 from OpenConext/feature/759-feature-toggle-us…
oharsta Nov 24, 2025
ec66f79
Merge branch 'main' into develop
oharsta Nov 24, 2025
cf73225
#1001 Add email addresses
Liemine Nov 25, 2025
19d0a48
Added missing attributes from feature branch
oharsta Nov 25, 2025
52528ec
Merge branch 'feature/#769-make-scopedaffiliation-configurable' into …
Liemine Nov 25, 2025
42930f8
Merge branch 'feature/#769-make-scopedaffiliation-configurable' into …
Liemine Nov 25, 2025
7f85717
Merge branch 'feature/#1001-different-email-from-for-nudges-and-warni…
Liemine Nov 25, 2025
9b0db98
Added languages for invite
oharsta Nov 26, 2025
0cafab3
Merge branch 'main' into develop
baszoetekouw Nov 26, 2025
9a481e4
Merge branch 'main' into develop
baszoetekouw Nov 26, 2025
9026265
Added missing mongodb_db variable for myconext CRON jobs
oharsta Nov 29, 2025
2904e12
Merge branch 'main' into feature/mongodb_db_variable
oharsta Nov 29, 2025
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
2 changes: 2 additions & 0 deletions environments/template/group_vars/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ myconext:
feature_create_eduid_institution_landing: true
feature_allowlist: false
feature_dry_run_email_cron: true
feature_enable_account_linking: true
feature_use_app: true
sms_api_url: "https://rest.spryngsms.com/v1/messages"
sms_api_route: "default"
sp_entity_id: https://engine.{{ base_domain }}/authentication/sp/metadata
Expand Down
6 changes: 5 additions & 1 deletion roles/attribute-aggregation/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
command: "-Xmx128m --spring.config.location=./"
etc_hosts:
host.docker.internal: host-gateway
labels:
traefik.http.routers.aaserver.rule: "Host(`aa.{{ base_domain }}`)"
traefik.http.routers.aaserver.tls: "true"
traefik.enable: "true"
healthcheck:
test:
[
Expand All @@ -61,7 +65,7 @@
"-no-verbose",
"--tries=1",
"--spider",
"http://localhost:8080/aa/api/internal/health",
"http://localhost:8080/internal/health",
]
interval: 10s
timeout: 10s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ server:
# The port to where this Spring Boot application listens to. e.g. http://localhost:{{ springapp_tcpport }}
port: 8080
servlet:
context-path: /aa/api
session:
timeout: 28800
cookie:
Expand Down
2 changes: 2 additions & 0 deletions roles/invite/templates/serverapplication.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ config:
past-date-allowed: {{ invite.past_date_allowed }}
performance-seed-allowed: {{ invite.performance_seed_allowed }}
eduid-idp-schac-home-organization: {{ invite.eduid_idp_schac_home_organization }}
# Determines the languages available for switching language, supported are 'nl', 'en' and 'pt'
languages: "nl, en"

feature:
limit-institution-admin-role-visibility: {{ invite.limit_institution_admin_role_visibility }}
Expand Down
16 changes: 14 additions & 2 deletions roles/myconext/templates/application.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ springdoc:
enabled: true

email:
from: eduID <noreply@{{ myconext_base_domain }}>
error_mail: [email protected]
from_deprovisioning: <noreply+deprovisioning@{{ myconext_base_domain }}>
from_code: eduID <noreply@{{ myconext_base_domain }}>
from_app_nudge: <noreply+appnudge@{{ myconext_base_domain }}>
from_new_device: <noreply+newdevice@{{ myconext_base_domain }}>
error: [email protected]
magic-link-url: https://login.{{ myconext_base_domain }}/saml/guest-idp/magic
my-surfconext-url: https://mijn.{{ myconext_base_domain }}
idp-surfconext-url: https://login.{{ myconext_base_domain }}
Expand Down Expand Up @@ -74,6 +77,7 @@ manage:
base_url: "https://manage.{{ base_domain }}"
enabled: True

mongodb_db: {{ myconext.mongo_database }}
base_domain: {{ myconext_base_domain }}
saml_metadata_base_path: https://login.{{ myconext_base_domain }}
base_path: https://mijn.{{ myconext_base_domain }}
Expand Down Expand Up @@ -114,6 +118,8 @@ feature:
create_eduid_institution_landing: {{ myconext.feature_create_eduid_institution_landing }}
# Do we default remember the user for a longer period
default_remember_me: True
# Do we default add affiliate email address
default_affiliate_email: True
# Does the SAMLIdpService expects authn requests to be signed
requires_signed_authn_request: False
# Do we support ID verify
Expand All @@ -134,6 +140,12 @@ feature:
captcha_enabled: True
# Set to true to use the BRIN code to add ui-roles and authentication scoped affiliations
use_remote_creation_for_affiliation: {{ myconext.feature_use_remote_creation_for_affiliation }}
# Set to true to show the account linking related options on the personal-info page and home page (banner)
enable_account_linking: {{ myconext.feature_enable_account_linking }}
# Set to true to show the app login option
use_app: {{ myconext.feature_use_app }}

default_affiliate_email_domain: eduid.nl

captcha:
sitekey: {{ myconext.captcha_sitekey }}
Expand Down