From 9b0e3ee35c898dd9a4b2e343cffb3befcb3f063f Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 25 Aug 2024 12:05:34 +0000 Subject: [PATCH 1/3] Updated node modules based on npm audit fix --- .../custom/hdbt_subtheme/package-lock.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index f6f9703a..663005d9 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -6716,11 +6716,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -15576,11 +15577,11 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, From c1ea147a2d1eda85f9da99c2e6d755a51d505a07 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:48:13 +0000 Subject: [PATCH 2/3] Update configuration --- composer.lock | 155 +++++++++++++++--------------- conf/cmi/core.extension.yml | 1 + public/sites/default/settings.php | 1 + 3 files changed, 80 insertions(+), 77 deletions(-) diff --git a/composer.lock b/composer.lock index 9fb2014b..187edf69 100644 --- a/composer.lock +++ b/composer.lock @@ -2677,7 +2677,7 @@ "homepage": "https://www.drupal.org/user/1852732" }, { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -2693,7 +2693,7 @@ "homepage": "https://www.drupal.org/user/395439" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" } ], @@ -2858,7 +2858,7 @@ "homepage": "https://www.drupal.org/user/430714" }, { - "name": "Greg Boggs", + "name": "greg boggs", "homepage": "https://www.drupal.org/user/153069" }, { @@ -2870,11 +2870,11 @@ "homepage": "https://www.drupal.org/user/717290" }, { - "name": "Neslee Canil Pinto", + "name": "neslee canil pinto", "homepage": "https://www.drupal.org/user/3580850" }, { - "name": "NickDickinsonWilde", + "name": "nickdickinsonwilde", "homepage": "https://www.drupal.org/user/3094661" }, { @@ -3344,20 +3344,20 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta13", + "version": "2.0.0-beta14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta13" + "reference": "8.x-2.0-beta14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta13.zip", - "reference": "8.x-2.0-beta13", - "shasum": "3b07a629ed6c94ee23656556b0d1a1c7ba58a77f" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta14.zip", + "reference": "8.x-2.0-beta14", + "shasum": "68124ea440273a8f4e40bc7d07421c8a230c287b" }, "require": { - "drupal/core": "^10.1 || ^11" + "drupal/core": "^10.2 || ^11" }, "require-dev": { "drupal/block_field": "~1.0", @@ -3374,8 +3374,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta13", - "datestamp": "1721834455", + "version": "8.x-2.0-beta14", + "datestamp": "1724498300", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4061,16 +4061,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.4", + "version": "6.6.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4" + "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8e011aa97b4449d3c7eaca723fff9d2111c6db4", - "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c02b0b7e8898424df6d7a63556b69d0be5d9aef5", + "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5", "shasum": "" }, "require": { @@ -4088,10 +4088,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.7", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-15T08:46:48+00:00" + "time": "2024-08-21T13:30:33+00:00" }, { "name": "drupal/hdbt_admin", @@ -4389,16 +4389,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.10", + "version": "4.4.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "97338d748ace88329505d3a79eb3e03d98ef648f" + "reference": "c609a3f7abd306e1ae11c6ddb422f34e421f0748" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97338d748ace88329505d3a79eb3e03d98ef648f", - "reference": "97338d748ace88329505d3a79eb3e03d98ef648f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c609a3f7abd306e1ae11c6ddb422f34e421f0748", + "reference": "c609a3f7abd306e1ae11c6ddb422f34e421f0748", "shasum": "" }, "require": { @@ -4469,6 +4469,7 @@ "drupal/core": "<10.3", "drupal/core-composer-scaffold": "<10.3", "drupal/ctools": "<3.11 || ^4.0.1", + "drupal/default_content": ">2.0.0-alpha2", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", "drupal/stage_file_proxy": "<2.1.5", @@ -4515,10 +4516,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.10", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-16T08:50:18+00:00" + "time": "2024-08-27T10:45:17+00:00" }, { "name": "drupal/helfi_proxy", @@ -5120,26 +5121,26 @@ }, { "name": "drupal/media_entity_file_replace", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/media_entity_file_replace.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/media_entity_file_replace-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "e5e1aa2519c3e3f65e8a8291c324bc527f649147" + "url": "https://ftp.drupal.org/files/projects/media_entity_file_replace-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "cfc0d500aba8b6ade547c9a17173f9a89fde02d0" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1701092779", + "version": "8.x-1.3", + "datestamp": "1724336085", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5221,26 +5222,26 @@ }, { "name": "drupal/menu_link_attributes", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_link_attributes.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "431c7954cc614a1b9677173f0209f1df15592503" + "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "a679a5c53c94e3c992483ce3ea782950f4f7e5b3" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^8 || ^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1671026425", + "version": "8.x-1.4", + "datestamp": "1724060900", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5257,7 +5258,7 @@ "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -5414,26 +5415,26 @@ }, { "name": "drupal/oembed_providers", - "version": "2.1.2", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/oembed_providers.git", - "reference": "2.1.2" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.1.2.zip", - "reference": "2.1.2", - "shasum": "ad125c7e55555499f001755c365f96edce1d6343" + "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.2.0.zip", + "reference": "2.2.0", + "shasum": "318bafadd5e9b74a593f08e252dc5ea6dec98cd2" }, "require": { - "drupal/core": "^9.0|^10.0" + "drupal/core": "^10|^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.2", - "datestamp": "1692724351", + "version": "2.2.0", + "datestamp": "1723853165", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7228,20 +7229,20 @@ }, { "name": "drupal/view_unpublished", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/view_unpublished.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "14374dd56d841270207e21974c7b7cf8aa1804f7" + "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "7dd4411c53866585ac6319d147ab11d214d55877" }, "require": { - "drupal/core": "^9.4 || ^10" + "drupal/core": "^9.4 || ^10 || ^11" }, "require-dev": { "drupal/coder": "^8.3.18", @@ -7250,8 +7251,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1709383642", + "version": "8.x-1.3", + "datestamp": "1724503131", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7327,7 +7328,7 @@ "homepage": "https://www.drupal.org/u/graber" }, { - "name": "Graber", + "name": "graber", "homepage": "https://www.drupal.org/user/1599440" }, { @@ -7410,26 +7411,26 @@ }, { "name": "drupal/views_infinite_scroll", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_infinite_scroll.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.2.zip", - "reference": "2.0.2", - "shasum": "8b2b935d1e5d94d7ad068d099512d3b915efb41f" + "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.3.zip", + "reference": "2.0.3", + "shasum": "3c56969f71256300226118a0f35bad66ab41306c" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^10.1 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1689001933", + "version": "2.0.3", + "datestamp": "1724335951", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7442,11 +7443,11 @@ ], "authors": [ { - "name": "Anybody", + "name": "anybody", "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -7454,7 +7455,7 @@ "homepage": "https://www.drupal.org/user/123612" }, { - "name": "Neslee Canil Pinto", + "name": "neslee canil pinto", "homepage": "https://www.drupal.org/user/3580850" }, { @@ -7462,7 +7463,7 @@ "homepage": "https://www.drupal.org/user/143827" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" }, { @@ -10684,16 +10685,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -10728,9 +10729,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "psy/psysh", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 0cf1c9e8..86c36c94 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -85,6 +85,7 @@ module: helfi_tpr_config: 0 helfi_tunnistamo: 0 helfi_user_roles: 0 + helfi_users: 0 help: 0 image: 0 image_style_quality: 0 diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9e6f7a6b..9813b60a 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -350,6 +350,7 @@ function drupal_get_env(string|array $variables) : mixed { 'DRUPAL_DB_NAME', 'DRUPAL_DB_PASS', 'DRUPAL_DB_HOST', + 'TFA_ENCRYPTION_KEY', ], 'additionalFiles' => [], ]; From 58cdb2d1b573926c81c90684adff2dc7d584beea Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:12:58 +0000 Subject: [PATCH 3/3] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 187edf69..b939b045 100644 --- a/composer.lock +++ b/composer.lock @@ -4061,16 +4061,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.7", + "version": "6.6.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5" + "reference": "aae8641b58d16cf0b396f8a34b8be40403e495a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c02b0b7e8898424df6d7a63556b69d0be5d9aef5", - "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/aae8641b58d16cf0b396f8a34b8be40403e495a6", + "reference": "aae8641b58d16cf0b396f8a34b8be40403e495a6", "shasum": "" }, "require": { @@ -4088,10 +4088,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.7", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-21T13:30:33+00:00" + "time": "2024-08-27T11:08:04+00:00" }, { "name": "drupal/hdbt_admin",