Merge branch 'develop' into f/OS-115_dawa_address

Author: skifter

CHANGELOG.md

@@ -11,10 +11,89 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
-- [OS-115] Skipping empty maktrikula objects
+## [4.0.0] 2025-03-06
+
+- This is an alias for for 3.22.2. Major change is the module removal, which can lead to lack of backward support.
+See full release note here:
+https://github.com/OS2Forms/os2forms_docs/blob/master/docs/releases/2024-Q4-Release-notes.md
+
+## [3.22.2] 2025-02-28
+
+- Updated `os2web_audit`.
+
+## [3.22.1] 2025-02-10
+
+- Updated `os2forms_fbs_handler` to include and correct set phone number [#161](https://github.com/OS2Forms/os2forms/pull/161)
+
+## [3.22.0] 2025-02-03
+
+- Removed modules ldap_auth, logging_alerts, maillog [#151](https://github.com/OS2Forms/os2forms/pull/151)
+- Removed module image_widget_crop [#OS-143](https://github.com/OS2Forms/os2forms/pull/159)
+
+## [3.21.2] 2025-01-07
+
+- Adds missing `http-message-util` requirement and use statement.
+- Runs code-analysis on `os2forms_fbs_handler` module.
+
+## [3.21.1] 2025-01-06
+
+- Updated Maestro notification handler assignment message format.
+- Updated `os2forms_fbs_handler` to use latest endpoints and operations.
+
+## [3.21.0] 2024-12-17
+
+- Updated `os2web_audit`.
+- Added patch to get `hook_webform_post_load_data` in webform submissions.
+
+## [3.20.1] 2024-12-10
+
+- Avoided accessing non-initialized property when logging in `os2forms_nemid`.
+
+## [3.20.0] 2024-12-09
+
+- Added webform ID to digital post audit logging messages.
+- Added audit logging to `os2forms_fasit`
+- Added audit logging to `os2forms_fbs_handler`
+
+## [3.19.0] 2024-12-06
+
+- Ensured installation of `os2web_audit`
+  - `os2web_audit` has default logging through `watchdog`
+- Adds audit logging to `os2forms_digital_post`
+- Adds audit logging to `os2forms_nemid`
+
+## [3.18.0] 2024-12-05
+
+- Added `os2forms_fasit` module.
+
+## [3.17.0] 2024-11-21
+
+- Updated `os2web/os2web_audit` version
+- Updated `os2web/os2web_datalookup` version
+
+## [3.16.2] 2024-10-31
+
+- Applied coding standards
+- [#192](https://github.com/OS2Forms/os2forms/pull/129)
+  Added audit logging module from os2web
+- Remove dependency on webform migration module
+- [#100](https://github.com/OS2Forms/os2forms/pull/100)
+  Removed unused `tecnickcom/tcpdf` package.
+
+## [3.16.1] 2024-09-20
+
+- [#133](https://github.com/OS2Forms/os2forms/pull/133)
+[OS-119] Keeping value of CPR clean, not adding address protection text
+
+## [3.16.0-beta1] 2024-08-27
 
 ## [3.16.0] 2024-08-27
 
+f/OS-115_dawa_address
+- [OS-115] Skipping empty maktrikula objects
+
+
+
 [#110](https://github.com/OS2Forms/os2forms/pull/110)
 
 - Obsolete module removing - os2forms_consent
@@ -280,7 +359,21 @@ 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.8...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.22.2...HEAD
+[3.22.2]: https://github.com/OS2Forms/os2forms/compare/3.22.1...3.22.2
+[3.22.1]: https://github.com/OS2Forms/os2forms/compare/3.22.0...3.22.1
+[3.22.0]: https://github.com/OS2Forms/os2forms/compare/3.21.2...3.22.0
+[3.21.2]: https://github.com/OS2Forms/os2forms/compare/3.21.1...3.21.2
+[3.21.1]: https://github.com/OS2Forms/os2forms/compare/3.21.0...3.21.1
+[3.21.0]: https://github.com/OS2Forms/os2forms/compare/3.20.1...3.21.0
+[3.20.1]: https://github.com/OS2Forms/os2forms/compare/3.20.0...3.20.1
+[3.20.0]: https://github.com/OS2Forms/os2forms/compare/3.19.0...3.20.0
+[3.19.0]: https://github.com/OS2Forms/os2forms/compare/3.18.0...3.19.0
+[3.18.0]: https://github.com/OS2Forms/os2forms/compare/3.17.0...3.18.0
+[3.17.0]: https://github.com/OS2Forms/os2forms/compare/3.16.2...3.17.0
+[3.16.2]: https://github.com/OS2Forms/os2forms/compare/3.16.1...3.16.2
+[3.16.1]: https://github.com/OS2Forms/os2forms/compare/3.16.0-beta1...3.16.1
+[3.16.0-beta1]: https://github.com/OS2Forms/os2forms/compare/3.15.8...3.16.0-beta1
 [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

composer.json

@@ -23,6 +23,7 @@
         "dompdf/dompdf": "^2.0",
         "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": "^2.0@alpha",
         "drupal/config_entity_revisions": "dev-2.0.x",
@@ -31,14 +32,12 @@
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
         "drupal/events_logging": "^2.0@beta",
+        "drupal/gin": "^3.0-rc",
         "drupal/honeypot": "^2.0",
-        "drupal/image_widget_crop": "^2.3",
         "drupal/ldap": "^4.2",
-        "drupal/ldap_auth": "^1.17",
         "drupal/leaflet": "^10.0",
         "drupal/leaflet_layers": "^1.1",
         "drupal/libraries": "^4.0",
-        "drupal/logging_alerts": "^2.0",
         "drupal/maestro": "^3.1",
         "drupal/mailsystem": "^4.1",
         "drupal/masquerade": "^2.0@RC",
@@ -58,23 +57,24 @@
         "drupal/webform": "^6.1",
         "drupal/webform_composite": "^1.0@RC",
         "drupal/webform_encrypt": "^2.0@alpha",
-        "drupal/webform_migrate": "^2.0@alpha",
         "drupal/webform_node_element": "^1.2",
         "drupal/webform_remote_handlers": "^3.0",
         "drupal/webform_remote_select": "^1.0.6",
         "drupal/webform_rest": "^4.0.0-beta2",
         "drupal/webform_validation": "^2.0",
         "drupal/webform_views": "^5.0@alpha",
         "drupal/workflow_participants": "^3.0@RC",
+        "fig/http-message-util": "^1.1",
         "http-interop/http-factory-guzzle": "^1.0.0",
         "itk-dev/beskedfordeler-drupal": "^1.0",
         "itk-dev/serviceplatformen": "^1.5",
-        "os2web/os2web_datalookup": "^1.5",
+        "os2web/os2web_audit": "^1.0",
+        "os2web/os2web_datalookup": "^2.0",
         "os2web/os2web_nemlogin": "^1.0",
+        "os2web/os2web_simplesaml": "dev-master",
         "php-http/guzzle7-adapter": "^1.0",
         "phpoffice/phpword": "^0.18.2",
         "symfony/options-resolver": "^5.4 || ^6.0",
-        "tecnickcom/tcpdf": "~6",
         "webmozart/path-util": "^2.3",
         "wsdltophp/packagebase": "^5.0",
         "zaporylie/composer-drupal-optimizations": "^1.2",
@@ -83,7 +83,6 @@
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "drupal/coder": "^8.3",
-        "drupal/maillog": "^1.0",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan-deprecation-rules": "^1.1",
@@ -99,7 +98,9 @@
             },
             "drupal/webform": {
                 "Unlock possibility of using Entity print module export to Word": "https://www.drupal.org/files/issues/2020-02-29/3096552-6.patch",
-                "Webform computed element post save alter": "https://www.drupal.org/files/issues/2024-06-25/webform_computed_post_save_field_alter.patch"
+                "Webform computed element post save alter": "https://www.drupal.org/files/issues/2024-06-25/webform_computed_post_save_field_alter.patch",
+                "Add custom hook (hook_webform_post_load_data) for audit logging": "https://gist.githubusercontent.com/cableman/d26898fc8f65ee0a31001bf391583b59/raw/6189dc4c2ceaabb19d25cc4b98b0b3028a6b0e1e/gistfile1.txt"
+
             },
             "drupal/coc_forms_auto_export": {
                 "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch",
@@ -149,7 +150,8 @@
             "phpstan/extension-installer": true,
             "simplesamlphp/composer-module-installer": true,
             "vaimo/composer-patches": true,
-            "zaporylie/composer-drupal-optimizations": true
+            "zaporylie/composer-drupal-optimizations": true,
+            "mglaman/composer-drupal-lenient": true
         }
     }
 }

modules/os2forms_autocomplete/src/Plugin/WebformElement/AutocompleteElement.php

@@ -38,7 +38,7 @@ protected function defineDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     if (isset($element['#webform_key'])) {

modules/os2forms_dawa/src/Plugin/WebformElement/DawaElementAddress.php

@@ -31,7 +31,7 @@ public function getDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     $element['#autocomplete_route_parameters']['remove_place_name'] = $element['#remove_place_name'] ?? FALSE;

modules/os2forms_dawa/src/Plugin/WebformElement/DawaElementAddressMatrikula.php

@@ -36,7 +36,7 @@ public function getDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     $element['#webform_composite_elements']['address']['#remove_place_name'] = TRUE;

modules/os2forms_dawa/src/Plugin/WebformElement/DawaElementBase.php

@@ -25,7 +25,7 @@ public function getDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     $element['#autocomplete_route_name'] = 'os2forms_dawa.element.autocomplete';

modules/os2forms_dawa/src/Plugin/WebformElement/DawaElementBlock.php

@@ -30,7 +30,7 @@ public function getDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     $element['#autocomplete_route_parameters']['remove_code'] = $element['#remove_code'] ?? FALSE;

modules/os2forms_dawa/src/Plugin/WebformElement/DawaElementMatrikula.php

@@ -31,7 +31,7 @@ public function getDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     $element['#autocomplete_route_parameters']['remove_code'] = $element['#remove_code'] ?? FALSE;

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

@@ -6,6 +6,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\os2forms_dawa\Entity\DatafordelerMatrikula;
+use Drupal\os2web_audit\Service\Logger;
 use Drupal\os2web_datalookup\Plugin\os2web\DataLookup\DataLookupBase;
 use GuzzleHttp\ClientInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -30,9 +31,15 @@ class DatafordelerDataLookup extends DataLookupBase implements DatafordelerDataL
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ClientInterface $httpClient) {
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    $plugin_definition,
+    ClientInterface $httpClient,
+    Logger $auditLogger,
+  ) {
     $this->httpClient = $httpClient;
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $auditLogger);
   }
 
   /**
@@ -44,6 +51,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $container->get('http_client'),
+      $container->get('os2web_audit.logger'),
     );
   }
 
@@ -107,7 +115,7 @@ public function getMatrikulaEntries(string $matrikulaId) : array {
   /**
    * {@inheritdoc}
    */
-  public function defaultConfiguration() {
+  public function defaultConfiguration(): array {
     return [
       'username' => '',
       'password' => '',

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

@@ -46,7 +46,7 @@ public function getMatrikulaAutocompletePath() {
   /**
    * {@inheritdoc}
    */
-  public function defaultConfiguration() {
+  public function defaultConfiguration(): array {
     return [
       'address_autocomplete_path' => 'https://dawa.aws.dk/adresser/autocomplete',
       'address_api_path' => 'https://dawa.aws.dk/adresser',