From 6487b5f980aa8ea66e502474379df6709e7d6f9f Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Mon, 19 Aug 2024 15:06:09 +0900 Subject: [PATCH] Address Comments, update weird grammar, use correct redirect --- app/config/locale/translations/en.json | 4 +- app/controllers/api/account.php | 189 ++++++++++++------------- 2 files changed, 95 insertions(+), 98 deletions(-) diff --git a/app/config/locale/translations/en.json b/app/config/locale/translations/en.json index 9543f155b7..d4be577543 100644 --- a/app/config/locale/translations/en.json +++ b/app/config/locale/translations/en.json @@ -31,14 +31,14 @@ "emails.mfaChallenge.clientInfo": "This verification code was requested using {{b}}{{agentClient}}{{/b}} on {{b}}{{agentDevice}}{{/b}} {{b}}{{agentOs}}{{/b}}. If you didn't request the verification code, you can safely ignore this email.", "emails.mfaChallenge.thanks": "Thanks,", "emails.mfaChallenge.signature": "{{project}} team", - "emails.mfaEnabled.subject": "Two-factor authentication is enabled in your {{project}} account", + "emails.mfaEnabled.subject": "Two-factor authentication is enabled on your {{project}} account", "emails.mfaEnabled.hello": "Hello {{user}}", "emails.mfaEnabled.body": "Two-factor authentication has been successfully enabled for your {{project}} account.

Please make sure to store your security codes safely, so you can use them if you lose or can’t access your mobile device. Each recovery code can only be used once, but you can re-generate a new set of 6 codes at any time.", "emails.mfaEnabled.footer": "If you didn’t enable two-factor authentication, please contact us immediately.", "emails.mfaEnabled.thanks": "Thanks", "emails.mfaEnabled.signature": "{{project}} team", "emails.mfaEnabled.buttonText": "Visit your account", - "emails.mfaDisabled.subject": "Two-factor authentication is disabled in your {{project}} account", + "emails.mfaDisabled.subject": "Two-factor authentication is disabled on your {{project}} account", "emails.mfaDisabled.hello": "Hello {{user}}", "emails.mfaDisabled.body": "You've disabled two-factor authentication for your {{project}} account. You can always enable it again through your {{project}} account.", "emails.mfaDisabled.footer": "If you didn’t disable two-factor authentication, please contact us immediately.", diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 9e546c7d18..459e005a71 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -166,100 +166,6 @@ $createSession = function (string $userId, string $secret, Request $request, Res $response->dynamic($session, Response::MODEL_SESSION); }; -$sendMFAAlert = function (Document $project, Document $user, Locale $locale, Mail $queueForMails, string $type, string $redirect) { - $subject = $locale->getText("emails.{$type}.subject"); - $customTemplate = $project->getAttribute('templates', [])["email.{$type}-" . $locale->default] ?? []; - - // Appwrite Theming for Console - if ($project->getInternalId() === 'console') { - $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base-styled.tpl'); - $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-mfa-altered.tpl'); - - $body - ->setParam('{{buttonText}}', $locale->getText("emails.{$type}.buttonText")) - ->setParam('{{redirect}}', 'http://' . App::getEnv('_APP_DOMAIN') . '/console/account') - ->setParam('{{body}}', $locale->getText("emails.{$type}.body"), escapeHtml: false) - ->setParam('{{project}}', $project->getAttribute('name')) - ->setParam('{{user}}', $user->getAttribute('name')); - - $message->setParam('{{body}}', $body->render(), escapeHtml: false); - } else { - $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl'); - - $message->setParam('{{body}}', $locale->getText("emails.{$type}.body"), escapeHtml: false); - } - - $message - ->setParam('{{hello}}', $locale->getText("emails.{$type}.hello")) - ->setParam('{{footer}}', $locale->getText("emails.{$type}.footer")) - ->setParam('{{thanks}}', $locale->getText("emails.{$type}.thanks")) - ->setParam('{{signature}}', $locale->getText("emails.{$type}.signature")); - - $body = $message->render(); - - $smtp = $project->getAttribute('smtp', []); - $smtpEnabled = $smtp['enabled'] ?? false; - - $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM); - $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'); - $replyTo = ""; - - if ($smtpEnabled) { - if (!empty($smtp['senderEmail'])) { - $senderEmail = $smtp['senderEmail']; - } - if (!empty($smtp['senderName'])) { - $senderName = $smtp['senderName']; - } - if (!empty($smtp['replyTo'])) { - $replyTo = $smtp['replyTo']; - } - - $queueForMails - ->setSmtpHost($smtp['host'] ?? '') - ->setSmtpPort($smtp['port'] ?? '') - ->setSmtpUsername($smtp['username'] ?? '') - ->setSmtpPassword($smtp['password'] ?? '') - ->setSmtpSecure($smtp['secure'] ?? ''); - - if (!empty($customTemplate)) { - if (!empty($customTemplate['senderEmail'])) { - $senderEmail = $customTemplate['senderEmail']; - } - if (!empty($customTemplate['senderName'])) { - $senderName = $customTemplate['senderName']; - } - if (!empty($customTemplate['replyTo'])) { - $replyTo = $customTemplate['replyTo']; - } - - $body = $customTemplate['message'] ?? ''; - $subject = $customTemplate['subject'] ?? $subject; - } - - $queueForMails - ->setSmtpReplyTo($replyTo) - ->setSmtpSenderEmail($senderEmail) - ->setSmtpSenderName($senderName); - } - - $emailVariables = [ - 'owner' => $user->getAttribute('name'), - 'direction' => $locale->getText('settings.direction'), - 'user' => $user->getAttribute('name'), - 'project' => $project->getAttribute('name') - ]; - - $queueForMails - ->setSubject($subject) - ->setBody($body) - ->setRecipient($user->getAttribute('email')) - ->setName($user->getAttribute('name')) - ->setVariables($emailVariables) - ->trigger() - ; -}; - App::post('/v1/account') ->desc('Create account') ->groups(['api', 'account', 'auth']) @@ -3610,15 +3516,106 @@ App::patch('/v1/account/mfa') ->inject('dbForProject') ->inject('queueForEvents') ->inject('queueForMails') - ->action(function (bool $mfa, ?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Document $project, Document $session, Locale $locale, Database $dbForProject, Event $queueForEvents, Mail $queueForMails) use ($sendMFAAlert) { + ->action(function (bool $mfa, ?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Document $project, Document $session, Locale $locale, Database $dbForProject, Event $queueForEvents, Mail $queueForMails) { // If MFA Changes then we need to send a email if ($mfa !== $user->getAttribute('mfa')) { $domain = $request->getHostname(); $protocol = $request->getProtocol(); $redirect = $protocol . '://' . $domain . '/console/account'; + $type = $mfa ? 'mfaEnabled' : 'mfaDisabled'; - $sendMFAAlert($project, $user, $locale, $queueForMails, $mfa ? 'mfaEnabled' : 'mfaDisabled', $redirect); + $subject = $locale->getText("emails.{$type}.subject"); + $customTemplate = $project->getAttribute('templates', [])["email.{$type}-" . $locale->default] ?? []; + + // Appwrite Theming for Console + if ($project->getInternalId() === 'console') { + $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base-styled.tpl'); + $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-mfa-altered.tpl'); + + $body + ->setParam('{{buttonText}}', $locale->getText("emails.{$type}.buttonText")) + ->setParam('{{redirect}}', $redirect) + ->setParam('{{body}}', $locale->getText("emails.{$type}.body"), escapeHtml: false) + ->setParam('{{project}}', $project->getAttribute('name')) + ->setParam('{{user}}', $user->getAttribute('name')); + + $message->setParam('{{body}}', $body->render(), escapeHtml: false); + } else { + $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl'); + + $message->setParam('{{body}}', $locale->getText("emails.{$type}.body"), escapeHtml: false); + } + + $message + ->setParam('{{hello}}', $locale->getText("emails.{$type}.hello")) + ->setParam('{{footer}}', $locale->getText("emails.{$type}.footer")) + ->setParam('{{thanks}}', $locale->getText("emails.{$type}.thanks")) + ->setParam('{{signature}}', $locale->getText("emails.{$type}.signature")); + + $body = $message->render(); + + $smtp = $project->getAttribute('smtp', []); + $smtpEnabled = $smtp['enabled'] ?? false; + + $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM); + $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'); + $replyTo = ""; + + if ($smtpEnabled) { + if (!empty($smtp['senderEmail'])) { + $senderEmail = $smtp['senderEmail']; + } + if (!empty($smtp['senderName'])) { + $senderName = $smtp['senderName']; + } + if (!empty($smtp['replyTo'])) { + $replyTo = $smtp['replyTo']; + } + + $queueForMails + ->setSmtpHost($smtp['host'] ?? '') + ->setSmtpPort($smtp['port'] ?? '') + ->setSmtpUsername($smtp['username'] ?? '') + ->setSmtpPassword($smtp['password'] ?? '') + ->setSmtpSecure($smtp['secure'] ?? ''); + + if (!empty($customTemplate)) { + if (!empty($customTemplate['senderEmail'])) { + $senderEmail = $customTemplate['senderEmail']; + } + if (!empty($customTemplate['senderName'])) { + $senderName = $customTemplate['senderName']; + } + if (!empty($customTemplate['replyTo'])) { + $replyTo = $customTemplate['replyTo']; + } + + $body = $customTemplate['message'] ?? ''; + $subject = $customTemplate['subject'] ?? $subject; + } + + $queueForMails + ->setSmtpReplyTo($replyTo ?? '') + ->setSmtpSenderEmail($senderEmail ?? '') + ->setSmtpSenderName($senderName ?? ''); + } + + $emailVariables = [ + 'owner' => $user->getAttribute('name'), + 'direction' => $locale->getText('settings.direction'), + 'user' => $user->getAttribute('name'), + 'project' => $project->getAttribute('name') + ]; + + $queueForMails + ->setSubject($subject) + ->setBody($body) + ->setRecipient($user->getAttribute('email')) + ->setName($user->getAttribute('name')) + ->setVariables($emailVariables) + ->trigger() + ; } $user->setAttribute('mfa', $mfa);