Ensure address is added to both digital post pdf and fjernprint pdf

Author: jekuaitk

modules/os2forms_digital_post/src/EventSubscriber/Os2formsDigitalPostSubscriber.php

@@ -101,14 +101,16 @@ public function setDigitalPostContext(WebformSubmissionInterface $submission, Co
   public function getDigitalPostContext(WebformSubmissionInterface $submission): CompanyLookupResult|CprLookupResult|null {
     $key = $this->createSessionKeyFromSubmission($submission);
 
-    $digitalPostContext = $this->session->get($key);
+    return $this->session->get($key);
+  }
 
-    // We only need/use it once, so just remove it after fetching it.
-    if ($digitalPostContext) {
-      $this->session->remove($key);
-    }
+  /**
+   * Delete Digital Post context from the current request.
+   */
+  public function deleteDigitalPostContext(WebformSubmissionInterface $submission): bool {
+    $key = $this->createSessionKeyFromSubmission($submission);
 
-    return $digitalPostContext;
+    return (bool) $this->session->remove($key);
   }
 
   /**

modules/os2forms_digital_post/src/Helper/WebformHelperSF1601.php

@@ -156,7 +156,7 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h
       $recipientIdentifierType = 'CPR';
     }
 
-    $this->digitalPostSubscriber->setDigitalPostContext($submission, $lookupResult);
+
 
     $senderSettings = $this->settings->getSender();
     $messageOptions = [
@@ -169,7 +169,13 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h
       WebformHandlerSF1601::SENDER_LABEL => $handlerMessageSettings[WebformHandlerSF1601::SENDER_LABEL],
       WebformHandlerSF1601::MESSAGE_HEADER_LABEL => $handlerMessageSettings[WebformHandlerSF1601::MESSAGE_HEADER_LABEL],
     ];
+
+    // Set flag indicating digital post context.
+    $this->digitalPostSubscriber->setDigitalPostContext($submission, $lookupResult);
     $message = $this->meMoHelper->buildWebformSubmissionMessage($submission, $messageOptions, $handlerSettings, $lookupResult);
+    // Remove flag.
+    $this->digitalPostSubscriber->deleteDigitalPostContext($submission);
+
     $forsendelseOptions = [
       self::RECIPIENT_IDENTIFIER_TYPE => $recipientIdentifierType,
       self::RECIPIENT_IDENTIFIER => $recipientIdentifier,
@@ -181,7 +187,12 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h
       WebformHandlerSF1601::SENDER_LABEL => $handlerMessageSettings[WebformHandlerSF1601::SENDER_LABEL],
       WebformHandlerSF1601::MESSAGE_HEADER_LABEL => $handlerMessageSettings[WebformHandlerSF1601::MESSAGE_HEADER_LABEL],
     ];
+
+    // Set flag indicating digital post context.
+    $this->digitalPostSubscriber->setDigitalPostContext($submission, $lookupResult);
     $forsendelse = $this->forsendelseHelper->buildSubmissionForsendelse($submission, $forsendelseOptions, $handlerSettings, $lookupResult);
+    // Remove flag.
+    $this->digitalPostSubscriber->deleteDigitalPostContext($submission);
 
     $type = $handlerMessageSettings[WebformHandlerSF1601::TYPE] ?? SF1601::TYPE_DIGITAL_POST;