From 8e7060b65f347aae4c7000217880eed379ecc7cc Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sun, 15 Nov 2020 12:02:14 +0100
Subject: [PATCH 01/20] fix row listing stylings

---
 .../listing/Components/Table/Row/_Meta.vue    | 20 ++++++++++---------
 assets/scss/modules/listing/row/row.scss      |  5 ++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/assets/js/app/listing/Components/Table/Row/_Meta.vue b/assets/js/app/listing/Components/Table/Row/_Meta.vue
index 5a6a808f..2a5683cb 100644
--- a/assets/js/app/listing/Components/Table/Row/_Meta.vue
+++ b/assets/js/app/listing/Components/Table/Row/_Meta.vue
@@ -1,18 +1,20 @@
 <template>
     <div class="listing__row--item is-meta">
-        <ul class="listing__row--list text-nowrap">
-            <li>
-                <span class="status" :class="`is-${record.status}`" :title="record.status"></span
-                >{{ record.publishedAt ? record.publishedAt : record.createdAt | date }}
+        <ul class="listing__row--list">
+            <li class="text-nowrap">
+                <span class="status" :class="`is-${record.status}`" :title="record.status"></span>
+                {{ record.publishedAt ? record.publishedAt : record.createdAt | date }}
             </li>
             <li v-if="size === 'normal'"><i class="fas fa-user"></i> {{ record.authorName }}</li>
             <li v-if="size === 'normal'">
                 <i class="fas" :class="record.extras.icon"></i>
-                <template v-if="type === 'dashboard'"
-                    ><a :href="`/bolt/content/${record.contentType}`"> {{ record.extras.singular_name }}</a>
-                </template>
-                <template v-else>{{ record.extras.singular_name }}</template
-                >&nbsp;№ {{ record.id }}
+                <div>
+                    <template v-if="type === 'dashboard'">
+                        <a :href="`/bolt/content/${record.contentType}`">{{ record.extras.singular_name }}</a>
+                    </template>
+                    <template v-else>{{ record.extras.singular_name }}</template
+                    >&nbsp;№ {{ record.id }}
+                </div>
             </li>
         </ul>
     </div>
diff --git a/assets/scss/modules/listing/row/row.scss b/assets/scss/modules/listing/row/row.scss
index 5f5c96e2..52130b8d 100644
--- a/assets/scss/modules/listing/row/row.scss
+++ b/assets/scss/modules/listing/row/row.scss
@@ -231,9 +231,8 @@ $checkbox-row-width: 32px;
     }
 
     li {
-      //display: flex;
-      padding-right: 1rem;
-      //align-items: center;
+      display: flex;
+      align-items: center;
       margin-bottom: $spacer / 4;
       color: var(--shade);
       text-transform: capitalize;

From 24b00053473a05e317a67942da95a46ecf57fd47 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sun, 15 Nov 2020 12:16:11 +0100
Subject: [PATCH 02/20] fix mobile styling for tables

---
 assets/scss/modules/listing/row/row.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/scss/modules/listing/row/row.scss b/assets/scss/modules/listing/row/row.scss
index 52130b8d..d49238a0 100644
--- a/assets/scss/modules/listing/row/row.scss
+++ b/assets/scss/modules/listing/row/row.scss
@@ -182,6 +182,7 @@ $checkbox-row-width: 32px;
 
       @include media-breakpoint-up(sm) {
         flex: 1 0 100%;
+        margin-top: 1rem;
       }
 
       @include media-breakpoint-up(md) {
@@ -189,6 +190,7 @@ $checkbox-row-width: 32px;
         max-width: 130px;
         order: 3;
         padding: $spacer*0.5;
+        margin-top: 0;
       }
     }
 
@@ -236,6 +238,11 @@ $checkbox-row-width: 32px;
       margin-bottom: $spacer / 4;
       color: var(--shade);
       text-transform: capitalize;
+      margin-right: 1rem;
+
+      @include media-breakpoint-up(md) {
+        margin-right: 0;
+      }
 
       > :first-child,
       .status,

From cb325219b04fa1a0e8d586e7af18a6e9836ae7a9 Mon Sep 17 00:00:00 2001
From: Denis Gorin <denis.gorin@gmail.com>
Date: Tue, 17 Nov 2020 09:35:24 +0700
Subject: [PATCH 03/20] add additional labels

---
 translations/messages.ru.xlf | 92 +++++++++++++++++++++++++++++++++---
 1 file changed, 85 insertions(+), 7 deletions(-)

diff --git a/translations/messages.ru.xlf b/translations/messages.ru.xlf
index 2df4da1f..8b2d015a 100644
--- a/translations/messages.ru.xlf
+++ b/translations/messages.ru.xlf
@@ -562,7 +562,7 @@
       </segment>
     </unit>
     <unit id="kouGbMq" name="WoordPers: Kinda looks like that other CMS">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>WoordPers: Kinda looks like that other CMS</source>
         <target>WoordPers: Kinda looks like that other CMS</target>
       </segment>
@@ -574,7 +574,7 @@
       </segment>
     </unit>
     <unit id="xuNRuUu" name="caption.translations: messages">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>caption.translations: messages</source>
         <target>caption.translations: messages</target>
       </segment>
@@ -592,7 +592,7 @@
       </segment>
     </unit>
     <unit id="cIiIXu_" name="caption.routing set up">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>caption.routing set up</source>
         <target>caption.routing set up</target>
       </segment>
@@ -976,7 +976,7 @@
       </segment>
     </unit>
     <unit id="Wou02nK" name="caption.kitchensink">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>caption.kitchensink</source>
         <target>The Kitchensink</target>
       </segment>
@@ -1732,7 +1732,7 @@
       </segment>
     </unit>
     <unit id="4N41oTU" name="controller.omnisearch.subtitle">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>controller.omnisearch.subtitle</source>
         <target>To search, in an omni-like fashion</target>
       </segment>
@@ -1978,7 +1978,7 @@
       </segment>
     </unit>
     <unit id="x9qAwrz" name="listing.title_browser">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>listing.title_browser</source>
         <target>Браузер / платформа</target>
       </segment>
@@ -2332,7 +2332,7 @@
       </segment>
     </unit>
     <unit id="f.rvF6y" name="action.new">
-      <segment state="translated" subState="poedit:fuzzy">
+      <segment>
         <source>action.new</source>
         <target>Создать</target>
       </segment>
@@ -2373,5 +2373,83 @@
         <target>Выбрать …</target>
       </segment>
     </unit>
+    <unit id="2SSLP1K" name="form.empty_username_email">
+      <segment>
+        <source>form.empty_username_email</source>
+        <target>Пожалуйста, введите ваше имя пользователя или адрес электронной почты</target>
+      </segment>
+    </unit>
+    <unit id="5Qf_RiO" name="form.empty_password">
+      <segment>
+        <source>form.empty_password</source>
+        <target>Пожалуйста введите ваш пароль</target>
+      </segment>
+    </unit>
+    <unit id="fAmcKUQ" name="listing.title_filterby_field">
+      <segment>
+        <source>listing.title_filterby_field</source>
+        <target>Фильтр по полю</target>
+      </segment>
+    </unit>
+    <unit id="kciiidS" name="image.button_from_url">
+      <segment>
+        <source>image.button_from_url</source>
+        <target>По URL</target>
+      </segment>
+    </unit>
+    <unit id="QcN1pi8" name="files_cards.copy_to_clipboard">
+      <segment>
+        <source>files_cards.copy_to_clipboard</source>
+        <target>Скопировать ссылку на файл</target>
+      </segment>
+    </unit>
+    <unit id="S9k1S7Z" name="warning">
+      <segment>
+        <source>warning</source>
+        <target>Предупреждение</target>
+      </segment>
+    </unit>
+    <unit id="4fyuUU." name="filemanager.create_folder_already_exists">
+      <segment>
+        <source>filemanager.create_folder_already_exists</source>
+        <target>Папка уже существует</target>
+      </segment>
+    </unit>
+    <unit id="aSxePCB" name="filemanager.create_folder_error">
+      <segment>
+        <source>filemanager.create_folder_error</source>
+        <target>Не удалось создать папку</target>
+      </segment>
+    </unit>
+    <unit id="wbFKypA" name="filemanager.create_folder_success">
+      <segment>
+        <source>filemanager.create_folder_success</source>
+        <target>Папка успешно создана.</target>
+      </segment>
+    </unit>
+    <unit id="lZxOEzh" name="filemanager.delete_folder_successful">
+      <segment>
+        <source>filemanager.delete_folder_successful</source>
+        <target>Папка успешно удалена</target>
+      </segment>
+    </unit>
+    <unit id="a6Xhtq0" name="folder.create_new">
+      <segment>
+        <source>folder.create_new</source>
+        <target>Новая папка</target>
+      </segment>
+    </unit>
+    <unit id="FcXvWL8" name="title.add_user">
+      <segment>
+        <source>title.add_user</source>
+        <target>Добавить пользователя</target>
+      </segment>
+    </unit>
+    <unit id="nWMH_Nr" name="label.avatar">
+      <segment>
+        <source>label.avatar</source>
+        <target>Аватар</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From e96b002159a060fc65b2d3a295d620f1eb3aa3b3 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 2 Oct 2020 11:41:27 +0200
Subject: [PATCH 04/20] added reset password form, link it in login form and
 style request password page

---
 assets/scss/layout/_reset-password.scss       |  47 +++++
 assets/scss/layout/layout.scss                |   1 +
 composer.json                                 |   1 +
 config/bundles.php                            |   1 +
 config/packages/reset_password.yaml           |   2 +
 config/routes/bolt.yaml                       |   5 +
 src/.preload.php                              |   5 +
 src/Controller/ResetPasswordController.php    | 177 +++++++++++++++++
 src/Entity/ResetPasswordRequest.php           |  45 +++++
 src/Form/ChangePasswordFormType.php           |  49 +++++
 src/Form/ResetPasswordRequestFormType.php     |  30 +++
 src/Migrations/Version20201001213721.php      | 180 ++++++++++++++++++
 .../ResetPasswordRequestRepository.php        |  31 +++
 symfony.lock                                  |  12 ++
 .../reset_password/check_email.html.twig      |  41 ++++
 templates/reset_password/email.html.twig      |   9 +
 templates/reset_password/request.html.twig    |  54 ++++++
 templates/reset_password/reset.html.twig      |  12 ++
 templates/security/login.html.twig            |  10 +-
 translations/messages.en.xlf                  |  30 +++
 20 files changed, 739 insertions(+), 3 deletions(-)
 create mode 100644 assets/scss/layout/_reset-password.scss
 create mode 100644 config/packages/reset_password.yaml
 create mode 100644 src/.preload.php
 create mode 100644 src/Controller/ResetPasswordController.php
 create mode 100644 src/Entity/ResetPasswordRequest.php
 create mode 100644 src/Form/ChangePasswordFormType.php
 create mode 100644 src/Form/ResetPasswordRequestFormType.php
 create mode 100644 src/Migrations/Version20201001213721.php
 create mode 100644 src/Repository/ResetPasswordRequestRepository.php
 create mode 100644 templates/reset_password/check_email.html.twig
 create mode 100644 templates/reset_password/email.html.twig
 create mode 100644 templates/reset_password/request.html.twig
 create mode 100644 templates/reset_password/reset.html.twig

diff --git a/assets/scss/layout/_reset-password.scss b/assets/scss/layout/_reset-password.scss
new file mode 100644
index 00000000..6aeb7a57
--- /dev/null
+++ b/assets/scss/layout/_reset-password.scss
@@ -0,0 +1,47 @@
+.page--reset-password,
+.page--reset-password--success {
+  background: linear-gradient(rgba(200, 200, 200, 0.6), rgba(200, 200, 200, 0.2));
+
+  > div {
+    max-width: 25rem;
+    margin: 0 auto;
+    padding: 2rem 1rem;
+
+    @include media-breakpoint-up(sm) {
+      padding-top: 4rem;
+    }
+
+    @include media-breakpoint-up(md) {
+      padding-top: 5rem;
+    }
+
+    @include media-breakpoint-up(lg) {
+      padding-top: 7rem;
+    }
+  }
+
+  .card {
+    box-shadow: 0 7.5px 15px -5px rgba(0, 0, 0, 0.4);
+  }
+
+  .reset-password__logo {
+    padding: 0 2rem;
+
+    img {
+      max-width: 100%;
+      display: block;
+      margin-bottom: 2rem;
+    }
+  }
+
+  .reset-password__description {
+    margin-bottom: 1rem;
+  }
+
+  &.with-background {
+    // Unsplash's daily picture is usually always pretty, but often too distracting: https://source.unsplash.com/daily
+    background: linear-gradient(rgba(128, 128, 128, 0.6), rgba(128, 128, 128, 0.2)), url(https://source.unsplash.com/1920x1080/?abstract);
+    background-position: center;
+    background-size: cover;
+  }
+}
diff --git a/assets/scss/layout/layout.scss b/assets/scss/layout/layout.scss
index c2df0192..298e60eb 100644
--- a/assets/scss/layout/layout.scss
+++ b/assets/scss/layout/layout.scss
@@ -2,3 +2,4 @@
 
 @import '_admin';
 @import '_login';
+@import '_reset-password';
diff --git a/composer.json b/composer.json
index 56078004..fa913a7c 100644
--- a/composer.json
+++ b/composer.json
@@ -64,6 +64,7 @@
         "symfony/web-server-bundle": "^4.4",
         "symfony/webpack-encore-bundle": "^1.7",
         "symfony/yaml": "^5.1",
+        "symfonycasts/reset-password-bundle": "^1.1",
         "tightenco/collect": "^7.25",
         "twig/twig": "^3.0",
         "ua-parser/uap-php": "^3.9",
diff --git a/config/bundles.php b/config/bundles.php
index 80d57ef0..691351b8 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -25,4 +25,5 @@ return [
     Symplify\ConsoleColorDiff\ConsoleColorDiffBundle::class => ['dev' => true, 'test' => true],
     Translation\Bundle\TranslationBundle::class => ['all' => true],
     Translation\PlatformAdapter\Loco\Bridge\Symfony\TranslationAdapterLocoBundle::class => ['dev' => true, 'local' => true],
+    SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
 ];
diff --git a/config/packages/reset_password.yaml b/config/packages/reset_password.yaml
new file mode 100644
index 00000000..550b2aaf
--- /dev/null
+++ b/config/packages/reset_password.yaml
@@ -0,0 +1,2 @@
+symfonycasts_reset_password:
+    request_password_repository: Bolt\Repository\ResetPasswordRequestRepository
diff --git a/config/routes/bolt.yaml b/config/routes/bolt.yaml
index c12bc661..e2abcea6 100644
--- a/config/routes/bolt.yaml
+++ b/config/routes/bolt.yaml
@@ -19,6 +19,11 @@ controllers:
     resource: '../../src/Controller/ImageController.php'
     type: annotation
 
+# Reset Password Form
+reset_password:
+    resource: '../../src/Controller/ResetPasswordController.php'
+    type: annotation
+
 # Routes added by Extensions get added here, by Bolt\Extension\RoutesLoader
 extensions:
     resource: .
diff --git a/src/.preload.php b/src/.preload.php
new file mode 100644
index 00000000..a1ff8487
--- /dev/null
+++ b/src/.preload.php
@@ -0,0 +1,5 @@
+<?php
+
+if (file_exists(__DIR__.'/../var/cache/dev/Bolt_KernelDevDebugContainer.preload.php')) {
+    require __DIR__.'/../var/cache/dev/Bolt_KernelDevDebugContainer.preload.php';
+}
diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
new file mode 100644
index 00000000..d74b0cdc
--- /dev/null
+++ b/src/Controller/ResetPasswordController.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Bolt\Controller;
+
+use Bolt\Entity\User;
+use Bolt\Form\ChangePasswordFormType;
+use Bolt\Form\ResetPasswordRequestFormType;
+use Symfony\Bridge\Twig\Mime\TemplatedEmail;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait;
+use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface;
+use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface;
+
+/**
+ * @Route("/reset-password")
+ */
+class ResetPasswordController extends AbstractController
+{
+    use ResetPasswordControllerTrait;
+
+    private $resetPasswordHelper;
+
+    public function __construct(ResetPasswordHelperInterface $resetPasswordHelper)
+    {
+        $this->resetPasswordHelper = $resetPasswordHelper;
+    }
+
+    /**
+     * Display & process form to request a password reset.
+     *
+     * @Route("", name="app_forgot_password_request")
+     */
+    public function request(Request $request, MailerInterface $mailer): Response
+    {
+        $form = $this->createForm(ResetPasswordRequestFormType::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            return $this->processSendingPasswordResetEmail(
+                $form->get('email')->getData(),
+                $mailer
+            );
+        }
+
+        return $this->render('reset_password/request.html.twig', [
+            'requestForm' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Confirmation page after a user has requested a password reset.
+     *
+     * @Route("/check-email", name="app_check_email")
+     */
+    public function checkEmail(): Response
+    {
+        // We prevent users from directly accessing this page
+        if (!$this->canCheckEmail()) {
+            return $this->redirectToRoute('app_forgot_password_request');
+        }
+
+        return $this->render('reset_password/check_email.html.twig', [
+            'tokenLifetime' => $this->resetPasswordHelper->getTokenLifetime(),
+        ]);
+    }
+
+    /**
+     * Validates and process the reset URL that the user clicked in their email.
+     *
+     * @Route("/reset/{token}", name="app_reset_password")
+     */
+    public function reset(Request $request, UserPasswordEncoderInterface $passwordEncoder, string $token = null): Response
+    {
+        if ($token) {
+            // We store the token in session and remove it from the URL, to avoid the URL being
+            // loaded in a browser and potentially leaking the token to 3rd party JavaScript.
+            $this->storeTokenInSession($token);
+
+            return $this->redirectToRoute('app_reset_password');
+        }
+
+        $token = $this->getTokenFromSession();
+        if (null === $token) {
+            throw $this->createNotFoundException('No reset password token found in the URL or in the session.');
+        }
+
+        try {
+            $user = $this->resetPasswordHelper->validateTokenAndFetchUser($token);
+        } catch (ResetPasswordExceptionInterface $e) {
+            $this->addFlash('reset_password_error', sprintf(
+                'There was a problem validating your reset request - %s',
+                $e->getReason()
+            ));
+
+            return $this->redirectToRoute('app_forgot_password_request');
+        }
+
+        // The token is valid; allow the user to change their password.
+        $form = $this->createForm(ChangePasswordFormType::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            // A password reset token should be used only once, remove it.
+            $this->resetPasswordHelper->removeResetRequest($token);
+
+            // Encode the plain password, and set it.
+            $encodedPassword = $passwordEncoder->encodePassword(
+                $user,
+                $form->get('plainPassword')->getData()
+            );
+
+            $user->setPassword($encodedPassword);
+            $this->getDoctrine()->getManager()->flush();
+
+            // The session is cleaned up after the password has been changed.
+            $this->cleanSessionAfterReset();
+
+            return $this->redirectToRoute('app_home');
+        }
+
+        return $this->render('reset_password/reset.html.twig', [
+            'resetForm' => $form->createView(),
+        ]);
+    }
+
+    private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer): RedirectResponse
+    {
+        $user = $this->getDoctrine()->getRepository(User::class)->findOneBy([
+            'email' => $emailFormData,
+        ]);
+
+        // Marks that you are allowed to see the app_check_email page.
+        $this->setCanCheckEmailInSession();
+
+        // Do not reveal whether a user account was found or not.
+        if (!$user) {
+            return $this->redirectToRoute('app_check_email');
+        }
+
+        try {
+            $resetToken = $this->resetPasswordHelper->generateResetToken($user);
+        } catch (ResetPasswordExceptionInterface $e) {
+            // If you want to tell the user why a reset email was not sent, uncomment
+            // the lines below and change the redirect to 'app_forgot_password_request'.
+            // Caution: This may reveal if a user is registered or not.
+            //
+            // $this->addFlash('reset_password_error', sprintf(
+            //     'There was a problem handling your password reset request - %s',
+            //     $e->getReason()
+            // ));
+
+            return $this->redirectToRoute('app_check_email');
+        }
+
+        $email = (new TemplatedEmail())
+            ->from(new Address('do-not-reply@boltcms.io', 'BoltCMS Reset Password'))
+            ->to($user->getEmail())
+            ->subject('Your password reset request')
+            ->htmlTemplate('reset_password/email.html.twig')
+            ->context([
+                'resetToken' => $resetToken,
+                'tokenLifetime' => $this->resetPasswordHelper->getTokenLifetime(),
+            ])
+        ;
+
+        $mailer->send($email);
+
+        return $this->redirectToRoute('app_check_email');
+    }
+}
diff --git a/src/Entity/ResetPasswordRequest.php b/src/Entity/ResetPasswordRequest.php
new file mode 100644
index 00000000..014633a8
--- /dev/null
+++ b/src/Entity/ResetPasswordRequest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Bolt\Entity;
+
+use Bolt\Repository\ResetPasswordRequestRepository;
+use Doctrine\ORM\Mapping as ORM;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestTrait;
+
+/**
+ * @ORM\Entity(repositoryClass=ResetPasswordRequestRepository::class)
+ */
+class ResetPasswordRequest implements ResetPasswordRequestInterface
+{
+    use ResetPasswordRequestTrait;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private $user;
+
+    public function __construct(object $user, \DateTimeInterface $expiresAt, string $selector, string $hashedToken)
+    {
+        $this->user = $user;
+        $this->initialize($expiresAt, $selector, $hashedToken);
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getUser(): object
+    {
+        return $this->user;
+    }
+}
diff --git a/src/Form/ChangePasswordFormType.php b/src/Form/ChangePasswordFormType.php
new file mode 100644
index 00000000..0951f0f0
--- /dev/null
+++ b/src/Form/ChangePasswordFormType.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Bolt\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Constraints\NotBlank;
+
+class ChangePasswordFormType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('plainPassword', RepeatedType::class, [
+                'type' => PasswordType::class,
+                'first_options' => [
+                    'constraints' => [
+                        new NotBlank([
+                            'message' => 'Please enter a password',
+                        ]),
+                        new Length([
+                            'min' => 6,
+                            'minMessage' => 'Your password should be at least {{ limit }} characters',
+                            // max length allowed by Symfony for security reasons
+                            'max' => 4096,
+                        ]),
+                    ],
+                    'label' => 'New password',
+                ],
+                'second_options' => [
+                    'label' => 'Repeat Password',
+                ],
+                'invalid_message' => 'The password fields must match.',
+                // Instead of being set onto the object directly,
+                // this is read and encoded in the controller
+                'mapped' => false,
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([]);
+    }
+}
diff --git a/src/Form/ResetPasswordRequestFormType.php b/src/Form/ResetPasswordRequestFormType.php
new file mode 100644
index 00000000..b1cced21
--- /dev/null
+++ b/src/Form/ResetPasswordRequestFormType.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Bolt\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\NotBlank;
+
+class ResetPasswordRequestFormType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('email', EmailType::class, [
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'Please enter your email',
+                    ]),
+                ],
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([]);
+    }
+}
diff --git a/src/Migrations/Version20201001213721.php b/src/Migrations/Version20201001213721.php
new file mode 100644
index 00000000..d47f85a8
--- /dev/null
+++ b/src/Migrations/Version20201001213721.php
@@ -0,0 +1,180 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bolt\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20201001213721 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'sqlite', 'Migration can only be executed safely on \'sqlite\'.');
+
+        $this->addSql('CREATE TABLE bolt_reset_password_request (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER NOT NULL, selector VARCHAR(20) NOT NULL, hashed_token VARCHAR(100) NOT NULL, requested_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
+        , expires_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
+        )');
+        $this->addSql('CREATE INDEX IDX_D04070DCA76ED395 ON bolt_reset_password_request (user_id)');
+        $this->addSql('DROP INDEX IDX_3431ED74A3934190');
+        $this->addSql('DROP INDEX IDX_3431ED74AF0465EA');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_relation AS SELECT id, from_content_id, to_content_id, position FROM bolt_relation');
+        $this->addSql('DROP TABLE bolt_relation');
+        $this->addSql('CREATE TABLE bolt_relation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, from_content_id INTEGER NOT NULL, to_content_id INTEGER NOT NULL, position INTEGER NOT NULL, CONSTRAINT FK_3431ED74AF0465EA FOREIGN KEY (from_content_id) REFERENCES bolt_content (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_3431ED74A3934190 FOREIGN KEY (to_content_id) REFERENCES bolt_content (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_relation (id, from_content_id, to_content_id, position) SELECT id, from_content_id, to_content_id, position FROM __temp__bolt_relation');
+        $this->addSql('DROP TABLE __temp__bolt_relation');
+        $this->addSql('CREATE INDEX IDX_3431ED74A3934190 ON bolt_relation (to_content_id)');
+        $this->addSql('CREATE INDEX IDX_3431ED74AF0465EA ON bolt_relation (from_content_id)');
+        $this->addSql('DROP INDEX IDX_C5BCC03C84A0A3ED');
+        $this->addSql('DROP INDEX IDX_C5BCC03C9557E6F6');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_taxonomy_content AS SELECT taxonomy_id, content_id FROM bolt_taxonomy_content');
+        $this->addSql('DROP TABLE bolt_taxonomy_content');
+        $this->addSql('CREATE TABLE bolt_taxonomy_content (taxonomy_id INTEGER NOT NULL, content_id INTEGER NOT NULL, PRIMARY KEY(taxonomy_id, content_id), CONSTRAINT FK_C5BCC03C9557E6F6 FOREIGN KEY (taxonomy_id) REFERENCES bolt_taxonomy (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_C5BCC03C84A0A3ED FOREIGN KEY (content_id) REFERENCES bolt_content (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_taxonomy_content (taxonomy_id, content_id) SELECT taxonomy_id, content_id FROM __temp__bolt_taxonomy_content');
+        $this->addSql('DROP TABLE __temp__bolt_taxonomy_content');
+        $this->addSql('CREATE INDEX IDX_C5BCC03C84A0A3ED ON bolt_taxonomy_content (content_id)');
+        $this->addSql('CREATE INDEX IDX_C5BCC03C9557E6F6 ON bolt_taxonomy_content (taxonomy_id)');
+        $this->addSql('DROP INDEX status_idx');
+        $this->addSql('DROP INDEX content_type_idx');
+        $this->addSql('DROP INDEX IDX_F5AB2E9CF675F31B');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_content AS SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM bolt_content');
+        $this->addSql('DROP TABLE bolt_content');
+        $this->addSql('CREATE TABLE bolt_content (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, content_type VARCHAR(191) NOT NULL COLLATE BINARY, status VARCHAR(191) NOT NULL COLLATE BINARY, created_at DATETIME NOT NULL, modified_at DATETIME DEFAULT NULL, published_at DATETIME DEFAULT NULL, depublished_at DATETIME DEFAULT NULL, CONSTRAINT FK_F5AB2E9CF675F31B FOREIGN KEY (author_id) REFERENCES bolt_user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_content (id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at) SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM __temp__bolt_content');
+        $this->addSql('DROP TABLE __temp__bolt_content');
+        $this->addSql('CREATE INDEX status_idx ON bolt_content (status)');
+        $this->addSql('CREATE INDEX content_type_idx ON bolt_content (content_type)');
+        $this->addSql('CREATE INDEX IDX_F5AB2E9CF675F31B ON bolt_content (author_id)');
+        $this->addSql('DROP INDEX IDX_4A2EBBE5727ACA70');
+        $this->addSql('DROP INDEX IDX_4A2EBBE584A0A3ED');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field AS SELECT id, content_id, parent_id, name, sortorder, version, type FROM bolt_field');
+        $this->addSql('DROP TABLE bolt_field');
+        $this->addSql('CREATE TABLE bolt_field (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, content_id INTEGER NOT NULL, parent_id INTEGER DEFAULT NULL, name VARCHAR(191) NOT NULL COLLATE BINARY, sortorder INTEGER NOT NULL, version INTEGER DEFAULT NULL, type VARCHAR(191) NOT NULL COLLATE BINARY, CONSTRAINT FK_4A2EBBE584A0A3ED FOREIGN KEY (content_id) REFERENCES bolt_content (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_4A2EBBE5727ACA70 FOREIGN KEY (parent_id) REFERENCES bolt_field (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_field (id, content_id, parent_id, name, sortorder, version, type) SELECT id, content_id, parent_id, name, sortorder, version, type FROM __temp__bolt_field');
+        $this->addSql('DROP TABLE __temp__bolt_field');
+        $this->addSql('CREATE INDEX IDX_4A2EBBE5727ACA70 ON bolt_field (parent_id)');
+        $this->addSql('CREATE INDEX IDX_4A2EBBE584A0A3ED ON bolt_field (content_id)');
+        $this->addSql('DROP INDEX field_translation_unique_translation');
+        $this->addSql('DROP INDEX IDX_5C60C0542C2AC5D3');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field_translation AS SELECT id, translatable_id, value, locale FROM bolt_field_translation');
+        $this->addSql('DROP TABLE bolt_field_translation');
+        $this->addSql('CREATE TABLE bolt_field_translation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, translatable_id INTEGER DEFAULT NULL, value CLOB NOT NULL COLLATE BINARY --(DC2Type:json)
+        , locale VARCHAR(5) NOT NULL COLLATE BINARY, CONSTRAINT FK_5C60C0542C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bolt_field (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_field_translation (id, translatable_id, value, locale) SELECT id, translatable_id, value, locale FROM __temp__bolt_field_translation');
+        $this->addSql('DROP TABLE __temp__bolt_field_translation');
+        $this->addSql('CREATE UNIQUE INDEX field_translation_unique_translation ON bolt_field_translation (translatable_id, locale)');
+        $this->addSql('CREATE INDEX IDX_5C60C0542C2AC5D3 ON bolt_field_translation (translatable_id)');
+        $this->addSql('DROP INDEX UNIQ_8B90D313A76ED395');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_user_auth_token AS SELECT id, user_id, useragent, validity FROM bolt_user_auth_token');
+        $this->addSql('DROP TABLE bolt_user_auth_token');
+        $this->addSql('CREATE TABLE bolt_user_auth_token (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, useragent VARCHAR(255) NOT NULL COLLATE BINARY, validity DATETIME NOT NULL, CONSTRAINT FK_8B90D313A76ED395 FOREIGN KEY (user_id) REFERENCES bolt_user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_user_auth_token (id, user_id, useragent, validity) SELECT id, user_id, useragent, validity FROM __temp__bolt_user_auth_token');
+        $this->addSql('DROP TABLE __temp__bolt_user_auth_token');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_8B90D313A76ED395 ON bolt_user_auth_token (user_id)');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_log AS SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM bolt_log');
+        $this->addSql('DROP TABLE bolt_log');
+        $this->addSql('CREATE TABLE bolt_log (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, message CLOB NOT NULL COLLATE BINARY, level SMALLINT NOT NULL, level_name VARCHAR(50) NOT NULL COLLATE BINARY, created_at DATETIME NOT NULL, content INTEGER DEFAULT NULL, context CLOB DEFAULT NULL --(DC2Type:array)
+        , extra CLOB DEFAULT NULL --(DC2Type:array)
+        , user CLOB DEFAULT NULL --(DC2Type:array)
+        , location CLOB DEFAULT NULL --(DC2Type:array)
+        )');
+        $this->addSql('INSERT INTO bolt_log (id, message, context, level, level_name, created_at, extra, user, content, location) SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM __temp__bolt_log');
+        $this->addSql('DROP TABLE __temp__bolt_log');
+        $this->addSql('DROP INDEX IDX_7BF75FB1F675F31B');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_media AS SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM bolt_media');
+        $this->addSql('DROP TABLE bolt_media');
+        $this->addSql('CREATE TABLE bolt_media (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, location VARCHAR(191) NOT NULL COLLATE BINARY, path CLOB NOT NULL COLLATE BINARY, filename VARCHAR(191) NOT NULL COLLATE BINARY, type VARCHAR(191) NOT NULL COLLATE BINARY, width INTEGER DEFAULT NULL, height INTEGER DEFAULT NULL, filesize INTEGER DEFAULT NULL, crop_x INTEGER DEFAULT NULL, crop_y INTEGER DEFAULT NULL, crop_zoom DOUBLE PRECISION DEFAULT NULL, created_at DATETIME NOT NULL, modified_at DATETIME NOT NULL, title VARCHAR(191) DEFAULT NULL COLLATE BINARY, description VARCHAR(1000) DEFAULT NULL COLLATE BINARY, original_filename VARCHAR(1000) DEFAULT NULL COLLATE BINARY, copyright VARCHAR(191) DEFAULT NULL COLLATE BINARY, CONSTRAINT FK_7BF75FB1F675F31B FOREIGN KEY (author_id) REFERENCES bolt_user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
+        $this->addSql('INSERT INTO bolt_media (id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright) SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM __temp__bolt_media');
+        $this->addSql('DROP TABLE __temp__bolt_media');
+        $this->addSql('CREATE INDEX IDX_7BF75FB1F675F31B ON bolt_media (author_id)');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'sqlite', 'Migration can only be executed safely on \'sqlite\'.');
+
+        $this->addSql('DROP TABLE bolt_reset_password_request');
+        $this->addSql('DROP INDEX IDX_F5AB2E9CF675F31B');
+        $this->addSql('DROP INDEX content_type_idx');
+        $this->addSql('DROP INDEX status_idx');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_content AS SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM bolt_content');
+        $this->addSql('DROP TABLE bolt_content');
+        $this->addSql('CREATE TABLE bolt_content (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, content_type VARCHAR(191) NOT NULL, status VARCHAR(191) NOT NULL, created_at DATETIME NOT NULL, modified_at DATETIME DEFAULT NULL, published_at DATETIME DEFAULT NULL, depublished_at DATETIME DEFAULT NULL)');
+        $this->addSql('INSERT INTO bolt_content (id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at) SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM __temp__bolt_content');
+        $this->addSql('DROP TABLE __temp__bolt_content');
+        $this->addSql('CREATE INDEX IDX_F5AB2E9CF675F31B ON bolt_content (author_id)');
+        $this->addSql('CREATE INDEX content_type_idx ON bolt_content (content_type)');
+        $this->addSql('CREATE INDEX status_idx ON bolt_content (status)');
+        $this->addSql('DROP INDEX IDX_4A2EBBE584A0A3ED');
+        $this->addSql('DROP INDEX IDX_4A2EBBE5727ACA70');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field AS SELECT id, content_id, parent_id, name, sortorder, version, type FROM bolt_field');
+        $this->addSql('DROP TABLE bolt_field');
+        $this->addSql('CREATE TABLE bolt_field (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, content_id INTEGER NOT NULL, parent_id INTEGER DEFAULT NULL, name VARCHAR(191) NOT NULL, sortorder INTEGER NOT NULL, version INTEGER DEFAULT NULL, type VARCHAR(191) NOT NULL)');
+        $this->addSql('INSERT INTO bolt_field (id, content_id, parent_id, name, sortorder, version, type) SELECT id, content_id, parent_id, name, sortorder, version, type FROM __temp__bolt_field');
+        $this->addSql('DROP TABLE __temp__bolt_field');
+        $this->addSql('CREATE INDEX IDX_4A2EBBE584A0A3ED ON bolt_field (content_id)');
+        $this->addSql('CREATE INDEX IDX_4A2EBBE5727ACA70 ON bolt_field (parent_id)');
+        $this->addSql('DROP INDEX IDX_5C60C0542C2AC5D3');
+        $this->addSql('DROP INDEX field_translation_unique_translation');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field_translation AS SELECT id, translatable_id, value, locale FROM bolt_field_translation');
+        $this->addSql('DROP TABLE bolt_field_translation');
+        $this->addSql('CREATE TABLE bolt_field_translation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, translatable_id INTEGER DEFAULT NULL, value CLOB NOT NULL --(DC2Type:json)
+        , locale VARCHAR(5) NOT NULL)');
+        $this->addSql('INSERT INTO bolt_field_translation (id, translatable_id, value, locale) SELECT id, translatable_id, value, locale FROM __temp__bolt_field_translation');
+        $this->addSql('DROP TABLE __temp__bolt_field_translation');
+        $this->addSql('CREATE INDEX IDX_5C60C0542C2AC5D3 ON bolt_field_translation (translatable_id)');
+        $this->addSql('CREATE UNIQUE INDEX field_translation_unique_translation ON bolt_field_translation (translatable_id, locale)');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_log AS SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM bolt_log');
+        $this->addSql('DROP TABLE bolt_log');
+        $this->addSql('CREATE TABLE bolt_log (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, message CLOB NOT NULL, level SMALLINT NOT NULL, level_name VARCHAR(50) NOT NULL, created_at DATETIME NOT NULL, content INTEGER DEFAULT NULL, context CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
+        , extra CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
+        , user CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
+        , location CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
+        )');
+        $this->addSql('INSERT INTO bolt_log (id, message, context, level, level_name, created_at, extra, user, content, location) SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM __temp__bolt_log');
+        $this->addSql('DROP TABLE __temp__bolt_log');
+        $this->addSql('DROP INDEX IDX_7BF75FB1F675F31B');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_media AS SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM bolt_media');
+        $this->addSql('DROP TABLE bolt_media');
+        $this->addSql('CREATE TABLE bolt_media (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, location VARCHAR(191) NOT NULL, path CLOB NOT NULL, filename VARCHAR(191) NOT NULL, type VARCHAR(191) NOT NULL, width INTEGER DEFAULT NULL, height INTEGER DEFAULT NULL, filesize INTEGER DEFAULT NULL, crop_x INTEGER DEFAULT NULL, crop_y INTEGER DEFAULT NULL, crop_zoom DOUBLE PRECISION DEFAULT NULL, created_at DATETIME NOT NULL, modified_at DATETIME NOT NULL, title VARCHAR(191) DEFAULT NULL, description VARCHAR(1000) DEFAULT NULL, original_filename VARCHAR(1000) DEFAULT NULL, copyright VARCHAR(191) DEFAULT NULL)');
+        $this->addSql('INSERT INTO bolt_media (id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright) SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM __temp__bolt_media');
+        $this->addSql('DROP TABLE __temp__bolt_media');
+        $this->addSql('CREATE INDEX IDX_7BF75FB1F675F31B ON bolt_media (author_id)');
+        $this->addSql('DROP INDEX IDX_3431ED74AF0465EA');
+        $this->addSql('DROP INDEX IDX_3431ED74A3934190');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_relation AS SELECT id, from_content_id, to_content_id, position FROM bolt_relation');
+        $this->addSql('DROP TABLE bolt_relation');
+        $this->addSql('CREATE TABLE bolt_relation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, from_content_id INTEGER NOT NULL, to_content_id INTEGER NOT NULL, position INTEGER NOT NULL)');
+        $this->addSql('INSERT INTO bolt_relation (id, from_content_id, to_content_id, position) SELECT id, from_content_id, to_content_id, position FROM __temp__bolt_relation');
+        $this->addSql('DROP TABLE __temp__bolt_relation');
+        $this->addSql('CREATE INDEX IDX_3431ED74AF0465EA ON bolt_relation (from_content_id)');
+        $this->addSql('CREATE INDEX IDX_3431ED74A3934190 ON bolt_relation (to_content_id)');
+        $this->addSql('DROP INDEX IDX_C5BCC03C9557E6F6');
+        $this->addSql('DROP INDEX IDX_C5BCC03C84A0A3ED');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_taxonomy_content AS SELECT taxonomy_id, content_id FROM bolt_taxonomy_content');
+        $this->addSql('DROP TABLE bolt_taxonomy_content');
+        $this->addSql('CREATE TABLE bolt_taxonomy_content (taxonomy_id INTEGER NOT NULL, content_id INTEGER NOT NULL, PRIMARY KEY(taxonomy_id, content_id))');
+        $this->addSql('INSERT INTO bolt_taxonomy_content (taxonomy_id, content_id) SELECT taxonomy_id, content_id FROM __temp__bolt_taxonomy_content');
+        $this->addSql('DROP TABLE __temp__bolt_taxonomy_content');
+        $this->addSql('CREATE INDEX IDX_C5BCC03C9557E6F6 ON bolt_taxonomy_content (taxonomy_id)');
+        $this->addSql('CREATE INDEX IDX_C5BCC03C84A0A3ED ON bolt_taxonomy_content (content_id)');
+        $this->addSql('DROP INDEX UNIQ_8B90D313A76ED395');
+        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_user_auth_token AS SELECT id, user_id, useragent, validity FROM bolt_user_auth_token');
+        $this->addSql('DROP TABLE bolt_user_auth_token');
+        $this->addSql('CREATE TABLE bolt_user_auth_token (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, useragent VARCHAR(255) NOT NULL, validity DATETIME NOT NULL)');
+        $this->addSql('INSERT INTO bolt_user_auth_token (id, user_id, useragent, validity) SELECT id, user_id, useragent, validity FROM __temp__bolt_user_auth_token');
+        $this->addSql('DROP TABLE __temp__bolt_user_auth_token');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_8B90D313A76ED395 ON bolt_user_auth_token (user_id)');
+    }
+}
diff --git a/src/Repository/ResetPasswordRequestRepository.php b/src/Repository/ResetPasswordRequestRepository.php
new file mode 100644
index 00000000..f28a5022
--- /dev/null
+++ b/src/Repository/ResetPasswordRequestRepository.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Bolt\Repository;
+
+use Bolt\Entity\ResetPasswordRequest;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
+use SymfonyCasts\Bundle\ResetPassword\Persistence\Repository\ResetPasswordRequestRepositoryTrait;
+use SymfonyCasts\Bundle\ResetPassword\Persistence\ResetPasswordRequestRepositoryInterface;
+
+/**
+ * @method ResetPasswordRequest|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ResetPasswordRequest|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ResetPasswordRequest[]    findAll()
+ * @method ResetPasswordRequest[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ResetPasswordRequestRepository extends ServiceEntityRepository implements ResetPasswordRequestRepositoryInterface
+{
+    use ResetPasswordRequestRepositoryTrait;
+
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ResetPasswordRequest::class);
+    }
+
+    public function createResetPasswordRequest(object $user, \DateTimeInterface $expiresAt, string $selector, string $hashedToken): ResetPasswordRequestInterface
+    {
+        return new ResetPasswordRequest($user, $expiresAt, $selector, $hashedToken);
+    }
+}
diff --git a/symfony.lock b/symfony.lock
index 39de0b91..a10ea7dd 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -1065,6 +1065,18 @@
     "symfony/yaml": {
         "version": "v4.4.4"
     },
+    "symfonycasts/reset-password-bundle": {
+        "version": "1.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "1.0",
+            "ref": "97c1627c0384534997ae1047b93be517ca16de43"
+        },
+        "files": [
+            "config/packages/reset_password.yaml"
+        ]
+    },
     "symplify/auto-bind-parameter": {
         "version": "v7.2.2"
     },
diff --git a/templates/reset_password/check_email.html.twig b/templates/reset_password/check_email.html.twig
new file mode 100644
index 00000000..f2ba908f
--- /dev/null
+++ b/templates/reset_password/check_email.html.twig
@@ -0,0 +1,41 @@
+{% extends '@bolt/_base/layout_blank.html.twig' %}
+
+{% block title %}
+    Password Reset Email Sent
+{% endblock %}
+
+{% block html_id %}{% endblock %}
+
+{% block html_class %}{% endblock %}
+
+{% block body_class %}page--reset-password--success{% if not config.get('general/omit_backgrounds') %} with-background{% endif %}{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+{% endblock %}
+
+{% block main %}
+    <div>
+
+        <div class="reset-password__logo">
+            <img class="logo" alt="Bolt CMS logo"
+              {% if not config.get('general/omit_backgrounds') %}
+                 src="{{ asset('assets/images/bolt_logo_loginpage--bg.svg') }}">
+            {% else %}
+                src="{{ asset('assets/images/bolt_logo_loginpage.svg') }}">
+            {% endif %}
+        </div>
+
+        <div class="card">
+            <div class="card-header">
+                <i class="fa fa-lock" aria-hidden="true"></i>
+                {{ 'reset_password.request_header'|trans }}
+            </div>
+            <div class="card-body">
+                <p>An email has been sent that contains a link that you can click to reset your password. This link will expire in {{ tokenLifetime|date('g') }} hour(s).</p>
+                <p>If you don't receive an email please check your spam folder or <a href="{{ path('app_forgot_password_request') }}">try again</a>.</p>
+            </div>
+        </div>
+
+    </div>
+{% endblock %}
diff --git a/templates/reset_password/email.html.twig b/templates/reset_password/email.html.twig
new file mode 100644
index 00000000..1261e754
--- /dev/null
+++ b/templates/reset_password/email.html.twig
@@ -0,0 +1,9 @@
+<h1>Hi!</h1>
+
+<p>To reset your password, please visit the following link</p>
+
+<a href="{{ url('app_reset_password', {token: resetToken.token}) }}">{{ url('app_reset_password', {token: resetToken.token}) }}</a>
+
+<p>This link will expire in {{ tokenLifetime|date('g') }} hour(s).</p>
+
+<p>Cheers!</p>
diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
new file mode 100644
index 00000000..e27b897a
--- /dev/null
+++ b/templates/reset_password/request.html.twig
@@ -0,0 +1,54 @@
+{% extends '@bolt/_base/layout_blank.html.twig' %}
+
+{% block title %}
+    Reset your password
+{% endblock %}
+
+{% block html_id %}{% endblock %}
+
+{% block html_class %}{% endblock %}
+
+{% block body_class %}page--reset-password{% if not config.get('general/omit_backgrounds') %} with-background{% endif %}{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+{% endblock %}
+
+{% block main %}
+    <div>
+
+        <div class="reset-password__logo">
+            <img class="logo" alt="Bolt CMS logo"
+              {% if not config.get('general/omit_backgrounds') %}
+                 src="{{ asset('assets/images/bolt_logo_loginpage--bg.svg') }}">
+            {% else %}
+                src="{{ asset('assets/images/bolt_logo_loginpage.svg') }}">
+            {% endif %}
+        </div>
+
+        {% for flashError in app.flashes('reset_password_error') %}
+            <div class="alert alert-danger" role="alert">{{ flashError }}</div>
+        {% endfor %}
+
+        <div class="card">
+            <div class="card-header">
+                <i class="fa fa-lock" aria-hidden="true"></i>
+                {{ 'reset_password.request_header'|trans }}
+            </div>
+            <div class="card-body">
+                {{ form_start(requestForm, {'attr': {'class': 'reset-password__form'}}) }}
+                {{ form_row(requestForm.email) }}
+                <div class="reset-password__description">
+                    {{ 'reset_password.request_description'|trans }}
+                </div>
+                <button class="btn btn-primary">{{ 'reset_password.request_send'|trans }}</button>
+                <a href="{{ path('bolt_login') }}" class="btn btn-primary">
+                    <i class="fas fa-sign-in-alt"></i>
+                    {{ 'action.log_in'|trans }}
+                </a>
+                {{ form_end(requestForm) }}
+            </div>
+        </div>
+
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/reset_password/reset.html.twig b/templates/reset_password/reset.html.twig
new file mode 100644
index 00000000..799aa10f
--- /dev/null
+++ b/templates/reset_password/reset.html.twig
@@ -0,0 +1,12 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Reset your password{% endblock %}
+
+{% block body %}
+    <h1>Reset your password</h1>
+
+    {{ form_start(resetForm) }}
+        {{ form_row(resetForm.plainPassword) }}
+        <button class="btn btn-primary">Reset password</button>
+    {{ form_end(resetForm) }}
+{% endblock %}
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index f28c2a48..991af0ae 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -22,9 +22,9 @@
         <div class="login__logo">
             <img class="logo" alt="Bolt CMS logo"
                 {% if not config.get('general/omit_backgrounds') %}
-                 src="{{ asset('assets/images/bolt_logo_loginpage--bg.svg', 'public') }}">
+                 src="{{ asset('assets/images/bolt_logo_loginpage--bg.svg', 'bolt') }}">
                 {% else %}
-                 src="{{ asset('assets/images/bolt_logo_loginpage.svg', 'public') }}">
+                 src="{{ asset('assets/images/bolt_logo_loginpage.svg', 'bolt') }}">
                  {% endif %}
             <h1>{{ config.get('general/sitename') }}</h1>
         </div>
@@ -53,7 +53,11 @@
                         <i class="fas fa-sign-in-alt" aria-hidden="true"></i>
                         {{- 'action.log_in'|trans -}}
                     </button>
-                {{ form_end(loginForm) }}
+                    <a href="{{ path('app_forgot_password_request') }}" class="btn btn-primary">
+                      <i class="fas fa-question-circle"></i>
+                      {{ 'login.forgotpassword'|trans }}
+                    </a>
+                </form>
 
             </div>
 
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index b6ca20ea..cfa3ee19 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2451,5 +2451,35 @@
         <target>Avatar</target>
       </segment>
     </unit>
+    <unit id="yL82RfV" name="login.forgotpassword">
+      <segment>
+        <source>login.forgotpassword</source>
+        <target>Forgot Password</target>
+      </segment>
+    </unit>
+    <unit id="y.dIywE" name="reset_password.request_header">
+      <segment>
+        <source>reset_password.request_header</source>
+        <target>Reset Password</target>
+      </segment>
+    </unit>
+    <unit id="SwOgM7K" name="reset_password.request_description">
+      <segment>
+        <source>reset_password.request_description</source>
+        <target>Enter your email address and we we will send you a link to reset your password.</target>
+      </segment>
+    </unit>
+    <unit id="RX0Iuzi" name="reset_password.request_send">
+      <segment>
+        <source>reset_password.request_send</source>
+        <target>Submit</target>
+      </segment>
+    </unit>
+    <unit id="lpzL089" name="Email">
+      <segment>
+        <source>Email</source>
+        <target>Email</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From 291ab20e938be8419255cc98aa12bfbf647950cb Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 2 Oct 2020 14:13:21 +0200
Subject: [PATCH 05/20] change request password text for go back to login

---
 templates/reset_password/request.html.twig | 2 +-
 translations/messages.en.xlf               | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
index e27b897a..b8ddcb9d 100644
--- a/templates/reset_password/request.html.twig
+++ b/templates/reset_password/request.html.twig
@@ -44,7 +44,7 @@
                 <button class="btn btn-primary">{{ 'reset_password.request_send'|trans }}</button>
                 <a href="{{ path('bolt_login') }}" class="btn btn-primary">
                     <i class="fas fa-sign-in-alt"></i>
-                    {{ 'action.log_in'|trans }}
+                    {{ 'reset_password.back-to-login'|trans }}
                 </a>
                 {{ form_end(requestForm) }}
             </div>
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index cfa3ee19..9fb61540 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2451,7 +2451,7 @@
         <target>Avatar</target>
       </segment>
     </unit>
-    <unit id="yL82RfV" name="login.forgotpassword">
+    <unit id="i37ZNqN" name="login.forgotpassword">
       <segment>
         <source>login.forgotpassword</source>
         <target>Forgot Password</target>
@@ -2481,5 +2481,11 @@
         <target>Email</target>
       </segment>
     </unit>
+    <unit id="k9hekeu" name="reset_password.back-to-login">
+      <segment>
+        <source>reset_password.back-to-login</source>
+        <target>Back to Login</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From 0c5381305c8e2c47d5ebe83bdeede842a8a019c6 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sun, 4 Oct 2020 21:06:35 +0200
Subject: [PATCH 06/20] added user adjustable reset password configs in
 config/bolt/config.yaml and adjusted templates for reset password page

---
 config/bolt/config.yaml                    |  7 +++
 src/Controller/ResetPasswordController.php | 23 +++++++---
 templates/reset_password/reset.html.twig   | 51 +++++++++++++++++-----
 templates/security/login.html.twig         |  4 ++
 translations/messages.en.xlf               |  6 +++
 5 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/config/bolt/config.yaml b/config/bolt/config.yaml
index cfc8bf57..6138a3e4 100644
--- a/config/bolt/config.yaml
+++ b/config/bolt/config.yaml
@@ -199,3 +199,10 @@ user_avatar:
     upload_path: avatars
     extensions_allowed: ['png', 'jpeg', 'jpg', 'gif']
     default_avatar: '' # Put path of file locate in files directory
+
+# Settings for the reset password logic
+reset_password_settings:
+    mail_from: "do-not-reply@dummy.com"
+    mail_name: "Bolt CMS"
+    mail_subject: "Your password reset request"
+    mail_template: "reset_password/email.html.twig"
diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
index d74b0cdc..3d5cbba6 100644
--- a/src/Controller/ResetPasswordController.php
+++ b/src/Controller/ResetPasswordController.php
@@ -2,6 +2,7 @@
 
 namespace Bolt\Controller;
 
+use Bolt\Configuration\Config;
 use Bolt\Entity\User;
 use Bolt\Form\ChangePasswordFormType;
 use Bolt\Form\ResetPasswordRequestFormType;
@@ -27,9 +28,13 @@ class ResetPasswordController extends AbstractController
 
     private $resetPasswordHelper;
 
-    public function __construct(ResetPasswordHelperInterface $resetPasswordHelper)
+    /** @var Config */
+    private $config;
+
+    public function __construct(ResetPasswordHelperInterface $resetPasswordHelper, Config $config)
     {
         $this->resetPasswordHelper = $resetPasswordHelper;
+        $this->config = $config;
     }
 
     /**
@@ -122,7 +127,9 @@ class ResetPasswordController extends AbstractController
             // The session is cleaned up after the password has been changed.
             $this->cleanSessionAfterReset();
 
-            return $this->redirectToRoute('app_home');
+            // Added an additional flash message to show if password reset was successful
+            $this->addFlash('reset_password_success', 'Your password has been reset successfully' );
+            return $this->redirectToRoute('bolt_login');
         }
 
         return $this->render('reset_password/reset.html.twig', [
@@ -159,16 +166,18 @@ class ResetPasswordController extends AbstractController
             return $this->redirectToRoute('app_check_email');
         }
 
+        // Global config/bolt/config.yml file.
+        $config = $this->config->get('general/reset_password_settings');
+
         $email = (new TemplatedEmail())
-            ->from(new Address('do-not-reply@boltcms.io', 'BoltCMS Reset Password'))
+            ->from(new Address($config['mail_from'], $config['mail_name']))
             ->to($user->getEmail())
-            ->subject('Your password reset request')
-            ->htmlTemplate('reset_password/email.html.twig')
+            ->subject($config['mail_subject'])
+            ->htmlTemplate($config['mail_template'])
             ->context([
                 'resetToken' => $resetToken,
                 'tokenLifetime' => $this->resetPasswordHelper->getTokenLifetime(),
-            ])
-        ;
+            ]);
 
         $mailer->send($email);
 
diff --git a/templates/reset_password/reset.html.twig b/templates/reset_password/reset.html.twig
index 799aa10f..51a8db6f 100644
--- a/templates/reset_password/reset.html.twig
+++ b/templates/reset_password/reset.html.twig
@@ -1,12 +1,43 @@
-{% extends 'base.html.twig' %}
+{% extends '@bolt/_base/layout_blank.html.twig' %}
 
-{% block title %}Reset your password{% endblock %}
-
-{% block body %}
-    <h1>Reset your password</h1>
-
-    {{ form_start(resetForm) }}
-        {{ form_row(resetForm.plainPassword) }}
-        <button class="btn btn-primary">Reset password</button>
-    {{ form_end(resetForm) }}
+{% block title %}
+    Reset your password
+{% endblock %}
+
+{% block html_id %}{% endblock %}
+
+{% block html_class %}{% endblock %}
+
+{% block body_class %}page--reset-password--success{% if not config.get('general/omit_backgrounds') %} with-background{% endif %}{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+{% endblock %}
+
+{% block main %}
+    <div>
+
+        <div class="reset-password__logo">
+            <img class="logo" alt="Bolt CMS logo"
+              {% if not config.get('general/omit_backgrounds') %}
+                 src="{{ asset('assets/images/bolt_logo_loginpage--bg.svg') }}">
+            {% else %}
+                src="{{ asset('assets/images/bolt_logo_loginpage.svg') }}">
+            {% endif %}
+        </div>
+
+        <div class="card">
+            <div class="card-header">
+                <i class="fa fa-lock" aria-hidden="true"></i>
+                {{ 'reset_password.reset_header'|trans }}
+            </div>
+            <div class="card-body">
+                {{ form_start(resetForm) }}
+                {{ form_row(resetForm.plainPassword) }}
+                <button class="btn btn-primary">Reset password</button>
+                {{ form_end(resetForm) }}
+            </div>
+        </div>
+
+    </div>
 {% endblock %}
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 991af0ae..e517a76c 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -29,6 +29,10 @@
             <h1>{{ config.get('general/sitename') }}</h1>
         </div>
 
+        {% for flashError in app.flashes('reset_password_success') %}
+            <div class="alert alert-success" role="alert">{{ flashError }}</div>
+        {% endfor %}
+
         <div class="card login__login-form">
 
             <div class="card-header">
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 9fb61540..c3396469 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2487,5 +2487,11 @@
         <target>Back to Login</target>
       </segment>
     </unit>
+    <unit id="gVc0Uf4" name="reset_password.reset_header">
+      <segment>
+        <source>reset_password.reset_header</source>
+        <target>Reset your password</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From 6c4c69e582acd42d204525b858681f190135d5e2 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 2 Oct 2020 11:41:27 +0200
Subject: [PATCH 07/20] added reset password form, link it in login form and
 style request password page

---
 templates/reset_password/request.html.twig | 2 +-
 translations/messages.en.xlf               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
index b8ddcb9d..e27b897a 100644
--- a/templates/reset_password/request.html.twig
+++ b/templates/reset_password/request.html.twig
@@ -44,7 +44,7 @@
                 <button class="btn btn-primary">{{ 'reset_password.request_send'|trans }}</button>
                 <a href="{{ path('bolt_login') }}" class="btn btn-primary">
                     <i class="fas fa-sign-in-alt"></i>
-                    {{ 'reset_password.back-to-login'|trans }}
+                    {{ 'action.log_in'|trans }}
                 </a>
                 {{ form_end(requestForm) }}
             </div>
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index c3396469..4f67c9b5 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2493,5 +2493,11 @@
         <target>Reset your password</target>
       </segment>
     </unit>
+    <unit id="yL82RfV" name="login.forgotpassword">
+      <segment>
+        <source>login.forgotpassword</source>
+        <target>Forgot Password</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From c91ea81adfaeb0b6c6c86aefd409f15a37695ede Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sun, 4 Oct 2020 21:19:48 +0200
Subject: [PATCH 08/20] updated translations

---
 translations/messages.en.xlf | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 4f67c9b5..c3396469 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2493,11 +2493,5 @@
         <target>Reset your password</target>
       </segment>
     </unit>
-    <unit id="yL82RfV" name="login.forgotpassword">
-      <segment>
-        <source>login.forgotpassword</source>
-        <target>Forgot Password</target>
-      </segment>
-    </unit>
   </file>
 </xliff>

From 642acb16f2a29808e89831ffe0f542dd3e2ea15e Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sun, 4 Oct 2020 22:59:05 +0200
Subject: [PATCH 09/20] make nearly everything inside twig templates
 translateable

---
 assets/scss/layout/_reset-password.scss       |  3 ++-
 .../reset_password/check_email.html.twig      |  6 ++---
 templates/reset_password/email.html.twig      | 12 ++++++----
 templates/reset_password/request.html.twig    |  2 +-
 templates/reset_password/reset.html.twig      |  6 ++---
 translations/messages.en.xlf                  | 24 +++++++++++++++++++
 6 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/assets/scss/layout/_reset-password.scss b/assets/scss/layout/_reset-password.scss
index 6aeb7a57..823994bb 100644
--- a/assets/scss/layout/_reset-password.scss
+++ b/assets/scss/layout/_reset-password.scss
@@ -1,5 +1,6 @@
 .page--reset-password,
-.page--reset-password--success {
+.page--reset-password--success,
+.page--reset-password--reset {
   background: linear-gradient(rgba(200, 200, 200, 0.6), rgba(200, 200, 200, 0.2));
 
   > div {
diff --git a/templates/reset_password/check_email.html.twig b/templates/reset_password/check_email.html.twig
index f2ba908f..c5813284 100644
--- a/templates/reset_password/check_email.html.twig
+++ b/templates/reset_password/check_email.html.twig
@@ -1,7 +1,7 @@
 {% extends '@bolt/_base/layout_blank.html.twig' %}
 
 {% block title %}
-    Password Reset Email Sent
+    {{ 'reset_password.check_email_sent_header'|trans }}
 {% endblock %}
 
 {% block html_id %}{% endblock %}
@@ -32,8 +32,8 @@
                 {{ 'reset_password.request_header'|trans }}
             </div>
             <div class="card-body">
-                <p>An email has been sent that contains a link that you can click to reset your password. This link will expire in {{ tokenLifetime|date('g') }} hour(s).</p>
-                <p>If you don't receive an email please check your spam folder or <a href="{{ path('app_forgot_password_request') }}">try again</a>.</p>
+                <p>{{ 'reset_password.check_email_sent_text_1'|trans({'%hours%': tokenLifetime|date('g')}) }}</p>
+                <p>{{ 'reset_password.check_email_sent_text_2'|trans({'%tryagain%': '<a href="' ~ path('app_forgot_password_request') ~ '">try again</a>' }) | raw }}</p>
             </div>
         </div>
 
diff --git a/templates/reset_password/email.html.twig b/templates/reset_password/email.html.twig
index 1261e754..06ae280a 100644
--- a/templates/reset_password/email.html.twig
+++ b/templates/reset_password/email.html.twig
@@ -1,9 +1,13 @@
-<h1>Hi!</h1>
+<h1>{{ 'reset_password.email_title'|trans }}</h1>
+{# TBD: Hi! #}
 
-<p>To reset your password, please visit the following link</p>
+<p>{{ 'reset_password.email_description'|trans }}</p>
+{# TBD: To reset your password, please visit the following link #}
 
 <a href="{{ url('app_reset_password', {token: resetToken.token}) }}">{{ url('app_reset_password', {token: resetToken.token}) }}</a>
 
-<p>This link will expire in {{ tokenLifetime|date('g') }} hour(s).</p>
+<p>{{ 'reset_password.email_expire'|trans({'%hours%': tokenLifetime|date('g')}) }}</p>
+{# TBD: This link will expire in %hours% hour(s). #}
 
-<p>Cheers!</p>
+<p>{{ 'reset_password.email_thanks'|trans }}</p>
+{# TBD: Cheers! #}
diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
index e27b897a..6994475b 100644
--- a/templates/reset_password/request.html.twig
+++ b/templates/reset_password/request.html.twig
@@ -1,7 +1,7 @@
 {% extends '@bolt/_base/layout_blank.html.twig' %}
 
 {% block title %}
-    Reset your password
+    {{ 'reset_password.request_header'|trans }}
 {% endblock %}
 
 {% block html_id %}{% endblock %}
diff --git a/templates/reset_password/reset.html.twig b/templates/reset_password/reset.html.twig
index 51a8db6f..189a8f57 100644
--- a/templates/reset_password/reset.html.twig
+++ b/templates/reset_password/reset.html.twig
@@ -1,14 +1,14 @@
 {% extends '@bolt/_base/layout_blank.html.twig' %}
 
 {% block title %}
-    Reset your password
+    {{ 'reset_password.reset_header'|trans }}
 {% endblock %}
 
 {% block html_id %}{% endblock %}
 
 {% block html_class %}{% endblock %}
 
-{% block body_class %}page--reset-password--success{% if not config.get('general/omit_backgrounds') %} with-background{% endif %}{% endblock %}
+{% block body_class %}page--reset-password--reset{% if not config.get('general/omit_backgrounds') %} with-background{% endif %}{% endblock %}
 
 {% block javascripts %}
     {{ parent() }}
@@ -34,7 +34,7 @@
             <div class="card-body">
                 {{ form_start(resetForm) }}
                 {{ form_row(resetForm.plainPassword) }}
-                <button class="btn btn-primary">Reset password</button>
+                <button class="btn btn-primary">{{ 'reset_password.reset_btn'|trans }}</button>
                 {{ form_end(resetForm) }}
             </div>
         </div>
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index c3396469..8a8332cf 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2493,5 +2493,29 @@
         <target>Reset your password</target>
       </segment>
     </unit>
+    <unit id="U6qdalg" name="reset_password.check_email_sent_header">
+      <segment>
+        <source>reset_password.check_email_sent_header</source>
+        <target>Password Reset Email Sent</target>
+      </segment>
+    </unit>
+    <unit id="SxW1D3L" name="reset_password.check_email_sent_text_1">
+      <segment>
+        <source>reset_password.check_email_sent_text_1</source>
+        <target>An email has been sent that contains a link that you can click to reset your password. This link will expire in %hours% hour(s).</target>
+      </segment>
+    </unit>
+    <unit id="z25k4DS" name="reset_password.check_email_sent_text_2">
+      <segment>
+        <source>reset_password.check_email_sent_text_2</source>
+        <target>If you don't receive an email please check your spam folder or %tryagain%.</target>
+      </segment>
+    </unit>
+    <unit id="QpUMHfK" name="reset_password.reset_btn">
+      <segment>
+        <source>reset_password.reset_btn</source>
+        <target>Reset Password</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From 696b88c9ae5a6fb21242a8bc99cc91540a6556e9 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 2 Oct 2020 11:41:27 +0200
Subject: [PATCH 10/20] added reset password form, link it in login form and
 style request password page

---
 symfony.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symfony.lock b/symfony.lock
index a10ea7dd..eb6c3326 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -420,7 +420,7 @@
         "version": "2.0.1"
     },
     "php": {
-        "version": "7.2"
+        "version": "7.3"
     },
     "php-cs-fixer/diff": {
         "version": "v1.3.0"

From 996d54e528ef14b713556bb2de540030dec3bd98 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 2 Oct 2020 14:13:21 +0200
Subject: [PATCH 11/20] change request password text for go back to login

---
 templates/reset_password/request.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
index 6994475b..a6f8bb22 100644
--- a/templates/reset_password/request.html.twig
+++ b/templates/reset_password/request.html.twig
@@ -44,7 +44,7 @@
                 <button class="btn btn-primary">{{ 'reset_password.request_send'|trans }}</button>
                 <a href="{{ path('bolt_login') }}" class="btn btn-primary">
                     <i class="fas fa-sign-in-alt"></i>
-                    {{ 'action.log_in'|trans }}
+                    {{ 'reset_password.back-to-login'|trans }}
                 </a>
                 {{ form_end(requestForm) }}
             </div>

From ba9efbe9a392e7a0416f86e4cc5efa184f638bce Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 9 Oct 2020 21:11:16 +0200
Subject: [PATCH 12/20] remove migrations

---
 src/Migrations/Version20201001213721.php | 180 -----------------------
 1 file changed, 180 deletions(-)
 delete mode 100644 src/Migrations/Version20201001213721.php

diff --git a/src/Migrations/Version20201001213721.php b/src/Migrations/Version20201001213721.php
deleted file mode 100644
index d47f85a8..00000000
--- a/src/Migrations/Version20201001213721.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Bolt\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20201001213721 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'sqlite', 'Migration can only be executed safely on \'sqlite\'.');
-
-        $this->addSql('CREATE TABLE bolt_reset_password_request (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER NOT NULL, selector VARCHAR(20) NOT NULL, hashed_token VARCHAR(100) NOT NULL, requested_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , expires_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        )');
-        $this->addSql('CREATE INDEX IDX_D04070DCA76ED395 ON bolt_reset_password_request (user_id)');
-        $this->addSql('DROP INDEX IDX_3431ED74A3934190');
-        $this->addSql('DROP INDEX IDX_3431ED74AF0465EA');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_relation AS SELECT id, from_content_id, to_content_id, position FROM bolt_relation');
-        $this->addSql('DROP TABLE bolt_relation');
-        $this->addSql('CREATE TABLE bolt_relation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, from_content_id INTEGER NOT NULL, to_content_id INTEGER NOT NULL, position INTEGER NOT NULL, CONSTRAINT FK_3431ED74AF0465EA FOREIGN KEY (from_content_id) REFERENCES bolt_content (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_3431ED74A3934190 FOREIGN KEY (to_content_id) REFERENCES bolt_content (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_relation (id, from_content_id, to_content_id, position) SELECT id, from_content_id, to_content_id, position FROM __temp__bolt_relation');
-        $this->addSql('DROP TABLE __temp__bolt_relation');
-        $this->addSql('CREATE INDEX IDX_3431ED74A3934190 ON bolt_relation (to_content_id)');
-        $this->addSql('CREATE INDEX IDX_3431ED74AF0465EA ON bolt_relation (from_content_id)');
-        $this->addSql('DROP INDEX IDX_C5BCC03C84A0A3ED');
-        $this->addSql('DROP INDEX IDX_C5BCC03C9557E6F6');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_taxonomy_content AS SELECT taxonomy_id, content_id FROM bolt_taxonomy_content');
-        $this->addSql('DROP TABLE bolt_taxonomy_content');
-        $this->addSql('CREATE TABLE bolt_taxonomy_content (taxonomy_id INTEGER NOT NULL, content_id INTEGER NOT NULL, PRIMARY KEY(taxonomy_id, content_id), CONSTRAINT FK_C5BCC03C9557E6F6 FOREIGN KEY (taxonomy_id) REFERENCES bolt_taxonomy (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_C5BCC03C84A0A3ED FOREIGN KEY (content_id) REFERENCES bolt_content (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_taxonomy_content (taxonomy_id, content_id) SELECT taxonomy_id, content_id FROM __temp__bolt_taxonomy_content');
-        $this->addSql('DROP TABLE __temp__bolt_taxonomy_content');
-        $this->addSql('CREATE INDEX IDX_C5BCC03C84A0A3ED ON bolt_taxonomy_content (content_id)');
-        $this->addSql('CREATE INDEX IDX_C5BCC03C9557E6F6 ON bolt_taxonomy_content (taxonomy_id)');
-        $this->addSql('DROP INDEX status_idx');
-        $this->addSql('DROP INDEX content_type_idx');
-        $this->addSql('DROP INDEX IDX_F5AB2E9CF675F31B');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_content AS SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM bolt_content');
-        $this->addSql('DROP TABLE bolt_content');
-        $this->addSql('CREATE TABLE bolt_content (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, content_type VARCHAR(191) NOT NULL COLLATE BINARY, status VARCHAR(191) NOT NULL COLLATE BINARY, created_at DATETIME NOT NULL, modified_at DATETIME DEFAULT NULL, published_at DATETIME DEFAULT NULL, depublished_at DATETIME DEFAULT NULL, CONSTRAINT FK_F5AB2E9CF675F31B FOREIGN KEY (author_id) REFERENCES bolt_user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_content (id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at) SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM __temp__bolt_content');
-        $this->addSql('DROP TABLE __temp__bolt_content');
-        $this->addSql('CREATE INDEX status_idx ON bolt_content (status)');
-        $this->addSql('CREATE INDEX content_type_idx ON bolt_content (content_type)');
-        $this->addSql('CREATE INDEX IDX_F5AB2E9CF675F31B ON bolt_content (author_id)');
-        $this->addSql('DROP INDEX IDX_4A2EBBE5727ACA70');
-        $this->addSql('DROP INDEX IDX_4A2EBBE584A0A3ED');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field AS SELECT id, content_id, parent_id, name, sortorder, version, type FROM bolt_field');
-        $this->addSql('DROP TABLE bolt_field');
-        $this->addSql('CREATE TABLE bolt_field (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, content_id INTEGER NOT NULL, parent_id INTEGER DEFAULT NULL, name VARCHAR(191) NOT NULL COLLATE BINARY, sortorder INTEGER NOT NULL, version INTEGER DEFAULT NULL, type VARCHAR(191) NOT NULL COLLATE BINARY, CONSTRAINT FK_4A2EBBE584A0A3ED FOREIGN KEY (content_id) REFERENCES bolt_content (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_4A2EBBE5727ACA70 FOREIGN KEY (parent_id) REFERENCES bolt_field (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_field (id, content_id, parent_id, name, sortorder, version, type) SELECT id, content_id, parent_id, name, sortorder, version, type FROM __temp__bolt_field');
-        $this->addSql('DROP TABLE __temp__bolt_field');
-        $this->addSql('CREATE INDEX IDX_4A2EBBE5727ACA70 ON bolt_field (parent_id)');
-        $this->addSql('CREATE INDEX IDX_4A2EBBE584A0A3ED ON bolt_field (content_id)');
-        $this->addSql('DROP INDEX field_translation_unique_translation');
-        $this->addSql('DROP INDEX IDX_5C60C0542C2AC5D3');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field_translation AS SELECT id, translatable_id, value, locale FROM bolt_field_translation');
-        $this->addSql('DROP TABLE bolt_field_translation');
-        $this->addSql('CREATE TABLE bolt_field_translation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, translatable_id INTEGER DEFAULT NULL, value CLOB NOT NULL COLLATE BINARY --(DC2Type:json)
-        , locale VARCHAR(5) NOT NULL COLLATE BINARY, CONSTRAINT FK_5C60C0542C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bolt_field (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_field_translation (id, translatable_id, value, locale) SELECT id, translatable_id, value, locale FROM __temp__bolt_field_translation');
-        $this->addSql('DROP TABLE __temp__bolt_field_translation');
-        $this->addSql('CREATE UNIQUE INDEX field_translation_unique_translation ON bolt_field_translation (translatable_id, locale)');
-        $this->addSql('CREATE INDEX IDX_5C60C0542C2AC5D3 ON bolt_field_translation (translatable_id)');
-        $this->addSql('DROP INDEX UNIQ_8B90D313A76ED395');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_user_auth_token AS SELECT id, user_id, useragent, validity FROM bolt_user_auth_token');
-        $this->addSql('DROP TABLE bolt_user_auth_token');
-        $this->addSql('CREATE TABLE bolt_user_auth_token (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, useragent VARCHAR(255) NOT NULL COLLATE BINARY, validity DATETIME NOT NULL, CONSTRAINT FK_8B90D313A76ED395 FOREIGN KEY (user_id) REFERENCES bolt_user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_user_auth_token (id, user_id, useragent, validity) SELECT id, user_id, useragent, validity FROM __temp__bolt_user_auth_token');
-        $this->addSql('DROP TABLE __temp__bolt_user_auth_token');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_8B90D313A76ED395 ON bolt_user_auth_token (user_id)');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_log AS SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM bolt_log');
-        $this->addSql('DROP TABLE bolt_log');
-        $this->addSql('CREATE TABLE bolt_log (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, message CLOB NOT NULL COLLATE BINARY, level SMALLINT NOT NULL, level_name VARCHAR(50) NOT NULL COLLATE BINARY, created_at DATETIME NOT NULL, content INTEGER DEFAULT NULL, context CLOB DEFAULT NULL --(DC2Type:array)
-        , extra CLOB DEFAULT NULL --(DC2Type:array)
-        , user CLOB DEFAULT NULL --(DC2Type:array)
-        , location CLOB DEFAULT NULL --(DC2Type:array)
-        )');
-        $this->addSql('INSERT INTO bolt_log (id, message, context, level, level_name, created_at, extra, user, content, location) SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM __temp__bolt_log');
-        $this->addSql('DROP TABLE __temp__bolt_log');
-        $this->addSql('DROP INDEX IDX_7BF75FB1F675F31B');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_media AS SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM bolt_media');
-        $this->addSql('DROP TABLE bolt_media');
-        $this->addSql('CREATE TABLE bolt_media (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, location VARCHAR(191) NOT NULL COLLATE BINARY, path CLOB NOT NULL COLLATE BINARY, filename VARCHAR(191) NOT NULL COLLATE BINARY, type VARCHAR(191) NOT NULL COLLATE BINARY, width INTEGER DEFAULT NULL, height INTEGER DEFAULT NULL, filesize INTEGER DEFAULT NULL, crop_x INTEGER DEFAULT NULL, crop_y INTEGER DEFAULT NULL, crop_zoom DOUBLE PRECISION DEFAULT NULL, created_at DATETIME NOT NULL, modified_at DATETIME NOT NULL, title VARCHAR(191) DEFAULT NULL COLLATE BINARY, description VARCHAR(1000) DEFAULT NULL COLLATE BINARY, original_filename VARCHAR(1000) DEFAULT NULL COLLATE BINARY, copyright VARCHAR(191) DEFAULT NULL COLLATE BINARY, CONSTRAINT FK_7BF75FB1F675F31B FOREIGN KEY (author_id) REFERENCES bolt_user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO bolt_media (id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright) SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM __temp__bolt_media');
-        $this->addSql('DROP TABLE __temp__bolt_media');
-        $this->addSql('CREATE INDEX IDX_7BF75FB1F675F31B ON bolt_media (author_id)');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'sqlite', 'Migration can only be executed safely on \'sqlite\'.');
-
-        $this->addSql('DROP TABLE bolt_reset_password_request');
-        $this->addSql('DROP INDEX IDX_F5AB2E9CF675F31B');
-        $this->addSql('DROP INDEX content_type_idx');
-        $this->addSql('DROP INDEX status_idx');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_content AS SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM bolt_content');
-        $this->addSql('DROP TABLE bolt_content');
-        $this->addSql('CREATE TABLE bolt_content (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, content_type VARCHAR(191) NOT NULL, status VARCHAR(191) NOT NULL, created_at DATETIME NOT NULL, modified_at DATETIME DEFAULT NULL, published_at DATETIME DEFAULT NULL, depublished_at DATETIME DEFAULT NULL)');
-        $this->addSql('INSERT INTO bolt_content (id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at) SELECT id, author_id, content_type, status, created_at, modified_at, published_at, depublished_at FROM __temp__bolt_content');
-        $this->addSql('DROP TABLE __temp__bolt_content');
-        $this->addSql('CREATE INDEX IDX_F5AB2E9CF675F31B ON bolt_content (author_id)');
-        $this->addSql('CREATE INDEX content_type_idx ON bolt_content (content_type)');
-        $this->addSql('CREATE INDEX status_idx ON bolt_content (status)');
-        $this->addSql('DROP INDEX IDX_4A2EBBE584A0A3ED');
-        $this->addSql('DROP INDEX IDX_4A2EBBE5727ACA70');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field AS SELECT id, content_id, parent_id, name, sortorder, version, type FROM bolt_field');
-        $this->addSql('DROP TABLE bolt_field');
-        $this->addSql('CREATE TABLE bolt_field (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, content_id INTEGER NOT NULL, parent_id INTEGER DEFAULT NULL, name VARCHAR(191) NOT NULL, sortorder INTEGER NOT NULL, version INTEGER DEFAULT NULL, type VARCHAR(191) NOT NULL)');
-        $this->addSql('INSERT INTO bolt_field (id, content_id, parent_id, name, sortorder, version, type) SELECT id, content_id, parent_id, name, sortorder, version, type FROM __temp__bolt_field');
-        $this->addSql('DROP TABLE __temp__bolt_field');
-        $this->addSql('CREATE INDEX IDX_4A2EBBE584A0A3ED ON bolt_field (content_id)');
-        $this->addSql('CREATE INDEX IDX_4A2EBBE5727ACA70 ON bolt_field (parent_id)');
-        $this->addSql('DROP INDEX IDX_5C60C0542C2AC5D3');
-        $this->addSql('DROP INDEX field_translation_unique_translation');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_field_translation AS SELECT id, translatable_id, value, locale FROM bolt_field_translation');
-        $this->addSql('DROP TABLE bolt_field_translation');
-        $this->addSql('CREATE TABLE bolt_field_translation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, translatable_id INTEGER DEFAULT NULL, value CLOB NOT NULL --(DC2Type:json)
-        , locale VARCHAR(5) NOT NULL)');
-        $this->addSql('INSERT INTO bolt_field_translation (id, translatable_id, value, locale) SELECT id, translatable_id, value, locale FROM __temp__bolt_field_translation');
-        $this->addSql('DROP TABLE __temp__bolt_field_translation');
-        $this->addSql('CREATE INDEX IDX_5C60C0542C2AC5D3 ON bolt_field_translation (translatable_id)');
-        $this->addSql('CREATE UNIQUE INDEX field_translation_unique_translation ON bolt_field_translation (translatable_id, locale)');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_log AS SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM bolt_log');
-        $this->addSql('DROP TABLE bolt_log');
-        $this->addSql('CREATE TABLE bolt_log (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, message CLOB NOT NULL, level SMALLINT NOT NULL, level_name VARCHAR(50) NOT NULL, created_at DATETIME NOT NULL, content INTEGER DEFAULT NULL, context CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
-        , extra CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
-        , user CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
-        , location CLOB DEFAULT \'NULL --(DC2Type:array)\' COLLATE BINARY --(DC2Type:array)
-        )');
-        $this->addSql('INSERT INTO bolt_log (id, message, context, level, level_name, created_at, extra, user, content, location) SELECT id, message, context, level, level_name, created_at, extra, user, content, location FROM __temp__bolt_log');
-        $this->addSql('DROP TABLE __temp__bolt_log');
-        $this->addSql('DROP INDEX IDX_7BF75FB1F675F31B');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_media AS SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM bolt_media');
-        $this->addSql('DROP TABLE bolt_media');
-        $this->addSql('CREATE TABLE bolt_media (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, author_id INTEGER DEFAULT NULL, location VARCHAR(191) NOT NULL, path CLOB NOT NULL, filename VARCHAR(191) NOT NULL, type VARCHAR(191) NOT NULL, width INTEGER DEFAULT NULL, height INTEGER DEFAULT NULL, filesize INTEGER DEFAULT NULL, crop_x INTEGER DEFAULT NULL, crop_y INTEGER DEFAULT NULL, crop_zoom DOUBLE PRECISION DEFAULT NULL, created_at DATETIME NOT NULL, modified_at DATETIME NOT NULL, title VARCHAR(191) DEFAULT NULL, description VARCHAR(1000) DEFAULT NULL, original_filename VARCHAR(1000) DEFAULT NULL, copyright VARCHAR(191) DEFAULT NULL)');
-        $this->addSql('INSERT INTO bolt_media (id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright) SELECT id, author_id, location, path, filename, type, width, height, filesize, crop_x, crop_y, crop_zoom, created_at, modified_at, title, description, original_filename, copyright FROM __temp__bolt_media');
-        $this->addSql('DROP TABLE __temp__bolt_media');
-        $this->addSql('CREATE INDEX IDX_7BF75FB1F675F31B ON bolt_media (author_id)');
-        $this->addSql('DROP INDEX IDX_3431ED74AF0465EA');
-        $this->addSql('DROP INDEX IDX_3431ED74A3934190');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_relation AS SELECT id, from_content_id, to_content_id, position FROM bolt_relation');
-        $this->addSql('DROP TABLE bolt_relation');
-        $this->addSql('CREATE TABLE bolt_relation (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, from_content_id INTEGER NOT NULL, to_content_id INTEGER NOT NULL, position INTEGER NOT NULL)');
-        $this->addSql('INSERT INTO bolt_relation (id, from_content_id, to_content_id, position) SELECT id, from_content_id, to_content_id, position FROM __temp__bolt_relation');
-        $this->addSql('DROP TABLE __temp__bolt_relation');
-        $this->addSql('CREATE INDEX IDX_3431ED74AF0465EA ON bolt_relation (from_content_id)');
-        $this->addSql('CREATE INDEX IDX_3431ED74A3934190 ON bolt_relation (to_content_id)');
-        $this->addSql('DROP INDEX IDX_C5BCC03C9557E6F6');
-        $this->addSql('DROP INDEX IDX_C5BCC03C84A0A3ED');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_taxonomy_content AS SELECT taxonomy_id, content_id FROM bolt_taxonomy_content');
-        $this->addSql('DROP TABLE bolt_taxonomy_content');
-        $this->addSql('CREATE TABLE bolt_taxonomy_content (taxonomy_id INTEGER NOT NULL, content_id INTEGER NOT NULL, PRIMARY KEY(taxonomy_id, content_id))');
-        $this->addSql('INSERT INTO bolt_taxonomy_content (taxonomy_id, content_id) SELECT taxonomy_id, content_id FROM __temp__bolt_taxonomy_content');
-        $this->addSql('DROP TABLE __temp__bolt_taxonomy_content');
-        $this->addSql('CREATE INDEX IDX_C5BCC03C9557E6F6 ON bolt_taxonomy_content (taxonomy_id)');
-        $this->addSql('CREATE INDEX IDX_C5BCC03C84A0A3ED ON bolt_taxonomy_content (content_id)');
-        $this->addSql('DROP INDEX UNIQ_8B90D313A76ED395');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__bolt_user_auth_token AS SELECT id, user_id, useragent, validity FROM bolt_user_auth_token');
-        $this->addSql('DROP TABLE bolt_user_auth_token');
-        $this->addSql('CREATE TABLE bolt_user_auth_token (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, useragent VARCHAR(255) NOT NULL, validity DATETIME NOT NULL)');
-        $this->addSql('INSERT INTO bolt_user_auth_token (id, user_id, useragent, validity) SELECT id, user_id, useragent, validity FROM __temp__bolt_user_auth_token');
-        $this->addSql('DROP TABLE __temp__bolt_user_auth_token');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_8B90D313A76ED395 ON bolt_user_auth_token (user_id)');
-    }
-}

From 1c54394ff6694f5e647ecc3a283f53ae26b3b4b5 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Fri, 9 Oct 2020 21:18:39 +0200
Subject: [PATCH 13/20] fix ECS and PHPStan

---
 src/Controller/ResetPasswordController.php        | 13 ++++++++-----
 src/Entity/ResetPasswordRequest.php               |  2 ++
 src/Form/ChangePasswordFormType.php               |  2 ++
 src/Form/ResetPasswordRequestFormType.php         |  2 ++
 src/Repository/ResetPasswordRequestRepository.php |  6 ++++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
index 3d5cbba6..86a0e365 100644
--- a/src/Controller/ResetPasswordController.php
+++ b/src/Controller/ResetPasswordController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Bolt\Controller;
 
 use Bolt\Configuration\Config;
@@ -67,7 +69,7 @@ class ResetPasswordController extends AbstractController
     public function checkEmail(): Response
     {
         // We prevent users from directly accessing this page
-        if (!$this->canCheckEmail()) {
+        if (! $this->canCheckEmail()) {
             return $this->redirectToRoute('app_forgot_password_request');
         }
 
@@ -81,7 +83,7 @@ class ResetPasswordController extends AbstractController
      *
      * @Route("/reset/{token}", name="app_reset_password")
      */
-    public function reset(Request $request, UserPasswordEncoderInterface $passwordEncoder, string $token = null): Response
+    public function reset(Request $request, UserPasswordEncoderInterface $passwordEncoder, ?string $token = null): Response
     {
         if ($token) {
             // We store the token in session and remove it from the URL, to avoid the URL being
@@ -92,7 +94,7 @@ class ResetPasswordController extends AbstractController
         }
 
         $token = $this->getTokenFromSession();
-        if (null === $token) {
+        if ($token === null) {
             throw $this->createNotFoundException('No reset password token found in the URL or in the session.');
         }
 
@@ -128,7 +130,8 @@ class ResetPasswordController extends AbstractController
             $this->cleanSessionAfterReset();
 
             // Added an additional flash message to show if password reset was successful
-            $this->addFlash('reset_password_success', 'Your password has been reset successfully' );
+            $this->addFlash('reset_password_success', 'Your password has been reset successfully');
+
             return $this->redirectToRoute('bolt_login');
         }
 
@@ -147,7 +150,7 @@ class ResetPasswordController extends AbstractController
         $this->setCanCheckEmailInSession();
 
         // Do not reveal whether a user account was found or not.
-        if (!$user) {
+        if (! $user) {
             return $this->redirectToRoute('app_check_email');
         }
 
diff --git a/src/Entity/ResetPasswordRequest.php b/src/Entity/ResetPasswordRequest.php
index 014633a8..54b4764f 100644
--- a/src/Entity/ResetPasswordRequest.php
+++ b/src/Entity/ResetPasswordRequest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Bolt\Entity;
 
 use Bolt\Repository\ResetPasswordRequestRepository;
diff --git a/src/Form/ChangePasswordFormType.php b/src/Form/ChangePasswordFormType.php
index 0951f0f0..e52aa2ea 100644
--- a/src/Form/ChangePasswordFormType.php
+++ b/src/Form/ChangePasswordFormType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Bolt\Form;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Form/ResetPasswordRequestFormType.php b/src/Form/ResetPasswordRequestFormType.php
index b1cced21..a1b10269 100644
--- a/src/Form/ResetPasswordRequestFormType.php
+++ b/src/Form/ResetPasswordRequestFormType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Bolt\Form;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/src/Repository/ResetPasswordRequestRepository.php b/src/Repository/ResetPasswordRequestRepository.php
index f28a5022..dbabe978 100644
--- a/src/Repository/ResetPasswordRequestRepository.php
+++ b/src/Repository/ResetPasswordRequestRepository.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Bolt\Repository;
 
 use Bolt\Entity\ResetPasswordRequest;
@@ -12,8 +14,8 @@ use SymfonyCasts\Bundle\ResetPassword\Persistence\ResetPasswordRequestRepository
 /**
  * @method ResetPasswordRequest|null find($id, $lockMode = null, $lockVersion = null)
  * @method ResetPasswordRequest|null findOneBy(array $criteria, array $orderBy = null)
- * @method ResetPasswordRequest[]    findAll()
- * @method ResetPasswordRequest[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method ResetPasswordRequest[] findAll()
+ * @method ResetPasswordRequest[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
 class ResetPasswordRequestRepository extends ServiceEntityRepository implements ResetPasswordRequestRepositoryInterface
 {

From f4f1f886332661de6173384166cf3f99919319ae Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Mon, 12 Oct 2020 20:03:04 +0200
Subject: [PATCH 14/20] changed all generated app_ routes to bolt_ routes and
 other issues pointed out by bob

---
 src/.preload.php                              |  5 ----
 src/Controller/ResetPasswordController.php    | 22 ++++++++---------
 .../reset_password/check_email.html.twig      |  2 +-
 templates/reset_password/email.html.twig      |  6 +----
 templates/reset_password/reset.html.twig      |  2 +-
 templates/security/login.html.twig            |  2 +-
 translations/messages.en.xlf                  | 24 +++++++++++++++++++
 7 files changed, 39 insertions(+), 24 deletions(-)
 delete mode 100644 src/.preload.php

diff --git a/src/.preload.php b/src/.preload.php
deleted file mode 100644
index a1ff8487..00000000
--- a/src/.preload.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-if (file_exists(__DIR__.'/../var/cache/dev/Bolt_KernelDevDebugContainer.preload.php')) {
-    require __DIR__.'/../var/cache/dev/Bolt_KernelDevDebugContainer.preload.php';
-}
diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
index 86a0e365..19ef7841 100644
--- a/src/Controller/ResetPasswordController.php
+++ b/src/Controller/ResetPasswordController.php
@@ -42,7 +42,7 @@ class ResetPasswordController extends AbstractController
     /**
      * Display & process form to request a password reset.
      *
-     * @Route("", name="app_forgot_password_request")
+     * @Route("", name="bolt_forgot_password_request")
      */
     public function request(Request $request, MailerInterface $mailer): Response
     {
@@ -64,13 +64,13 @@ class ResetPasswordController extends AbstractController
     /**
      * Confirmation page after a user has requested a password reset.
      *
-     * @Route("/check-email", name="app_check_email")
+     * @Route("/check-email", name="bolt_check_email")
      */
     public function checkEmail(): Response
     {
         // We prevent users from directly accessing this page
         if (! $this->canCheckEmail()) {
-            return $this->redirectToRoute('app_forgot_password_request');
+            return $this->redirectToRoute('bolt_forgot_password_request');
         }
 
         return $this->render('reset_password/check_email.html.twig', [
@@ -81,7 +81,7 @@ class ResetPasswordController extends AbstractController
     /**
      * Validates and process the reset URL that the user clicked in their email.
      *
-     * @Route("/reset/{token}", name="app_reset_password")
+     * @Route("/reset/{token}", name="bolt_reset_password")
      */
     public function reset(Request $request, UserPasswordEncoderInterface $passwordEncoder, ?string $token = null): Response
     {
@@ -90,7 +90,7 @@ class ResetPasswordController extends AbstractController
             // loaded in a browser and potentially leaking the token to 3rd party JavaScript.
             $this->storeTokenInSession($token);
 
-            return $this->redirectToRoute('app_reset_password');
+            return $this->redirectToRoute('bolt_reset_password');
         }
 
         $token = $this->getTokenFromSession();
@@ -106,7 +106,7 @@ class ResetPasswordController extends AbstractController
                 $e->getReason()
             ));
 
-            return $this->redirectToRoute('app_forgot_password_request');
+            return $this->redirectToRoute('bolt_forgot_password_request');
         }
 
         // The token is valid; allow the user to change their password.
@@ -146,19 +146,19 @@ class ResetPasswordController extends AbstractController
             'email' => $emailFormData,
         ]);
 
-        // Marks that you are allowed to see the app_check_email page.
+        // Marks that you are allowed to see the bolt_check_email page.
         $this->setCanCheckEmailInSession();
 
         // Do not reveal whether a user account was found or not.
         if (! $user) {
-            return $this->redirectToRoute('app_check_email');
+            return $this->redirectToRoute('bolt_check_email');
         }
 
         try {
             $resetToken = $this->resetPasswordHelper->generateResetToken($user);
         } catch (ResetPasswordExceptionInterface $e) {
             // If you want to tell the user why a reset email was not sent, uncomment
-            // the lines below and change the redirect to 'app_forgot_password_request'.
+            // the lines below and change the redirect to 'bolt_forgot_password_request'.
             // Caution: This may reveal if a user is registered or not.
             //
             // $this->addFlash('reset_password_error', sprintf(
@@ -166,7 +166,7 @@ class ResetPasswordController extends AbstractController
             //     $e->getReason()
             // ));
 
-            return $this->redirectToRoute('app_check_email');
+            return $this->redirectToRoute('bolt_check_email');
         }
 
         // Global config/bolt/config.yml file.
@@ -184,6 +184,6 @@ class ResetPasswordController extends AbstractController
 
         $mailer->send($email);
 
-        return $this->redirectToRoute('app_check_email');
+        return $this->redirectToRoute('bolt_check_email');
     }
 }
diff --git a/templates/reset_password/check_email.html.twig b/templates/reset_password/check_email.html.twig
index c5813284..2eb73f75 100644
--- a/templates/reset_password/check_email.html.twig
+++ b/templates/reset_password/check_email.html.twig
@@ -33,7 +33,7 @@
             </div>
             <div class="card-body">
                 <p>{{ 'reset_password.check_email_sent_text_1'|trans({'%hours%': tokenLifetime|date('g')}) }}</p>
-                <p>{{ 'reset_password.check_email_sent_text_2'|trans({'%tryagain%': '<a href="' ~ path('app_forgot_password_request') ~ '">try again</a>' }) | raw }}</p>
+                <p>{{ 'reset_password.check_email_sent_text_2'|trans({'%tryagain%': '<a href="' ~ path('bolt_forgot_password_request') ~ '">try again</a>' }) | raw }}</p>
             </div>
         </div>
 
diff --git a/templates/reset_password/email.html.twig b/templates/reset_password/email.html.twig
index 06ae280a..fcc317a8 100644
--- a/templates/reset_password/email.html.twig
+++ b/templates/reset_password/email.html.twig
@@ -1,13 +1,9 @@
 <h1>{{ 'reset_password.email_title'|trans }}</h1>
-{# TBD: Hi! #}
 
 <p>{{ 'reset_password.email_description'|trans }}</p>
-{# TBD: To reset your password, please visit the following link #}
 
-<a href="{{ url('app_reset_password', {token: resetToken.token}) }}">{{ url('app_reset_password', {token: resetToken.token}) }}</a>
+<a href="{{ url('bolt_reset_password', {token: resetToken.token}) }}">{{ url('bolt_reset_password', {token: resetToken.token}) }}</a>
 
 <p>{{ 'reset_password.email_expire'|trans({'%hours%': tokenLifetime|date('g')}) }}</p>
-{# TBD: This link will expire in %hours% hour(s). #}
 
 <p>{{ 'reset_password.email_thanks'|trans }}</p>
-{# TBD: Cheers! #}
diff --git a/templates/reset_password/reset.html.twig b/templates/reset_password/reset.html.twig
index 189a8f57..98fe24c6 100644
--- a/templates/reset_password/reset.html.twig
+++ b/templates/reset_password/reset.html.twig
@@ -34,7 +34,7 @@
             <div class="card-body">
                 {{ form_start(resetForm) }}
                 {{ form_row(resetForm.plainPassword) }}
-                <button class="btn btn-primary">{{ 'reset_password.reset_btn'|trans }}</button>
+                <button class="float-right btn btn-tertiary">{{ 'reset_password.reset_btn'|trans }}</button>
                 {{ form_end(resetForm) }}
             </div>
         </div>
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index e517a76c..815887f5 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -57,7 +57,7 @@
                         <i class="fas fa-sign-in-alt" aria-hidden="true"></i>
                         {{- 'action.log_in'|trans -}}
                     </button>
-                    <a href="{{ path('app_forgot_password_request') }}" class="btn btn-primary">
+                    <a href="{{ path('bolt_forgot_password_request') }}" class="btn btn-primary">
                       <i class="fas fa-question-circle"></i>
                       {{ 'login.forgotpassword'|trans }}
                     </a>
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 8a8332cf..53c09a69 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2517,5 +2517,29 @@
         <target>Reset Password</target>
       </segment>
     </unit>
+    <unit id="3prMgfK" name="reset_password.email_title">
+      <segment>
+        <source>reset_password.email_title</source>
+        <target>Hi!</target>
+      </segment>
+    </unit>
+    <unit id="oaRkfvE" name="reset_password.email_description">
+      <segment>
+        <source>reset_password.email_description</source>
+        <target>To reset your password, please visit the following link</target>
+      </segment>
+    </unit>
+    <unit id="Afb4dal" name="reset_password.email_expire">
+      <segment>
+        <source>reset_password.email_expire</source>
+        <target>This link will expire in %hours% hour(s).</target>
+      </segment>
+    </unit>
+    <unit id="9ga3FlV" name="reset_password.email_thanks">
+      <segment>
+        <source>reset_password.email_thanks</source>
+        <target>Cheers!</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From 4954f51bc8cc66d907fcbacb5b62d66463015376 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Mon, 12 Oct 2020 20:05:12 +0200
Subject: [PATCH 15/20] added missing new line at the end of request.html.twig

---
 templates/reset_password/request.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
index a6f8bb22..110dd44d 100644
--- a/templates/reset_password/request.html.twig
+++ b/templates/reset_password/request.html.twig
@@ -51,4 +51,4 @@
         </div>
 
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 9b5d8d17d0e2c2acdad13174aae717f206b84deb Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Mon, 12 Oct 2020 20:37:56 +0200
Subject: [PATCH 16/20] added config option to show/hide already requested
 password notice

---
 config/bolt/config.yaml                    |  1 +
 src/Controller/ResetPasswordController.php | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/config/bolt/config.yaml b/config/bolt/config.yaml
index 6138a3e4..60aa3f3c 100644
--- a/config/bolt/config.yaml
+++ b/config/bolt/config.yaml
@@ -202,6 +202,7 @@ user_avatar:
 
 # Settings for the reset password logic
 reset_password_settings:
+    show_already_requested_password_notice: true
     mail_from: "do-not-reply@dummy.com"
     mail_name: "Bolt CMS"
     mail_subject: "Your password reset request"
diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
index 19ef7841..688d3b00 100644
--- a/src/Controller/ResetPasswordController.php
+++ b/src/Controller/ResetPasswordController.php
@@ -154,24 +154,26 @@ class ResetPasswordController extends AbstractController
             return $this->redirectToRoute('bolt_check_email');
         }
 
+        // Global config/bolt/config.yml file.
+        $config = $this->config->get('general/reset_password_settings');
+
         try {
             $resetToken = $this->resetPasswordHelper->generateResetToken($user);
         } catch (ResetPasswordExceptionInterface $e) {
             // If you want to tell the user why a reset email was not sent, uncomment
             // the lines below and change the redirect to 'bolt_forgot_password_request'.
             // Caution: This may reveal if a user is registered or not.
-            //
-            // $this->addFlash('reset_password_error', sprintf(
-            //     'There was a problem handling your password reset request - %s',
-            //     $e->getReason()
-            // ));
+
+            if($config['show_already_requested_password_notice']) {
+                $this->addFlash('reset_password_error', sprintf(
+                    'There was a problem handling your password reset request - %s',
+                    $e->getReason()
+                ));
+            }
 
             return $this->redirectToRoute('bolt_check_email');
         }
 
-        // Global config/bolt/config.yml file.
-        $config = $this->config->get('general/reset_password_settings');
-
         $email = (new TemplatedEmail())
             ->from(new Address($config['mail_from'], $config['mail_name']))
             ->to($user->getEmail())

From 4121913a77bc404f025789dd5ba6682a4c16dc95 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Mon, 12 Oct 2020 20:50:40 +0200
Subject: [PATCH 17/20] fix ecs problems

---
 src/Controller/ResetPasswordController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
index 688d3b00..258adc8c 100644
--- a/src/Controller/ResetPasswordController.php
+++ b/src/Controller/ResetPasswordController.php
@@ -164,7 +164,7 @@ class ResetPasswordController extends AbstractController
             // the lines below and change the redirect to 'bolt_forgot_password_request'.
             // Caution: This may reveal if a user is registered or not.
 
-            if($config['show_already_requested_password_notice']) {
+            if ($config['show_already_requested_password_notice']) {
                 $this->addFlash('reset_password_error', sprintf(
                     'There was a problem handling your password reset request - %s',
                     $e->getReason()

From 74e8c7ea17b2f7fddcd19a80ad2096e1dacd5536 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Tue, 17 Nov 2020 09:30:39 +0100
Subject: [PATCH 18/20] Update symfony.lock

---
 symfony.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symfony.lock b/symfony.lock
index eb6c3326..a10ea7dd 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -420,7 +420,7 @@
         "version": "2.0.1"
     },
     "php": {
-        "version": "7.3"
+        "version": "7.2"
     },
     "php-cs-fixer/diff": {
         "version": "v1.3.0"

From a2525d00e6ce31946da84066881efb02ce907c54 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Tue, 17 Nov 2020 11:13:06 +0100
Subject: [PATCH 19/20] Update login.html.twig

---
 templates/security/login.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 815887f5..b80b7dbc 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -61,7 +61,7 @@
                       <i class="fas fa-question-circle"></i>
                       {{ 'login.forgotpassword'|trans }}
                     </a>
-                </form>
+                {{ form_end(loginForm) }}
 
             </div>
 

From 7c975290e482f1bad9d95246e623b4a4b0491985 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Tue, 17 Nov 2020 11:22:37 +0100
Subject: [PATCH 20/20] Updating default "example" mail address

---
 config/bolt/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/bolt/config.yaml b/config/bolt/config.yaml
index 60aa3f3c..bfa4ca8c 100644
--- a/config/bolt/config.yaml
+++ b/config/bolt/config.yaml
@@ -203,7 +203,7 @@ user_avatar:
 # Settings for the reset password logic
 reset_password_settings:
     show_already_requested_password_notice: true
-    mail_from: "do-not-reply@dummy.com"
+    mail_from: "do-not-reply@example.org"
     mail_name: "Bolt CMS"
     mail_subject: "Your password reset request"
     mail_template: "reset_password/email.html.twig"