Merge pull request #663 from City-of-Helsinki/UHF-10169-eduad

UHF-10169: eduad
City-of-Helsinki · Jun 24, 2024 · 23053a5 · 23053a5
2 parents 333ba46 + 9eb80cf
commit 23053a5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "drupal/helfi_platform_config": "^4.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",
-        "drupal/helfi_tunnistamo": "^3.0",
+        "drupal/helfi_tunnistamo": "dev-UHF-10169-eduad",
         "drupal/override_node_options": "^2.6",
         "drupal/raven": "^5.0",
         "drupal/redis": "^1.5",

diff --git a/composer.lock b/composer.lock
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
@@ -26,6 +26,7 @@
 
 // Sentry DSN for React.
 $config['react_search.settings']['sentry_dsn_react'] = getenv('SENTRY_DSN_REACT');
+$config['openid_connect.client.tunnistamo']['settings']['ad_roles_disabled_amr'] = ['eduad'];
 $config['openid_connect.client.tunnistamo']['settings']['ad_roles'] = [
   [
     'ad_role' => 'Drupal_Helfi_kaupunkitaso_paakayttajat',