From 421a774dc36eac7be45f193fbb7a0688ef5db8a4 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Tue, 18 Jul 2023 13:49:21 +0200 Subject: [PATCH 1/3] SUPP0RT-1136: Updated allowed recipient elements --- CHANGELOG.md | 4 ++++ src/Helper/WebformHelperSF1601.php | 11 +++++++++++ src/Plugin/WebformHandler/WebformHandlerSF1601.php | 1 + 3 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5321f4d..d85e42a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added + +- Added the `CPR / Navn validering` element to allowed recipient element names + ## [2.0.0] ### Changed diff --git a/src/Helper/WebformHelperSF1601.php b/src/Helper/WebformHelperSF1601.php index 09a5e6b..4aaebe5 100644 --- a/src/Helper/WebformHelperSF1601.php +++ b/src/Helper/WebformHelperSF1601.php @@ -159,6 +159,17 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h } $recipientIdentifier = $submissionData[$recipientIdentifierKey] ?? NULL; + + // Fix in case os2forms_person_lookup (cpr and name validation) element is used for recipient. + if (is_array($recipientIdentifier)) { + // Example: + // [ + // 'cpr_number' => 1234567890, + // 'name' => Eksempel Eksempelsen, + //] + $recipientIdentifier = $recipientIdentifier['cpr_number'] ?? NULL; + } + if (NULL === $recipientIdentifier) { $message = 'Recipient identifier element (key: @element_key) not found in submission'; $context = [ diff --git a/src/Plugin/WebformHandler/WebformHandlerSF1601.php b/src/Plugin/WebformHandler/WebformHandlerSF1601.php index 7a8369e..fd7a3a4 100644 --- a/src/Plugin/WebformHandler/WebformHandlerSF1601.php +++ b/src/Plugin/WebformHandler/WebformHandlerSF1601.php @@ -246,6 +246,7 @@ private function getRecipientElements(): array { 'os2forms_nemid_company_cvr', 'os2forms_nemid_company_cvr_fetch_data', 'os2forms_nemid_cpr', + 'os2forms_person_lookup', // @todo Remove these when we remove the elements. 'cpr_element', 'cpr_value_element', From 6cd2f64a734d223c3d6fec4ad57cbb22ec4f9009 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Tue, 18 Jul 2023 13:51:37 +0200 Subject: [PATCH 2/3] SUPP0RT-1136: Updated CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d85e42a..743c69e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Versioning](https://semver.org/spec/v2.0.0.html). ### Added - Added the `CPR / Navn validering` element to allowed recipient element names + [PR-43](https://github.com/itk-dev/os2forms_digital_post/pull/43) ## [2.0.0] From dfc9f9a4adc01f9330032db5285224b58e2e27f5 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Tue, 18 Jul 2023 13:55:40 +0200 Subject: [PATCH 3/3] SUPP0RT-1136: Applied coding standards --- src/Helper/WebformHelperSF1601.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Helper/WebformHelperSF1601.php b/src/Helper/WebformHelperSF1601.php index 4aaebe5..886868b 100644 --- a/src/Helper/WebformHelperSF1601.php +++ b/src/Helper/WebformHelperSF1601.php @@ -160,14 +160,14 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h $recipientIdentifier = $submissionData[$recipientIdentifierKey] ?? NULL; - // Fix in case os2forms_person_lookup (cpr and name validation) element is used for recipient. + // Fix if os2forms_person_lookup (cpr & name validation) element is used. if (is_array($recipientIdentifier)) { - // Example: - // [ - // 'cpr_number' => 1234567890, - // 'name' => Eksempel Eksempelsen, - //] - $recipientIdentifier = $recipientIdentifier['cpr_number'] ?? NULL; + // Example: + // [ + // 'cpr_number' => 1234567890, + // 'name' => Eksempel Eksempelsen, + // ]. + $recipientIdentifier = $recipientIdentifier['cpr_number'] ?? NULL; } if (NULL === $recipientIdentifier) {