Cleaned up

Author: rimi-itk

config/sync/symfony_mailer.mailer_policy.hoeringsportal_anonymous_edit.content_recover.yml

@@ -8,7 +8,7 @@ id: hoeringsportal_anonymous_edit.content_recover
 configuration:
   email_body:
     content:
-      value: "Gå til <a href=\"{{ url }}\">{{ url }}</a> for at finde dit eget indhold på deltag.aarhus.dk.\r\n"
+      value: "Gå til <a href=\"{{ recover_url }}\">{{ recover_url }}</a> for at finde dit eget indhold på deltag.aarhus.dk.\r\n"
       format: email_html
   email_subject:
     value: 'Dit indhold på deltag.aarhus.dk'

web/modules/custom/hoeringsportal_anonymous_edit/src/Form/RecoverForm.php

@@ -30,7 +30,6 @@ public function getFormId(): string {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state): array {
-
     $form['email'] = [
       '#type' => 'email',
       '#title' => $this->t('Confirm your email address', options: ['context' => 'hoeringsportal_anonymous_edit']),
@@ -54,12 +53,7 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
   public function validateForm(array &$form, FormStateInterface $form_state): void {
     $email = $form_state->getValue('email');
     $token = $this->getRouteMatch()->getParameter('token');
-    try {
-      $this->helper->setTokenByEmail($email, $token);
-
-      $form_state->setRedirect('hoeringsportal_anonymous_edit.content');
-    }
-    catch (\Exception) {
+    if (!$this->helper->isValidTokenEmail($email, $token)) {
       $form_state->setErrorByName('email', $this->t('Invalid email address'));
     }
   }
@@ -68,7 +62,16 @@ public function validateForm(array &$form, FormStateInterface $form_state): void
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state): void {
-    // Everything has been done in validateForm.
+    $email = $form_state->getValue('email');
+    $token = $this->getRouteMatch()->getParameter('token');
+    try {
+      $this->helper->setTokenByEmail($email, $token);
+      $this->messenger()->addMessage('Your edit token has been recovered');
+    }
+    catch (\Exception) {
+      $this->messenger()->addError('Error recovering your edit token');
+    }
+    $form_state->setRedirect('hoeringsportal_anonymous_edit.content');
   }
 
 }

web/modules/custom/hoeringsportal_anonymous_edit/src/Form/RequestForm.php

@@ -30,7 +30,6 @@ public function getFormId(): string {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state): array {
-
     $form['email'] = [
       '#type' => 'email',
       '#title' => $this->t('Your email address', options: ['context' => 'hoeringsportal_anonymous_edit']),
@@ -57,7 +56,7 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
     try {
       $this->helper->sendRecoverUrl($email);
 
-      $this->messenger()->addMessage($this->t('Email send to @email', ['@email' => $email]));
+      $this->messenger()->addMessage($this->t('Email sent to @email', ['@email' => $email]));
       // @todo Redirect to where?
       $form_state->setRedirect('<front>');
     }

web/modules/custom/hoeringsportal_anonymous_edit/src/Helper/Helper.php

@@ -17,6 +17,7 @@
 use Drupal\Core\Url;
 use Drupal\hoeringsportal_anonymous_edit\Event\HoeringsportalAnonymousEditEvent;
 use Drupal\hoeringsportal_anonymous_edit\Exception\InvalidTokenException;
+use Drupal\hoeringsportal_anonymous_edit\Model\Item;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
@@ -141,18 +142,33 @@ public function setToken(string $token): void {
   }
 
   /**
-   * Set token ny email.
+   * Decide if email address matches a token.
+   */
+  public function isValidTokenEmail(string $email, string $token): bool {
+    return NULL !== $this->fetchItemByEmail($email, $token);
+  }
+
+  /**
+   * Set token by email.
    */
   public function setTokenByEmail(string $email, string $token): void {
-    $items = $this->itemHelper->fetchItemsByEmail($email, $token);
-    $item = reset($items);
+    $item = $this->fetchItemByEmail($email, $token);
     if (!$item) {
       throw new InvalidTokenException($email);
     }
 
     $this->setToken($item->owner_token);
   }
 
+  /**
+   * Fetch item by email.
+   */
+  private function fetchItemByEmail(string $email, string $token): ?Item {
+    $items = $this->itemHelper->fetchItemsByEmail($email, $token);
+
+    return reset($items) ?: NULL;
+  }
+
   /**
    * Get recover URL.
    */