Settings for send mail on login

Author: namePlayer

src/App/Controller/Account/SecurityController.php

@@ -35,6 +35,7 @@ public function load(ServerRequestInterface $request): ResponseInterface
         return new HtmlResponse(
             $this->template->render('account/security',
             [
+                'account' => $this->accountService->findAccountById($account->getId()),
                 'totpToken' => $this->securityService->generateTOTPSecret(),
                 'twoFactors' => $this->securityService->getTwoFactorByAccountID($account->getId())
             ]));
@@ -45,14 +46,21 @@ public function create(Account $account): void
 
         if(isset($_POST['addTwoFactorModalSubmit'], $_POST['addTwoFactorModalTFAToken'], $_POST['addTwoFactorModalName'], $_POST['addTwoFactorModalTFACode']))
         {
-
             $twoFactor = new TwoFactor();
             $twoFactor->setAccount($account->getId());
             $twoFactor->setType(TwoFactorType::TOTP_ID);
             $twoFactor->setName($_POST['addTwoFactorModalName']);
             $twoFactor->setToken($_POST['addTwoFactorModalTFAToken']);
 
             $this->securityService->add($twoFactor, $_POST['addTwoFactorModalTFACode']);
+        }
+
+        if(isset($_POST['securityBasicSettingsSave']))
+        {
+
+            $this->accountService->setSendLoginEmail($account->getId(), isset($_POST['sendLoginEmailCheck']));
+
+            MESSAGES->add('success', 'account-settings-security-update-success');
 
         }
 

src/App/Controller/Authentication/LoginController.php

@@ -60,6 +60,7 @@ public function login(ServerRequestInterface $request): ?ResponseInterface
             $account->setId($login['id']);
             $account->setActive((int)$login['active'] === 1);
             $account->setSetupComplete((int)$login['setupComplete'] === 1);
+            $account->setSendMailUnknownLogin((int)$login['sendMailUnknownLogin'] === 1);
 
             if ($account->isActive() === false) {
                 MESSAGES->add('danger', 'login-account-disabled');
@@ -72,18 +73,21 @@ public function login(ServerRequestInterface $request): ?ResponseInterface
                 MESSAGES->add('success', 'login-account-successful');
                 $this->accountService->updateLastUserLogin($account);
 
-                $this->mailerService->configureMail(
-                    $account->getEmail(),
-                    'Neue Anmeldung erkannt',
-                    MailType::NEW_LOGIN_DETECTED_MAIL_ID,
-                    [
-                        'accountName' => $account->getName(),
-                        'browser' => $userInformation->configure($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT'])->getBrowser(),
-                        'country' => $userInformation->getCountry(),
-                        'ip' => $userInformation->getIP()
-                    ],
-                    $account->getId()
-                )->send();
+                if($account->isSendMailUnknownLogin())
+                {
+                    $this->mailerService->configureMail(
+                        $account->getEmail(),
+                        'Neue Anmeldung erkannt',
+                        MailType::NEW_LOGIN_DETECTED_MAIL_ID,
+                        [
+                            'accountName' => $account->getName(),
+                            'browser' => $userInformation->configure($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT'])->getBrowser(),
+                            'country' => $userInformation->getCountry(),
+                            'ip' => $userInformation->getIP()
+                        ],
+                        $account->getId()
+                    )->send();
+                }
 
 
                 $_SESSION[Software::SESSION_USERID_NAME] = $account->getId();

src/App/Middleware/AuthenticationMiddleware.php

@@ -13,7 +13,8 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-readonly class AuthenticationMiddleware implements MiddlewareInterface
+readonly class
+AuthenticationMiddleware implements MiddlewareInterface
 {
 
     public function __construct(
@@ -43,6 +44,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $account->setBusiness($accountData['business']);
         $account->setAdmin($accountData['isAdmin'] === 1);
         $account->setLevel($accountData['level']);
+        $account->setSendMailUnknownLogin($accountData['sendMailUnknownLogin'] === 1);
 
         return $handler->handle($request->withAttribute(Account::class, $account));
     }

src/App/Model/Authentication/Account.php

@@ -21,6 +21,7 @@ class Account
     private bool $setupComplete;
     private bool $support;
     private bool $admin;
+    private bool $sendMailUnknownLogin;
 
     public function getId(): int
     {
@@ -162,4 +163,14 @@ public function setAdmin(bool $admin): void
         $this->admin = $admin;
     }
 
+    public function isSendMailUnknownLogin(): bool
+    {
+        return $this->sendMailUnknownLogin;
+    }
+
+    public function setSendMailUnknownLogin(bool $sendMailUnknownLogin): void
+    {
+        $this->sendMailUnknownLogin = $sendMailUnknownLogin;
+    }
+
 }

src/App/Service/Authentication/AccountService.php

@@ -162,4 +162,10 @@ public function getAccountList(): array
         return $this->accountTable->findAll();
     }
 
+    public function setSendLoginEmail(int $account, bool $active): void
+    {
+        $this->accountTable->updateAccountSendMailUnknownLogin($account, $active);
+    }
+
+
 }

src/App/Table/Authentication/AccountTable.php

@@ -79,4 +79,10 @@ public function updateAccountActive(int $account, bool $active): int|string|bool
         )->execute();
     }
 
+    public function updateAccountSendMailUnknownLogin(int $account, bool $active): int|string|bool
+    {
+        return $this->query->update($this->getTableName())->where('id', $account)->set(['sendMailUnknownLogin' => $active ? 1 : 0]
+        )->execute();
+    }
+
 }

template/account/security.php

@@ -40,13 +40,17 @@
                     <div class="col-md-6">
                         <div class="mb-3">
                             <div class="form-check form-switch">
-                                <input class="form-check-input" type="checkbox" role="switch" id="sendLoginEmailCheck" name="sendLoginEmailCheck" checked>
+                                <input class="form-check-input" type="checkbox" role="switch" id="sendLoginEmailCheck" name="sendLoginEmailCheck"
+                                <?= $account['sendMailUnknownLogin'] === 1 ? 'checked' : '' ?>>
                                 <label class="form-check-label" for="sendLoginEmailCheck">
                                     <?= $this->e($this->translate('account-settings-security-general-send-login-information-mail')) ?>
                                 </label>
                             </div>
                         </div>
                     </div>
+                    <div class="col-md-6">
+                        <button type="submit" class="btn btn-primary float-end" name="securityBasicSettingsSave">Speichern</button>
+                    </div>
 
                 </form>
             </div>

translations/de.json

@@ -122,6 +122,7 @@
   "account-settings-security-two-factor-failed-unk": "Der 2. Faktor konnte nicht in deinem Konto hinterlegt werden.",
   "account-settings-security-two-factor-failed-code-invalid": "Dein angegebener Code ist nicht korrekt.",
   "account-settings-security-two-factor-success": "Der 2. Faktor wurde erfolgreich in deinem Konto hinterlegt.",
+  "account-settings-security-update-success": "Deine Sicherheitseinstellungen wurden aktualisiert.",
 
   "admin-navigation-general-tab-title": "Allgemein",
   "admin-navigation-general-tab-user-management-title": "Kontoverwaltung",