Sendmail on capsule invitation even for registered users

src/Controller/CapsuleEditorController.php

@@ -303,28 +303,17 @@ class CapsuleEditorController extends AbstractController
                     ]
                 )
             );
-            return;
-        }
-
-        $capsule->addEditor($user_associated_with_email_address);
-        $this->entity_manager->persist($capsule);
-        $this->entity_manager->flush();
-
-        $email = (new TemplatedEmail())
-            ->to($editor_email)
-            ->subject($this->translator->trans('editors.add.user.email.title'))
-            ->htmlTemplate('capsule/editors/email_editor.html.twig')
-            ->context([
-                'user' => $current_user,
-                'capsule' => $capsule,
-                'capsule_edit_link' => $this->urlGenerator->generate(
+            $link = null;
+        } else {
+            $link = $this->urlGenerator->generate(
                 'edit_capsule',
                 [ 'path' => $capsule->getLinkPath() ],
                 UrlGeneratorInterface::ABSOLUTE_URL
-                )
-            ]);
+            );
 
-        $this->mailer->send($email);
+            $capsule->addEditor($user_associated_with_email_address);
+            $this->entity_manager->persist($capsule);
+            $this->entity_manager->flush();
 
             $this->addFlash(
                 'success',
@@ -337,4 +326,17 @@ class CapsuleEditorController extends AbstractController
                 )
             );
         }
+
+        $email = (new TemplatedEmail())
+            ->to($editor_email)
+            ->subject($this->translator->trans('editors.add.user.email.title'))
+            ->htmlTemplate('capsule/editors/email_editor.html.twig')
+            ->context([
+                'user' => $current_user,
+                'capsule' => $capsule,
+                'capsule_edit_link' => $link
+            ]);
+
+        $this->mailer->send($email);
+    }
 }

templates/capsule/editors/email_editor.html.twig

@@ -13,9 +13,12 @@
                 <p class="alert">
                     {{ 'editors.add.user.email.text'|trans(
                         {'%user_name%': user.getFullName(), '%capsule_name%': capsule.getName()}) }}
+                    {% if capsule_edit_link %}
+                        {{ 'editors.add.user.email.text_link' | trans }}
                         <a href="{{ capsule_edit_link }}">
                             {{ 'editors.add.user.email.link'|trans }}
                         </a>
+                    {% endif %}
                 </p>
 
                 <p>{{ 'general.greeting'|trans }}</p>

tests/functional/CapsuleEditorControllerTest.php

@@ -183,7 +183,7 @@ class CapsuleEditorControllerTest extends WebTestCase
         $form['capsule_editors_form[email]'] = $this->editor_non_author->getEmail();
         $this->client->submit($form);
 
-        $this->assertEmailCount(0);
+        $this->assertEmailCount(1);
         $this->assertResponseRedirects($uri, 302);
 
         $this->client->followRedirect();

translations/messages.en.yaml

@@ -143,7 +143,7 @@ editors:
         email:
           title: Invitation to edit a MemoRekall capsule
           text: You have been added by %user_name% as editor of the capsule "%capsule_name%".
-            In order to access and edit it, you first need to register on MemoRekall. Please follow this link to
+          text_link: In order to access and edit it, you first need to register on MemoRekall. Please follow this link to
           link_name: register
       user:
         success: The user user_email is now an editor of the capsule capsule_name.

translations/messages.fr.yaml

@@ -148,7 +148,7 @@ editors:
         email:
           title: Invitation pour éditer une capsule sur MemoRekall
           text: Vous avez été ajouté par %user_name% en tant qu'éditeur de la capsule %capsule_name%.
-            Avant de pouvoir y accéder et la modifier, vous devez d'abord créer un compte sur MemoRekall. Veuillez suivre ce lien pour
+          text_link: Avant de pouvoir y accéder et la modifier, vous devez d'abord créer un compte sur MemoRekall. Veuillez suivre ce lien pour
           link_name: créer votre compte
       user:
         success: L'utilisateur user_email est maintenant éditeur de la capsule capsule_name.