diff --git a/composer.lock b/composer.lock
index 063b87a7..3cb9d5b2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "df09266f299af755c749be67c471ff6f",
+ "content-hash": "178e21daef29112958368c4f6f6313e6",
"packages": [
{
"name": "asm89/stack-cors",
@@ -2330,16 +2330,16 @@
},
{
"name": "drupal/core",
- "version": "10.3.10",
+ "version": "10.4.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144"
+ "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144",
- "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144",
+ "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d",
+ "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d",
"shasum": ""
},
"require": {
@@ -2385,7 +2385,7 @@
"symfony/serializer": "^6.4",
"symfony/validator": "^6.4",
"symfony/yaml": "^6.4",
- "twig/twig": "^3.14.2"
+ "twig/twig": "^3.15.0"
},
"conflict": {
"drush/drush": "<12.4.3"
@@ -2488,22 +2488,22 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/10.3.10"
+ "source": "https://github.com/drupal/core/tree/10.4.0"
},
- "time": "2024-11-22T12:51:33+00:00"
+ "time": "2024-12-17T22:18:01+00:00"
},
{
"name": "drupal/core-composer-scaffold",
- "version": "10.3.10",
+ "version": "10.4.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
- "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc"
+ "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/f58ab5c0d02d275c5aa226c4505b457e41b161cc",
- "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc",
+ "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/db17b59620ce1c142a34dc017d9e696ce4771e55",
+ "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55",
"shasum": ""
},
"require": {
@@ -2538,9 +2538,9 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10"
+ "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0"
},
- "time": "2024-08-22T14:31:34+00:00"
+ "time": "2024-08-22T14:31:30+00:00"
},
{
"name": "drupal/crop",
@@ -4308,16 +4308,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.8.23",
+ "version": "6.8.26",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511"
+ "reference": "2b18785a8ed788b658240efe7d38b5ec2a98ab6c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b14bd481f81a0be27eaf3ab2a1db0c2a86c66511",
- "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2b18785a8ed788b658240efe7d38b5ec2a98ab6c",
+ "reference": "2b18785a8ed788b658240efe7d38b5ec2a98ab6c",
"shasum": ""
},
"require": {
@@ -4336,10 +4336,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.23",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.26",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-12-17T07:20:53+00:00"
+ "time": "2024-12-20T11:24:30+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4653,16 +4653,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.10.5",
+ "version": "4.11.1",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "7c52e541f43948f3ad5603a07690f946c6604241"
+ "reference": "73e3050ba224d40ce93e8eb4752e7af4a6bc6a72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7c52e541f43948f3ad5603a07690f946c6604241",
- "reference": "7c52e541f43948f3ad5603a07690f946c6604241",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/73e3050ba224d40ce93e8eb4752e7af4a6bc6a72",
+ "reference": "73e3050ba224d40ce93e8eb4752e7af4a6bc6a72",
"shasum": ""
},
"require": {
@@ -4731,9 +4731,8 @@
"ruflin/elastica": "^8.0"
},
"conflict": {
- "drupal/core": ">=10.4.0",
- "drupal/core-composer-scaffold": ">=10.4.0",
- "drupal/core-dev": ">=10.4.0",
+ "drupal/core": "<10.4",
+ "drupal/core-composer-scaffold": "<10.4",
"drupal/ctools": "<3.11 || ^4.0.1",
"drupal/default_content": ">2.0.0-alpha2",
"drupal/gin_toolbar": ">1.0.0-rc6",
@@ -4759,8 +4758,7 @@
"[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch",
"[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch",
"[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch",
- "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch",
- "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch"
+ "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch"
},
"drupal/default_content": {
"https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch"
@@ -4789,10 +4787,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.5",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.11.1",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-12-18T08:08:55+00:00"
+ "time": "2024-12-19T09:33:02+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -4883,16 +4881,16 @@
},
{
"name": "drupal/helfi_tunnistamo",
- "version": "3.0.9",
+ "version": "3.0.10",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git",
- "reference": "8a489629636fef00d5fab73009b37a4b6fb7a266"
+ "reference": "13b645c119dc15b4707b31cde55baeb4a41dd29b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/8a489629636fef00d5fab73009b37a4b6fb7a266",
- "reference": "8a489629636fef00d5fab73009b37a4b6fb7a266",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/13b645c119dc15b4707b31cde55baeb4a41dd29b",
+ "reference": "13b645c119dc15b4707b31cde55baeb4a41dd29b",
"shasum": ""
},
"require": {
@@ -4909,10 +4907,10 @@
],
"description": "Tunnistamo integration",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.9",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.10",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues"
},
- "time": "2024-09-03T07:23:36+00:00"
+ "time": "2024-12-20T10:35:33+00:00"
},
{
"name": "drupal/image_style_quality",
@@ -8390,16 +8388,16 @@
},
{
"name": "elasticsearch/elasticsearch",
- "version": "v8.16.0",
+ "version": "v8.17.0",
"source": {
"type": "git",
"url": "https://github.com/elastic/elasticsearch-php.git",
- "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85"
+ "reference": "6cd0fe6a95fdb7198a2795624927b094813b3d8b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85",
- "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85",
+ "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/6cd0fe6a95fdb7198a2795624927b094813b3d8b",
+ "reference": "6cd0fe6a95fdb7198a2795624927b094813b3d8b",
"shasum": ""
},
"require": {
@@ -8442,9 +8440,9 @@
],
"support": {
"issues": "https://github.com/elastic/elasticsearch-php/issues",
- "source": "https://github.com/elastic/elasticsearch-php/tree/v8.16.0"
+ "source": "https://github.com/elastic/elasticsearch-php/tree/v8.17.0"
},
- "time": "2024-11-14T22:23:33+00:00"
+ "time": "2024-12-18T11:00:27+00:00"
},
{
"name": "ezyang/htmlpurifier",
@@ -13024,8 +13022,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
diff --git a/conf/cmi/openid_connect.settings.yml b/conf/cmi/openid_connect.settings.yml
index 6dd0f01a..aa0b430c 100644
--- a/conf/cmi/openid_connect.settings.yml
+++ b/conf/cmi/openid_connect.settings.yml
@@ -9,8 +9,4 @@ redirect_login: user
redirect_logout: ''
userinfo_mappings:
timezone: zoneinfo
-role_mappings:
- read_only: { }
- content_producer: { }
- editor: { }
- admin: { }
+role_mappings: { }