Merge branch 'develop' into feature/issue-183-webform-auto-exports-initial-setting-save

Author: rimi-itk

CHANGELOG.md

@@ -11,13 +11,21 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [PR-101](https://github.com/OS2Forms/os2forms/pull/101)
+  - Added support for `os2web_key` in Digital post
+    - Switched from saving settings in key value store to config, i.e
+      the module needs to be reconfigured.
+  - Added support for `os2web_key` in Fasit handler.
+    - Switched from saving settings in key value store to config, i.e
+      the module needs to be reconfigured.
 - [PR-179](https://github.com/OS2Forms/os2forms/pull/179)
   Remove unused and abandoned package `webmozart/path-util`.
 - [PR-167](https://github.com/OS2Forms/os2forms/pull/167)
   Adding os2forms_digital_signature module
 - [PR-184](https://github.com/OS2Forms/os2forms/pull/184)
   - Patches `coc_forms_auto_export` to ensure settings can be saved upon initial
     attempt, cf. [Unable to save initial settings due to unfocusable form control](https://www.drupal.org/project/coc_forms_auto_export/issues/3531004)
+- [OS-199] Remove modules that are not used and not covered by central maintenance from OS2forms
 
 ## [4.1.0] 2025-06-03
 

composer.json

@@ -12,11 +12,9 @@
         "drupal/admin_toolbar": "^3.0",
         "drupal/advancedqueue": "^1.0",
         "drupal/cache_control_override": "^1.1 || ^2.0",
-        "drupal/clientside_validation": "^4.0",
         "drupal/coc_forms_auto_export": "^3.0@alpha",
         "drupal/config_entity_revisions": "2.0.x-dev",
         "drupal/diff": "^1.0",
-        "drupal/embed": "^1.4",
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
         "drupal/events_logging": "^2.0@beta",
@@ -58,7 +56,8 @@
         "itk-dev/serviceplatformen": "^1.5",
         "mglaman/composer-drupal-lenient": "^1.0",
         "os2web/os2web_audit": "^1.0",
-        "os2web/os2web_datalookup": "^2.0",
+        "os2web/os2web_datalookup": "^3.0",
+        "os2web/os2web_key": "^1.0",
         "os2web/os2web_nemlogin": "^1.0",
         "os2web/os2web_simplesaml": "dev-master",
         "php-http/guzzle7-adapter": "^1.0",

modules/os2forms_dawa/src/Plugin/os2web/DataLookup/DatafordelerDataLookup.php

@@ -3,8 +3,10 @@
 namespace Drupal\os2forms_dawa\Plugin\os2web\DataLookup;
 
 use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\File\FileSystem;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\key\KeyRepositoryInterface;
 use Drupal\os2forms_dawa\Entity\DatafordelerMatrikula;
 use Drupal\os2web_audit\Service\Logger;
 use Drupal\os2web_datalookup\Plugin\os2web\DataLookup\DataLookupBase;
@@ -30,20 +32,31 @@ public function __construct(
     $plugin_definition,
     protected ClientInterface $httpClient,
     Logger $auditLogger,
+    KeyRepositoryInterface $keyRepository,
+    FileSystem $fileSystem,
   ) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $auditLogger);
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $auditLogger, $keyRepository, $fileSystem);
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    /** @var \Drupal\os2web_audit\Service\Logger $auditLogger */
+    $auditLogger = $container->get('os2web_audit.logger');
+    /** @var \Drupal\key\KeyRepositoryInterface $keyRepository */
+    $keyRepository = $container->get('key.repository');
+    /** @var \Drupal\Core\File\FileSystem $fileSystem */
+    $fileSystem = $container->get('file_system');
+
     return new static(
       $configuration,
       $plugin_id,
       $plugin_definition,
       $container->get('http_client'),
-      $container->get('os2web_audit.logger'),
+      $auditLogger,
+      $keyRepository,
+      $fileSystem,
     );
   }
 

modules/os2forms_digital_post/README.md

@@ -31,6 +31,11 @@ examples](modules/os2forms_digital_post_examples/README.md).
 Go to `/admin/os2forms_digital_post/settings` to set up global settings for
 digital post.
 
+### Key
+
+We use [os2web_key](https://github.com/OS2web/os2web_key) to provide the certificate for sending digital post, and the
+key must be of type "[Certificate](https://github.com/os2web/os2web_key?tab=readme-ov-file#certificate)".
+
 ### Queue
 
 The actual sending of digital post is handled by jobs in an [Advanced

modules/os2forms_digital_post/os2forms_digital_post.info.yml

@@ -7,6 +7,7 @@ dependencies:
   - 'beskedfordeler:beskedfordeler'
   - 'drupal:advancedqueue'
   - 'os2web_datalookup:os2web_datalookup'
+  - 'os2web_key:os2web_key'
   - 'webform:webform'
   - 'webform:webform_submission_log'
   - 'os2web:os2web_audit'

modules/os2forms_digital_post/os2forms_digital_post.install

@@ -17,3 +17,12 @@ use Drupal\os2forms_digital_post\Helper\BeskedfordelerHelper;
 function os2forms_digital_post_schema() {
   return Drupal::service(BeskedfordelerHelper::class)->schema();
 }
+
+/**
+ * Install OS2Web key module.
+ */
+function os2forms_digital_post_update_9001(): void {
+  \Drupal::service('module_installer')->install([
+    'os2web_key',
+  ], TRUE);
+}

modules/os2forms_digital_post/os2forms_digital_post.services.yml

@@ -9,7 +9,8 @@ services:
 
   Drupal\os2forms_digital_post\Helper\Settings:
     arguments:
-      - "@keyvalue"
+      - "@config.factory"
+      - "@key.repository"
 
   Drupal\os2forms_digital_post\Helper\CertificateLocatorHelper:
     arguments:
@@ -30,11 +31,12 @@ services:
   Drupal\os2forms_digital_post\Helper\DigitalPostHelper:
     arguments:
       - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@Drupal\\os2forms_digital_post\\Helper\\CertificateLocatorHelper"
+      - "@Drupal\\os2web_key\\KeyHelper"
       - "@plugin.manager.os2web_datalookup"
       - "@Drupal\\os2forms_digital_post\\Helper\\MeMoHelper"
       - "@Drupal\\os2forms_digital_post\\Helper\\ForsendelseHelper"
       - "@Drupal\\os2forms_digital_post\\Helper\\BeskedfordelerHelper"
+      - "@Drupal\\os2forms_digital_post\\Helper\\CertificateLocatorHelper"
       - "@logger.channel.os2forms_digital_post"
       - "@logger.channel.os2forms_digital_post_submission"
       - "@os2web_audit.logger"

modules/os2forms_digital_post/src/Drush/Commands/DigitalPostTestCommands.php

@@ -19,7 +19,7 @@
 /**
  * Test commands for digital post.
  */
-class DigitalPostTestCommands extends DrushCommands {
+final class DigitalPostTestCommands extends DrushCommands {
   use AutowireTrait;
 
   /**
@@ -151,7 +151,9 @@ private function dumpDigitalPostSettings(SymfonyStyle $io): void {
       Yaml::encode([
         'testMode' => $this->digitalPostSettings->getTestMode(),
         'sender' => $this->digitalPostSettings->getSender(),
-        'certificate' => $this->digitalPostSettings->getCertificate(),
+        'certificate' => [
+          'key' => $this->digitalPostSettings->getKey(),
+        ],
         'processing' => $this->digitalPostSettings->getProcessing(),
       ]),
       '',

modules/os2forms_digital_post/src/EventSubscriber/BeskedfordelerEventSubscriber.php

@@ -8,6 +8,7 @@
 use Drupal\os2forms_digital_post\Helper\BeskedfordelerHelper;
 use Drupal\os2forms_digital_post\Helper\WebformHelperSF1601;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Event subscriber for PostStatusBeskedModtagEvent.
@@ -23,6 +24,7 @@ public function __construct(
     private readonly BeskedfordelerHelper $beskedfordelerHelper,
     private readonly MessageHelper $messageHelper,
     private readonly WebformHelperSF1601 $webformHelper,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post')]
     LoggerInterface $logger,
   ) {
     parent::__construct($logger);