Merge branch 'develop' into release/3.16.0

Author: stankut

CHANGELOG.md

@@ -11,8 +11,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
-## [3.16.0] 2024-06-14
+## [3.16.0] 2024-08-27
 
+[#110](https://github.com/OS2Forms/os2forms/pull/110)
 - Obsolete module removing - os2forms_consent
 - Obsolete module removing - webform_embed
 - Obsolete module removing - field_color
@@ -25,6 +26,16 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Reduntand dependency removing - webform_scheduled_tasks
 - Drupal 10 compability fixes
 
+## [3.15.8] 2024-08-26
+
+- [#127](https://github.com/OS2Forms/os2forms/pull/127)
+  Correctly created MaestroNotificationHandler
+
+## [3.15.7] 2024-08-15
+
+- [#123](https://github.com/OS2Forms/os2forms/pull/123)
+  Encrypt subelements
+
 ## [3.15.6] 2024-07-16
 
 - [#120](https://github.com/OS2Forms/os2forms/pull/120)
@@ -266,7 +277,11 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.4...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.8...HEAD
+[3.15.8]: https://github.com/OS2Forms/os2forms/compare/3.15.7...3.15.8
+[3.15.7]: https://github.com/OS2Forms/os2forms/compare/3.15.6...3.15.7
+[3.15.6]: https://github.com/OS2Forms/os2forms/compare/3.15.5...3.15.6
+[3.15.5]: https://github.com/OS2Forms/os2forms/compare/3.15.4...3.15.5
 [3.15.4]: https://github.com/OS2Forms/os2forms/compare/3.15.3...3.15.4
 [3.15.3]: https://github.com/OS2Forms/os2forms/compare/3.15.2...3.15.3
 [3.15.2]: https://github.com/OS2Forms/os2forms/compare/3.15.1...3.15.2

modules/os2forms_digital_post/src/Plugin/WebformHandler/WebformHandlerSF1601.php

@@ -54,17 +54,9 @@ final class WebformHandlerSF1601 extends WebformHandlerBase {
    * @phpstan-param array<string, mixed> $configuration
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $instance = new static($configuration, $plugin_id, $plugin_definition);
-
-    $instance->loggerFactory = $container->get('logger.factory');
-    $instance->configFactory = $container->get('config.factory');
-    $instance->renderer = $container->get('renderer');
-    $instance->entityTypeManager = $container->get('entity_type.manager');
-    $instance->conditionsValidator = $container->get('webform_submission.conditions_validator');
-    $instance->tokenManager = $container->get('webform.token_manager');
-    $instance->helper = $container->get(WebformHelperSF1601::class);
+    $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
 
-    $instance->setConfiguration($configuration);
+    $instance->helper = $container->get(WebformHelperSF1601::class);
 
     return $instance;
   }

modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php

@@ -58,6 +58,11 @@ public function enabledEncrypt(): void {
 
     $defaultEncryptionProfile = $config->get('default_encryption_profile');
 
+    if (!$defaultEncryptionProfile) {
+      $this->output()->writeln('Default encryption profile is missing. Set one and try again.');
+      return;
+    }
+
     // Get the storage for Webform entity type.
     $webformStorage = $this->entityTypeManager->getStorage('webform');
 
@@ -66,12 +71,12 @@ public function enabledEncrypt(): void {
 
     /** @var \Drupal\webform\Entity\Webform $webform */
     foreach ($webforms as $webform) {
-      $elements = $webform->getElementsDecoded();
+      $elements = $webform->getElementsDecodedAndFlattened();
       $config = $webform->getThirdPartySettings('webform_encrypt');
 
       $changed = FALSE;
       foreach ($elements as $key => $element) {
-        if (!isset($config['element'][$key])) {
+        if (!isset($config['element'][$key]) || $config['element'][$key]['encrypt_profile'] === NULL) {
           $config['element'][$key] = [
             'encrypt' => TRUE,
             'encrypt_profile' => $defaultEncryptionProfile,

modules/os2forms_encrypt/src/Helper/Os2FormsEncryptor.php

@@ -89,7 +89,7 @@ public function enableEncryption(WebformInterface $webform): void {
     }
 
     // Check that there are any elements to enable encryption on.
-    $elements = $webform->getElementsDecoded();
+    $elements = $webform->getElementsDecodedAndFlattened();
 
     if (empty($elements)) {
       return;

modules/os2forms_forloeb/src/Plugin/WebformHandler/MaestroNotificationHandler.php

@@ -6,7 +6,6 @@
 use Drupal\Core\Link;
 use Drupal\os2forms_forloeb\MaestroHelper;
 use Drupal\webform\Plugin\WebformHandlerBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Maestro notification handler.
@@ -45,23 +44,6 @@ final class MaestroNotificationHandler extends WebformHandlerBase {
    */
   private const NOTIFICATION_SUBJECT_MAX_LENGTH = 128;
 
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $instance = new static($configuration, $plugin_id, $plugin_definition);
-
-    $instance->loggerFactory = $container->get('logger.factory');
-    $instance->configFactory = $container->get('config.factory');
-    $instance->renderer = $container->get('renderer');
-    $instance->entityTypeManager = $container->get('entity_type.manager');
-    $instance->conditionsValidator = $container->get('webform_submission.conditions_validator');
-
-    $instance->setConfiguration($configuration);
-
-    return $instance;
-  }
-
   /**
    * {@inheritdoc}
    */