From fbdf4c660bcb3d55f28ae177dea95caeb8eb3741 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Wed, 3 Apr 2024 08:40:45 +0200
Subject: [PATCH 1/9] 1062: Added webform encrypt module

---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 50d3d8f..a6e5c88 100644
--- a/composer.json
+++ b/composer.json
@@ -62,6 +62,7 @@
         "drupal/user_default_page": "^2.1",
         "drupal/webform": "^6.1",
         "drupal/webform_composite": "^1.0@RC",
+        "drupal/webform_encrypt": "^1.0@beta",
         "drupal/webform_migrate": "^1.1",
         "drupal/webform_node_element": "^1.2",
         "drupal/webform_remote_handlers": "^1.6.0",
@@ -112,6 +113,9 @@
             },
             "drupal/dynamic_entity_reference": {
                 "entityQuery reference JOINs should specify target_type (https://www.drupal.org/project/dynamic_entity_reference/issues/3120952#comment-14141038)": "https://www.drupal.org/files/issues/2021-06-22/entityquery-reference-joins-should-specify-target_type-3120952-24.patch"
+            },
+            "drupal/webform_encrypt": {
+                "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch"
             }
         }
     },

From f625a94e90583333e10141c861aa9ada9dbcb438 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Thu, 4 Apr 2024 15:35:07 +0200
Subject: [PATCH 2/9] 1062: Added helper function to toggle default webform
 encrypt

---
 CHANGELOG.md                                  |  1 +
 composer.json                                 |  3 +-
 .../install/encrypt.profile.webform.yml       | 13 ++++
 .../config/install/key.key.webform.yml        | 17 ++++++
 .../install/os2forms_encrypt.settings.yml     |  1 +
 .../os2forms_encrypt.info.yml                 | 11 ++++
 .../os2forms_encrypt.links.menu.yml           |  5 ++
 .../os2forms_encrypt/os2forms_encrypt.module  | 22 +++++++
 .../os2forms_encrypt.routing.yml              |  7 +++
 .../src/Element/WebformElementEncrypt.php     | 31 ++++++++++
 .../src/Form/SettingsForm.php                 | 59 +++++++++++++++++++
 11 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 modules/os2forms_encrypt/config/install/encrypt.profile.webform.yml
 create mode 100644 modules/os2forms_encrypt/config/install/key.key.webform.yml
 create mode 100644 modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml
 create mode 100644 modules/os2forms_encrypt/os2forms_encrypt.info.yml
 create mode 100644 modules/os2forms_encrypt/os2forms_encrypt.links.menu.yml
 create mode 100644 modules/os2forms_encrypt/os2forms_encrypt.module
 create mode 100644 modules/os2forms_encrypt/os2forms_encrypt.routing.yml
 create mode 100644 modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
 create mode 100644 modules/os2forms_encrypt/src/Form/SettingsForm.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1764f8..935f5df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- Added webform encryption modules
 - Adding Lat and Long fetching to DataAddress
 - [#84](https://github.com/OS2Forms/os2forms/pull/84)
   Added digital post test command.
diff --git a/composer.json b/composer.json
index a6e5c88..beee432 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,7 @@
         "drupal/simple_ldap": "^1.0@alpha",
         "drupal/simplesamlphp_auth": "^3.2",
         "drupal/smtp": "^1.0@beta",
+        "drupal/sodium": "^2.4",
         "drupal/switch_page_theme": "^4.0",
         "drupal/telephone_validation": "^2.2",
         "drupal/token": "^1.5",
@@ -62,7 +63,7 @@
         "drupal/user_default_page": "^2.1",
         "drupal/webform": "^6.1",
         "drupal/webform_composite": "^1.0@RC",
-        "drupal/webform_encrypt": "^1.0@beta",
+        "drupal/webform_encrypt": "^2.0@alpha",
         "drupal/webform_migrate": "^1.1",
         "drupal/webform_node_element": "^1.2",
         "drupal/webform_remote_handlers": "^1.6.0",
diff --git a/modules/os2forms_encrypt/config/install/encrypt.profile.webform.yml b/modules/os2forms_encrypt/config/install/encrypt.profile.webform.yml
new file mode 100644
index 0000000..19891df
--- /dev/null
+++ b/modules/os2forms_encrypt/config/install/encrypt.profile.webform.yml
@@ -0,0 +1,13 @@
+uuid: 98e9a380-a5d6-4d2a-9176-7c50a9ec7c47
+langcode: en
+status: true
+dependencies:
+  config:
+    - key.key.webform
+  module:
+    - sodium
+id: webform
+label: Webform
+encryption_method: sodium
+encryption_method_configuration: {  }
+encryption_key: webform
diff --git a/modules/os2forms_encrypt/config/install/key.key.webform.yml b/modules/os2forms_encrypt/config/install/key.key.webform.yml
new file mode 100644
index 0000000..aaabea7
--- /dev/null
+++ b/modules/os2forms_encrypt/config/install/key.key.webform.yml
@@ -0,0 +1,17 @@
+uuid: be3383e8-1b0e-4b50-989f-e132900d02a0
+langcode: en
+status: true
+dependencies: {  }
+id: webform
+label: Webform
+description: 'Encrypt webform submissions'
+key_type: encryption
+key_type_settings:
+  key_size: 256
+key_provider: config
+key_provider_settings:
+  key_value: LWD5+0klWZn48ZVs13UVHaHJYawX62PAMd3sklkKj/w=
+  base64_encoded: true
+key_input: text_field
+key_input_settings:
+  base64_encoded: true
diff --git a/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml b/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml
new file mode 100644
index 0000000..cbd7f1b
--- /dev/null
+++ b/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml
@@ -0,0 +1 @@
+enabled: 1
diff --git a/modules/os2forms_encrypt/os2forms_encrypt.info.yml b/modules/os2forms_encrypt/os2forms_encrypt.info.yml
new file mode 100644
index 0000000..5e1e7ed
--- /dev/null
+++ b/modules/os2forms_encrypt/os2forms_encrypt.info.yml
@@ -0,0 +1,11 @@
+name: OS2Forms Encrypt
+description: Encryption functionality for OS2Forms web-forms
+package: OS2Forms
+type: module
+version: 1.0.0
+core_version_requirement: ^8 || ^9 || ^10
+dependencies:
+  - 'drupal:webform_encrypt'
+  - 'drupal:sodium'
+
+configure: os2forms_encrypt.admin_settings
diff --git a/modules/os2forms_encrypt/os2forms_encrypt.links.menu.yml b/modules/os2forms_encrypt/os2forms_encrypt.links.menu.yml
new file mode 100644
index 0000000..c7c63f8
--- /dev/null
+++ b/modules/os2forms_encrypt/os2forms_encrypt.links.menu.yml
@@ -0,0 +1,5 @@
+os2forms_encrypt.admin_settings:
+  title: 'OS2Forms Encrypt settings'
+  parent: system.admin_config_system
+  description: 'Settings for the OS2Forms Encrypt module'
+  route_name: os2forms_encrypt.admin_settings
diff --git a/modules/os2forms_encrypt/os2forms_encrypt.module b/modules/os2forms_encrypt/os2forms_encrypt.module
new file mode 100644
index 0000000..839b8a4
--- /dev/null
+++ b/modules/os2forms_encrypt/os2forms_encrypt.module
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ */
+
+/**
+ * Implements hook_webform_element_info_alter().
+ *
+ * Add extra processing function to "force" enabled encryption on webform
+ * elements when they are being saved in the UI.
+ */
+function os2forms_encrypt_element_info_alter(array &$definitions): void {
+  foreach ($definitions as $element_id => &$definition) {
+    if ($element_id === 'webform_element_encrypt') {
+      $definition['#process'][] = [
+        'Drupal\os2forms_encrypt\Element\WebformElementEncrypt',
+        'processWebformElementEncrypt',
+      ];
+    }
+  }
+}
diff --git a/modules/os2forms_encrypt/os2forms_encrypt.routing.yml b/modules/os2forms_encrypt/os2forms_encrypt.routing.yml
new file mode 100644
index 0000000..2b23f68
--- /dev/null
+++ b/modules/os2forms_encrypt/os2forms_encrypt.routing.yml
@@ -0,0 +1,7 @@
+os2forms_encrypt.admin_settings:
+  path: '/admin/config/os2forms_encrypt/settings'
+  defaults:
+    _form: '\Drupal\os2forms_encrypt\Form\SettingsForm'
+    _title: 'OS2Forms Encrypt settings'
+  requirements:
+    _permission: 'administer encrypt'
diff --git a/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php b/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
new file mode 100644
index 0000000..f9dca52
--- /dev/null
+++ b/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\os2forms_encrypt\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\os2forms_encrypt\Form\SettingsForm;
+
+/**
+ * Class WebformElementEncrypt
+ *
+ * This class contains a static method to process element attributes for webforms.
+ *
+ * @package Drupal\Core\Extension\Module\YourModule\WebformElementEncrypt
+ */
+class WebformElementEncrypt {
+
+  /**
+   * Processes element attributes.
+   *
+   * Enabled encryption as default.
+   */
+  public static function processWebformElementEncrypt(&$element, FormStateInterface $form_state, &$complete_form): array {
+    $config = \Drupal::config(SettingsForm::$configName);
+    if ($config->get('enabled')) {
+      $element['element_encrypt']['encrypt']['#default_value'] = TRUE;
+    }
+
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_encrypt/src/Form/SettingsForm.php b/modules/os2forms_encrypt/src/Form/SettingsForm.php
new file mode 100644
index 0000000..a6827d8
--- /dev/null
+++ b/modules/os2forms_encrypt/src/Form/SettingsForm.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\os2forms_encrypt\Form;
+
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class Os2FormsEncryptAdminForm.
+ */
+class SettingsForm extends ConfigFormBase {
+
+  /**
+   * @var string $configName
+   */
+  public static string $configName = 'os2forms_encrypt.settings';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames(): array {
+    return [self::$configName];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId(): string {
+    return 'os2forms_encrypt_admin_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state): array {
+    $config = $this->config('os2forms_encrypt.settings');
+
+    $form['enabled'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Enabled encryption'),
+      '#description' => $this->t('Enable encryption for all webform fields. Please note that encryption will be applied only to those fields that are modified after enabling this option.'),
+      '#default_value' => $config->get('enabled'),
+    ];
+
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state): void {
+    parent::submitForm($form, $form_state);
+
+    $this->config(self::$configName)
+      ->set('enabled', $form_state->getValue('enabled'))
+      ->save();
+  }
+
+}

From 4381d7ca5afdf0bdf3b4c0e2fbfd3e6be7c1fae4 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Fri, 5 Apr 2024 09:44:26 +0200
Subject: [PATCH 3/9] 1062: Added drush command to enable webform encrypt for
 all forms

---
 modules/os2forms_encrypt/drush.services.yml   |  6 ++
 .../src/Commands/Os2FormsEncryptCommands.php  | 83 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 modules/os2forms_encrypt/drush.services.yml
 create mode 100644 modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php

diff --git a/modules/os2forms_encrypt/drush.services.yml b/modules/os2forms_encrypt/drush.services.yml
new file mode 100644
index 0000000..f5d6e41
--- /dev/null
+++ b/modules/os2forms_encrypt/drush.services.yml
@@ -0,0 +1,6 @@
+services:
+  os2forms_encrypt.commands:
+    class: Drupal\os2forms_encrypt\Commands\Os2FormsEncryptCommands
+    arguments: ['@entity_type.manager', '@plugin.manager.webform.element']
+    tags:
+      - { name: drush.command }
diff --git a/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php b/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
new file mode 100644
index 0000000..3639d2c
--- /dev/null
+++ b/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Drupal\os2forms_encrypt\Commands;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\os2forms_encrypt\Form\SettingsForm;
+use Drupal\webform\Plugin\WebformElementManagerInterface;
+use Drush\Commands\DrushCommands;
+
+/**
+ * A Drush command file.
+ *
+ * @package Drupal\os2forms_encrypt\Commands
+ */
+class Os2FormsEncryptCommands extends DrushCommands {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * @var \Drupal\webform\Plugin\WebformElementManagerInterface
+   */
+  private WebformElementManagerInterface $webformElementManager;
+
+  /**
+   * Constructs a new Os2FormsEncryptCommands object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, WebformElementManagerInterface $webformElementManager) {
+    $this->entityTypeManager = $entityTypeManager;
+    $this->webformElementManager = $webformElementManager;
+    parent::__construct();
+  }
+
+  /**
+   * Enable encrypt for all existing webform elements.
+   *
+   * @command os2forms-encrypt:enable
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   */
+  public function enabledEncrypt(): void {
+    $config = \Drupal::config(SettingsForm::$configName);
+    if (!$config->get('enabled')) {
+      $this->output()->writeln('Encrypt has not been enabled.');
+      return;
+    }
+
+    // Get the storage for Webform entity type.
+    $webformStorage = $this->entityTypeManager->getStorage('webform');
+
+    // Load all webform entities.
+    $webforms = $webformStorage->loadMultiple();
+
+    /** @var \Drupal\webform\Entity\Webform $webform */
+    foreach ($webforms as $webform) {
+      // This will give you an associative array of all elements in the current webform.
+      $elements = $webform->getElementsDecoded();
+      $config = $webform->getThirdPartySettings('webform_encrypt');
+
+      foreach ($elements as $key => $element) {
+        if (!isset($config['element'][$key])) {
+          $config['element'][$key] = [
+            'encrypt' => TRUE,
+            'encrypt_profile' => 'webform',
+          ];
+        }
+      }
+
+      // After modifying the element array, encode it back into a string and set it back on the webform entity.
+      $webform->setThirdPartySetting('webform_encrypt', 'element', $config['element']);
+
+      // Save the webform entity so the changes persist.
+      $webform->save();
+    }
+  }
+}

From e5ff65937d934b4ca72462b3c358aeb583749213 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Fri, 5 Apr 2024 10:20:24 +0200
Subject: [PATCH 4/9] 1062: Fixed code style in module to enable webform
 encrypt

---
 modules/os2forms_encrypt/drush.services.yml   |  2 +-
 .../os2forms_encrypt/os2forms_encrypt.module  |  1 +
 .../src/Commands/Os2FormsEncryptCommands.php  | 39 ++++++++++++-------
 .../src/Element/WebformElementEncrypt.php     |  5 ++-
 .../src/Form/SettingsForm.php                 |  4 +-
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/modules/os2forms_encrypt/drush.services.yml b/modules/os2forms_encrypt/drush.services.yml
index f5d6e41..ccb7a2a 100644
--- a/modules/os2forms_encrypt/drush.services.yml
+++ b/modules/os2forms_encrypt/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   os2forms_encrypt.commands:
     class: Drupal\os2forms_encrypt\Commands\Os2FormsEncryptCommands
-    arguments: ['@entity_type.manager', '@plugin.manager.webform.element']
+    arguments: ['@entity_type.manager', '@config.factory']
     tags:
       - { name: drush.command }
diff --git a/modules/os2forms_encrypt/os2forms_encrypt.module b/modules/os2forms_encrypt/os2forms_encrypt.module
index 839b8a4..daef0b2 100644
--- a/modules/os2forms_encrypt/os2forms_encrypt.module
+++ b/modules/os2forms_encrypt/os2forms_encrypt.module
@@ -2,6 +2,7 @@
 
 /**
  * @file
+ * This module enabled webform submission encryption as a default option.
  */
 
 /**
diff --git a/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php b/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
index 3639d2c..29889fc 100644
--- a/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
+++ b/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\os2forms_encrypt\Commands;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\os2forms_encrypt\Form\SettingsForm;
-use Drupal\webform\Plugin\WebformElementManagerInterface;
 use Drush\Commands\DrushCommands;
 
 /**
@@ -19,22 +19,28 @@ class Os2FormsEncryptCommands extends DrushCommands {
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityTypeManager;
+  protected EntityTypeManagerInterface $entityTypeManager;
 
   /**
-   * @var \Drupal\webform\Plugin\WebformElementManagerInterface
+   * Factory to get module configuration.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
    */
-  private WebformElementManagerInterface $webformElementManager;
+  protected ConfigFactoryInterface $configFactory;
 
   /**
-   * Constructs a new Os2FormsEncryptCommands object.
+   * Class constructor.
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
-   *   The entity type manager.
+   *   An instance of the entity type manager.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
+   *   An instance of the config factory.
+   *
+   * @return void
    */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, WebformElementManagerInterface $webformElementManager) {
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, ConfigFactoryInterface $configFactory) {
     $this->entityTypeManager = $entityTypeManager;
-    $this->webformElementManager = $webformElementManager;
+    $this->configFactory = $configFactory;
     parent::__construct();
   }
 
@@ -46,7 +52,7 @@ public function __construct(EntityTypeManagerInterface $entityTypeManager, Webfo
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
   public function enabledEncrypt(): void {
-    $config = \Drupal::config(SettingsForm::$configName);
+    $config = $this->configFactory->get(SettingsForm::$configName);
     if (!$config->get('enabled')) {
       $this->output()->writeln('Encrypt has not been enabled.');
       return;
@@ -60,24 +66,27 @@ public function enabledEncrypt(): void {
 
     /** @var \Drupal\webform\Entity\Webform $webform */
     foreach ($webforms as $webform) {
-      // This will give you an associative array of all elements in the current webform.
       $elements = $webform->getElementsDecoded();
       $config = $webform->getThirdPartySettings('webform_encrypt');
 
+      $changed = FALSE;
       foreach ($elements as $key => $element) {
         if (!isset($config['element'][$key])) {
           $config['element'][$key] = [
             'encrypt' => TRUE,
             'encrypt_profile' => 'webform',
           ];
+          $changed = TRUE;
         }
       }
 
-      // After modifying the element array, encode it back into a string and set it back on the webform entity.
-      $webform->setThirdPartySetting('webform_encrypt', 'element', $config['element']);
-
-      // Save the webform entity so the changes persist.
-      $webform->save();
+      // Save the webform entity so the changes persist, if any changes where
+      // made.
+      if ($changed) {
+        $webform->setThirdPartySetting('webform_encrypt', 'element', $config['element']);
+        $webform->save();
+      }
     }
   }
+
 }
diff --git a/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php b/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
index f9dca52..066e3db 100644
--- a/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
+++ b/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
@@ -6,9 +6,10 @@
 use Drupal\os2forms_encrypt\Form\SettingsForm;
 
 /**
- * Class WebformElementEncrypt
+ * Class WebformElementEncrypt.
  *
- * This class contains a static method to process element attributes for webforms.
+ * This class contains a static method to process element attributes for
+ * webforms.
  *
  * @package Drupal\Core\Extension\Module\YourModule\WebformElementEncrypt
  */
diff --git a/modules/os2forms_encrypt/src/Form/SettingsForm.php b/modules/os2forms_encrypt/src/Form/SettingsForm.php
index a6827d8..0fd05fc 100644
--- a/modules/os2forms_encrypt/src/Form/SettingsForm.php
+++ b/modules/os2forms_encrypt/src/Form/SettingsForm.php
@@ -11,7 +11,9 @@
 class SettingsForm extends ConfigFormBase {
 
   /**
-   * @var string $configName
+   * The name of the configuration setting.
+   *
+   * @var string
    */
   public static string $configName = 'os2forms_encrypt.settings';
 

From 6f3fb497297671770180c218dbfd62348d46d3f0 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Fri, 5 Apr 2024 10:56:30 +0200
Subject: [PATCH 5/9] 1062: Added notification to encrypt settings page

---
 modules/os2forms_encrypt/src/Form/SettingsForm.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/os2forms_encrypt/src/Form/SettingsForm.php b/modules/os2forms_encrypt/src/Form/SettingsForm.php
index 0fd05fc..62e2c6a 100644
--- a/modules/os2forms_encrypt/src/Form/SettingsForm.php
+++ b/modules/os2forms_encrypt/src/Form/SettingsForm.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
 
 /**
  * Class Os2FormsEncryptAdminForm.
@@ -37,6 +38,17 @@ public function getFormId(): string {
   public function buildForm(array $form, FormStateInterface $form_state): array {
     $config = $this->config('os2forms_encrypt.settings');
 
+    $link = Link::createFromRoute($this->t('administration'), 'entity.key.collection');
+    $form['notice'] = [
+      '#type' => 'inline_template',
+      '#template' => '<h3>{{ title }}</h3><p>{{ message|t }}</p><p>{{ adminMessage|t }}</p>',
+      '#context' => [
+        'title' => 'Please note',
+        'message' => 'The encryption key that comes with this module should <strong>not</strong> be used and should be changed before encrypting anything.',
+        'adminMessage' => 'You can modify the key (named "webform") in the keys ' . $link->toString() . ' panel. Additionally, the execution of this command can generate a new 256-bit key for you: <pre>dd if=/dev/urandom bs=32 count=1 | base64 -i -</pre>',
+      ],
+    ];
+
     $form['enabled'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Enabled encryption'),

From cfb29bf96e79ebb8721059962cd3cd726f272615 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Mon, 8 Apr 2024 10:17:28 +0200
Subject: [PATCH 6/9] 1062: Updated minor code style fixes in webform encrypt

---
 .../os2forms_encrypt/src/Element/WebformElementEncrypt.php    | 2 --
 modules/os2forms_encrypt/src/Form/SettingsForm.php            | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php b/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
index 066e3db..4e27189 100644
--- a/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
+++ b/modules/os2forms_encrypt/src/Element/WebformElementEncrypt.php
@@ -10,8 +10,6 @@
  *
  * This class contains a static method to process element attributes for
  * webforms.
- *
- * @package Drupal\Core\Extension\Module\YourModule\WebformElementEncrypt
  */
 class WebformElementEncrypt {
 
diff --git a/modules/os2forms_encrypt/src/Form/SettingsForm.php b/modules/os2forms_encrypt/src/Form/SettingsForm.php
index 62e2c6a..14e1f81 100644
--- a/modules/os2forms_encrypt/src/Form/SettingsForm.php
+++ b/modules/os2forms_encrypt/src/Form/SettingsForm.php
@@ -7,7 +7,9 @@
 use Drupal\Core\Link;
 
 /**
- * Class Os2FormsEncryptAdminForm.
+ * Class SettingsForm.
+ *
+ * This is the settings for the module.
  */
 class SettingsForm extends ConfigFormBase {
 

From 41811ae9917cd7f5bc8aed9223574e82f287e018 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <jeskr@aarhus.dk>
Date: Mon, 8 Apr 2024 10:38:24 +0200
Subject: [PATCH 7/9] 1062: Fixed title translation in os2form encrypt

Co-authored-by: Jeppe Kuhlmann Andersen <78410897+jekuaitk@users.noreply.github.com>
---
 modules/os2forms_encrypt/src/Form/SettingsForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/os2forms_encrypt/src/Form/SettingsForm.php b/modules/os2forms_encrypt/src/Form/SettingsForm.php
index 14e1f81..35722d3 100644
--- a/modules/os2forms_encrypt/src/Form/SettingsForm.php
+++ b/modules/os2forms_encrypt/src/Form/SettingsForm.php
@@ -43,7 +43,7 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
     $link = Link::createFromRoute($this->t('administration'), 'entity.key.collection');
     $form['notice'] = [
       '#type' => 'inline_template',
-      '#template' => '<h3>{{ title }}</h3><p>{{ message|t }}</p><p>{{ adminMessage|t }}</p>',
+      '#template' => '<h3>{{ title|t }}</h3><p>{{ message|t }}</p><p>{{ adminMessage|t }}</p>',
       '#context' => [
         'title' => 'Please note',
         'message' => 'The encryption key that comes with this module should <strong>not</strong> be used and should be changed before encrypting anything.',

From 0a647d1d85ee0b4e1621a6577f41d2f1334a3f3f Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Fri, 3 May 2024 13:31:37 +0200
Subject: [PATCH 8/9] 1062: Disabled default encrypt, to allow admin to set new
 key first

---
 .../config/install/os2forms_encrypt.settings.yml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml b/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml
index cbd7f1b..b2c9a5f 100644
--- a/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml
+++ b/modules/os2forms_encrypt/config/install/os2forms_encrypt.settings.yml
@@ -1 +1 @@
-enabled: 1
+enabled: 0

From 7c9b5e481a9f80dceabcefb1808f9d5c35281192 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Fri, 3 May 2024 13:33:51 +0200
Subject: [PATCH 9/9] 1062: Removed empty void return docblock

---
 .../os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php b/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
index 29889fc..e892054 100644
--- a/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
+++ b/modules/os2forms_encrypt/src/Commands/Os2FormsEncryptCommands.php
@@ -35,8 +35,6 @@ class Os2FormsEncryptCommands extends DrushCommands {
    *   An instance of the entity type manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
    *   An instance of the config factory.
-   *
-   * @return void
    */
   public function __construct(EntityTypeManagerInterface $entityTypeManager, ConfigFactoryInterface $configFactory) {
     $this->entityTypeManager = $entityTypeManager;