From 83d762b814e260e1f313e8466a7ff69b7de7f298 Mon Sep 17 00:00:00 2001 From: hyrsky <732227+hyrsky@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:07:06 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 2 +- composer.json | 1 - composer.lock | 85 ++++++++++++++------------- conf/cmi/language/fi/tfa.settings.yml | 6 ++ conf/cmi/language/sv/tfa.settings.yml | 8 +++ 5 files changed, 60 insertions(+), 42 deletions(-) create mode 100644 conf/cmi/language/fi/tfa.settings.yml create mode 100644 conf/cmi/language/sv/tfa.settings.yml diff --git a/.platform/schema b/.platform/schema index c7930257..301160a9 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff --git a/composer.json b/composer.json index f1d42941..9c50181a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "drupal/helfi_tunnistamo": "^3.0", "drupal/raven": "^5.0", "drupal/redis": "^1.5", - "drupal/stage_file_proxy": "^2.0", "drush/drush": "^12" }, "require-dev": { diff --git a/composer.lock b/composer.lock index bebb845b..02b37841 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": "95630f50eca8581fd1841cb6822f2eaa", + "content-hash": "11e9ee34356c672289900548a7bf4b89", "packages": [ { "name": "asm89/stack-cors", @@ -4227,22 +4227,25 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "bfd7671b58300db948d8cd230b4756ecca73c237" + "reference": "25c7b80d6d1dc71176a576102665704b7e8fedeb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/bfd7671b58300db948d8cd230b4756ecca73c237", - "reference": "bfd7671b58300db948d8cd230b4756ecca73c237", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/25c7b80d6d1dc71176a576102665704b7e8fedeb", + "reference": "25c7b80d6d1dc71176a576102665704b7e8fedeb", "shasum": "" }, "require": { "drupal/flysystem": "^2.1@RC", "microsoft/azure-storage-blob": "^1.1" }, + "conflict": { + "drupal/core": "<10.3" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3" @@ -4260,10 +4263,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-11-21T07:23:44+00:00" + "time": "2024-08-16T08:49:23+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4271,12 +4274,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740" + "reference": "5c46212ec813932eb9f8e94bbf2d14e1e92b2a39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/eadca37ff757c3de0b1a309d37ddd2c6d4910740", - "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5c46212ec813932eb9f8e94bbf2d14e1e92b2a39", + "reference": "5c46212ec813932eb9f8e94bbf2d14e1e92b2a39", "shasum": "" }, "require": { @@ -4348,7 +4351,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-08-12T09:17:00+00:00" + "time": "2024-08-16T09:24:27+00:00" }, { "name": "drupal/helfi_navigation", @@ -4386,16 +4389,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.8", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712" + "reference": "97338d748ace88329505d3a79eb3e03d98ef648f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/10ca013c3e13c112eb9827fd1b91ed52833b2712", - "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97338d748ace88329505d3a79eb3e03d98ef648f", + "reference": "97338d748ace88329505d3a79eb3e03d98ef648f", "shasum": "" }, "require": { @@ -4450,6 +4453,7 @@ "drupal/simple_sitemap": "^4.0", "drupal/siteimprove": "^2.0", "drupal/social_media": "^2.0", + "drupal/stage_file_proxy": "^2", "drupal/stomp": "^2.0", "drupal/tfa": "^1.7", "drupal/token": "^1.9", @@ -4467,6 +4471,7 @@ "drupal/ctools": "<3.11 || ^4.0.1", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", + "drupal/stage_file_proxy": "<2.1.5", "drush/drush": "<12" }, "type": "drupal-module", @@ -4510,10 +4515,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.8", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.10", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-12T09:33:04+00:00" + "time": "2024-08-16T08:50:18+00:00" }, { "name": "drupal/helfi_proxy", @@ -5874,17 +5879,17 @@ }, { "name": "drupal/raven", - "version": "5.0.16", + "version": "5.0.17", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.16" + "reference": "5.0.17" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.16.zip", - "reference": "5.0.16", - "shasum": "cd4d545b74ad7d22691dd06177a164bc12074201" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.17.zip", + "reference": "5.0.17", + "shasum": "3be77024ab4edac4964ed5a4590f4e9eb5031346" }, "require": { "drupal/core": "^10.1 || ^11", @@ -5899,8 +5904,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.16", - "datestamp": "1723001088", + "version": "5.0.17", + "datestamp": "1723776489", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6481,27 +6486,27 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.9", + "version": "4.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.9" + "reference": "4.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.9.zip", - "reference": "4.1.9", - "shasum": "d86d90408b334cd7470ea631e3be5acca2103377" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.2.1.zip", + "reference": "4.2.1", + "shasum": "d96b481571ca2fecdb305e87d2557f9338116864" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^10.2 || ^11", "ext-xmlwriter": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.9", - "datestamp": "1712441608", + "version": "4.2.1", + "datestamp": "1723802052", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6525,7 +6530,7 @@ "role": "Maintainer" }, { - "name": "WalkingDexter", + "name": "walkingdexter", "homepage": "https://www.drupal.org/user/3251330" } ], @@ -6723,17 +6728,17 @@ }, { "name": "drupal/stage_file_proxy", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/stage_file_proxy.git", - "reference": "2.1.4" + "reference": "2.1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.4.zip", - "reference": "2.1.4", - "shasum": "85f8451f123fcfb1b272f5a0cc11e6bd1673476c" + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.5.zip", + "reference": "2.1.5", + "shasum": "6f5974c106d45211e54945e4d9f5bbf8ec6699de" }, "require": { "drupal/core": "^9 || ^10", @@ -6746,8 +6751,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.4", - "datestamp": "1706627704", + "version": "2.1.5", + "datestamp": "1719499510", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/language/fi/tfa.settings.yml b/conf/cmi/language/fi/tfa.settings.yml new file mode 100644 index 00000000..01a1f48f --- /dev/null +++ b/conf/cmi/language/fi/tfa.settings.yml @@ -0,0 +1,6 @@ +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/conf/cmi/language/sv/tfa.settings.yml b/conf/cmi/language/sv/tfa.settings.yml new file mode 100644 index 00000000..67899d55 --- /dev/null +++ b/conf/cmi/language/sv/tfa.settings.yml @@ -0,0 +1,8 @@ +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + subject: 'Your [site:name] account now has two-factor authentication' + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + subject: 'Your [site:name] account no longer has two-factor authentication' + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team"