set redirect_after_login in query parameter as well

src/Mailing/Mail.php

@@ -44,8 +44,10 @@ class Mail
         if (!empty($_ENV['MAIL_HOST'])) {
             $mailer->Mailer = 'smtp';
             $mailer->Host = $_ENV['MAIL_HOST'];
-            $mailer->Port = !empty($_ENV['MAIL_PORT']) ? $_ENV['MAIL_PORT'] : 25;
+            $mailer->Port = !empty($_ENV['MAIL_PORT']) ? $_ENV['MAIL_PORT'] : 587;
-            $mailer->SMTPSecure = !empty($_ENV['MAIL_SECURE']) ? $_ENV['MAIL_SECURE'] : '';
+
+            $secureMaping = ['none' => '', 'starttls' => PHPMailer::ENCRYPTION_STARTTLS, 'smtps' => PHPMailer::ENCRYPTION_SMTPS];
+            $mailer->SMTPSecure = !empty($_ENV['MAIL_SECURE']) ? $secureMaping[$_ENV['MAIL_SECURE']] : '';
 
             if (!empty($_ENV['MAIL_USER'])) {
                 $mailer->SMTPAuth = true;

src/Response/HttpResponse.php

@@ -168,7 +168,10 @@ class HttpResponse
     private function redirectToLogin(): void
     {
         $this->request->session()->set('redirect_after_login', $this->rawUrl);
-        $response = new Redirect($this->routeCollection->getRoute($this->appConfig['loginRouteId'])->generateLink(), IRedirect::TEMPORARY);
+        $response = new Redirect(
+            $this->routeCollection->getRoute($this->appConfig['loginRouteId'])
+                ->generateLink(['redirect_after_login' => urlencode($this->rawUrl)]),
+            IRedirect::TEMPORARY);
         header('Location: ' . $this->getRedirectUrl($response), true, $response->getHttpCode());
     }