Continue work
This commit is contained in:
parent
596e59f2cc
commit
608b6b3847
5 changed files with 109 additions and 53 deletions
13
app/config/locale/templates/email-stock-body.tpl
Normal file
13
app/config/locale/templates/email-stock-body.tpl
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
<p>{{hello}}</p>
|
||||||
|
|
||||||
|
<p>{{body}}</p>
|
||||||
|
|
||||||
|
<a href="{{redirect}}" target="_blank">{{redirect}}</a>
|
||||||
|
|
||||||
|
<p><br />{{footer}}</p>
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<p>{{thanks}}
|
||||||
|
<br />
|
||||||
|
{{signature}}
|
||||||
|
</p>
|
|
@ -1114,26 +1114,26 @@ App::post('/v1/account/sessions/magic-url')
|
||||||
->setSmtpSenderName($customTemplate['senderName'] ?? '');
|
->setSmtpSenderName($customTemplate['senderName'] ?? '');
|
||||||
}
|
}
|
||||||
|
|
||||||
$body
|
$emailVariables = [
|
||||||
->setParam('{{subject}}', $subject)
|
'subject' => $subject,
|
||||||
->setParam('{{hello}}', $locale->getText("emails.magicSession.hello"))
|
'hello' => $locale->getText("emails.magicSession.hello"),
|
||||||
->setParam('{{name}}', '')
|
'name' => '',
|
||||||
->setParam('{{body}}', $locale->getText("emails.magicSession.body"))
|
'body' => $locale->getText("emails.magicSession.body"),
|
||||||
->setParam('{{redirect}}', $url)
|
'redirect' => $url,
|
||||||
->setParam('{{footer}}', $locale->getText("emails.magicSession.footer"))
|
'footer' => $locale->getText("emails.magicSession.footer"),
|
||||||
->setParam('{{thanks}}', $locale->getText("emails.magicSession.thanks"))
|
'thanks' => $locale->getText("emails.magicSession.thanks"),
|
||||||
->setParam('{{signature}}', $locale->getText("emails.magicSession.signature"))
|
'signature' => $locale->getText("emails.magicSession.signature"),
|
||||||
->setParam('{{project}}', $project->getAttribute('name'))
|
'project' => $project->getAttribute('name'),
|
||||||
->setParam('{{direction}}', $locale->getText('settings.direction'))
|
'direction' => $locale->getText('settings.direction'),
|
||||||
->setParam('{{bg-body}}', '#f7f7f7')
|
'bg-body' => '#f7f7f7',
|
||||||
->setParam('{{bg-content}}', '#ffffff')
|
'bg-content' => '#ffffff',
|
||||||
->setParam('{{text-content}}', '#000000');
|
'text-content' => '#000000',
|
||||||
|
];
|
||||||
$body = $body->render();
|
|
||||||
|
|
||||||
$mails
|
$mails
|
||||||
->setSubject($subject)
|
->setSubject($subject)
|
||||||
->setBody($body)
|
->setBody($body->render())
|
||||||
|
->setVariables($emailVariables)
|
||||||
->setFrom($from)
|
->setFrom($from)
|
||||||
->setRecipient($user->getAttribute('email'))
|
->setRecipient($user->getAttribute('email'))
|
||||||
->trigger()
|
->trigger()
|
||||||
|
@ -2519,13 +2519,13 @@ App::post('/v1/account/recovery')
|
||||||
|
|
||||||
$projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
|
$projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
|
||||||
$from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
|
$from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
|
||||||
$body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
|
$body = $locale->getText("emails.recovery.body");
|
||||||
$subject = $locale->getText("emails.recovery.subject");
|
$subject = $locale->getText("emails.recovery.subject");
|
||||||
|
|
||||||
$smtpEnabled = $project->getAttribute('smtp', [])['enabled'] ?? false;
|
$smtpEnabled = $project->getAttribute('smtp', [])['enabled'] ?? false;
|
||||||
$customTemplate = $project->getAttribute('templates', [])['email.recovery-' . $locale->default] ?? [];
|
$customTemplate = $project->getAttribute('templates', [])['email.recovery-' . $locale->default] ?? [];
|
||||||
if ($smtpEnabled && !empty($customTemplate)) {
|
if ($smtpEnabled && !empty($customTemplate)) {
|
||||||
$body = Template::fromString($customTemplate['message'] ?? '');
|
$body = $customTemplate['message'];
|
||||||
$subject = $customTemplate['subject'] ?? $subject;
|
$subject = $customTemplate['subject'] ?? $subject;
|
||||||
$from = $customTemplate['senderName'] ?? $from;
|
$from = $customTemplate['senderName'] ?? $from;
|
||||||
|
|
||||||
|
@ -2541,28 +2541,45 @@ App::post('/v1/account/recovery')
|
||||||
->setSmtpSenderName($customTemplate['senderName'] ?? '');
|
->setSmtpSenderName($customTemplate['senderName'] ?? '');
|
||||||
}
|
}
|
||||||
|
|
||||||
$body
|
// $body
|
||||||
->setParam('{{subject}}', $subject)
|
// ->setParam('{{subject}}', $subject)
|
||||||
->setParam('{{hello}}', $locale->getText("emails.recovery.hello"))
|
// ->setParam('{{hello}}', $locale->getText("emails.recovery.hello"))
|
||||||
->setParam('{{name}}', $profile->getAttribute('name'))
|
// ->setParam('{{name}}', $profile->getAttribute('name'))
|
||||||
->setParam('{{body}}', $locale->getText("emails.recovery.body"))
|
// ->setParam('{{body}}', $locale->getText("emails.recovery.body"))
|
||||||
->setParam('{{redirect}}', $url)
|
// ->setParam('{{redirect}}', $url)
|
||||||
->setParam('{{footer}}', $locale->getText("emails.recovery.footer"))
|
// ->setParam('{{footer}}', $locale->getText("emails.recovery.footer"))
|
||||||
->setParam('{{thanks}}', $locale->getText("emails.recovery.thanks"))
|
// ->setParam('{{thanks}}', $locale->getText("emails.recovery.thanks"))
|
||||||
->setParam('{{signature}}', $locale->getText("emails.recovery.signature"))
|
// ->setParam('{{signature}}', $locale->getText("emails.recovery.signature"))
|
||||||
->setParam('{{project}}', $projectName)
|
// ->setParam('{{project}}', $projectName)
|
||||||
->setParam('{{direction}}', $locale->getText('settings.direction'))
|
// ->setParam('{{direction}}', $locale->getText('settings.direction'))
|
||||||
->setParam('{{bg-body}}', '#f7f7f7')
|
// ->setParam('{{bg-body}}', '#f7f7f7')
|
||||||
->setParam('{{bg-content}}', '#ffffff')
|
// ->setParam('{{bg-content}}', '#ffffff')
|
||||||
->setParam('{{text-content}}', '#000000');
|
// ->setParam('{{text-content}}', '#000000');
|
||||||
|
|
||||||
$body = $body->render();
|
// $body = $body->render();
|
||||||
|
|
||||||
|
$emailVariables = [
|
||||||
|
'subject' => $subject,
|
||||||
|
'hello' => $locale->getText("emails.recovery.hello"),
|
||||||
|
'name' => $profile->getAttribute('name'),
|
||||||
|
'body' => $locale->getText("emails.recovery.body"),
|
||||||
|
'redirect' => $url,
|
||||||
|
'footer' => $locale->getText("emails.recovery.footer"),
|
||||||
|
'thanks' => $locale->getText("emails.recovery.thanks"),
|
||||||
|
'signature' => $locale->getText("emails.recovery.signature"),
|
||||||
|
'project' => $projectName,
|
||||||
|
'direction' => $locale->getText('settings.direction'),
|
||||||
|
'bg-body' => '#f7f7f7',
|
||||||
|
'bg-content' => '#ffffff',
|
||||||
|
'text-content' => '#000000',
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
$mails
|
$mails
|
||||||
->setRecipient($profile->getAttribute('email', ''))
|
->setRecipient($profile->getAttribute('email', ''))
|
||||||
->setName($profile->getAttribute('name'))
|
->setName($profile->getAttribute('name'))
|
||||||
->setBody($body)
|
->setBody($body)
|
||||||
|
->setVariables($emailVariables)
|
||||||
->setFrom($from)
|
->setFrom($from)
|
||||||
->setSubject($subject)
|
->setSubject($subject)
|
||||||
->trigger();
|
->trigger();
|
||||||
|
|
|
@ -1525,11 +1525,11 @@ App::patch('/v1/projects/:projectId/smtp')
|
||||||
->label('sdk.response.model', Response::MODEL_PROJECT)
|
->label('sdk.response.model', Response::MODEL_PROJECT)
|
||||||
->param('projectId', '', new UID(), 'Project unique ID.')
|
->param('projectId', '', new UID(), 'Project unique ID.')
|
||||||
->param('enabled', false, new Boolean(), 'Enable custom SMTP service')
|
->param('enabled', false, new Boolean(), 'Enable custom SMTP service')
|
||||||
->param('sender', '', new Email(), 'SMTP sender email')
|
->param('sender', '', new Email(), 'SMTP sender email', true)
|
||||||
->param('host', '', new HostName(), 'SMTP server host name')
|
->param('host', '', new HostName(), 'SMTP server host name', true)
|
||||||
->param('port', null, new Integer(), 'SMTP server port')
|
->param('port', null, new Integer(), 'SMTP server port', true)
|
||||||
->param('username', null, new Text(0), 'SMTP server username')
|
->param('username', null, new Text(0, 0), 'SMTP server username', true)
|
||||||
->param('password', null, new Text(0), 'SMTP server password')
|
->param('password', null, new Text(0, 0), 'SMTP server password', true)
|
||||||
->param('secure', '', new WhiteList(['tls'], true), 'Does SMTP server use secure connection', true)
|
->param('secure', '', new WhiteList(['tls'], true), 'Does SMTP server use secure connection', true)
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->inject('dbForConsole')
|
->inject('dbForConsole')
|
||||||
|
@ -1645,19 +1645,7 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
|
||||||
|
|
||||||
$localeObj = new Locale($locale);
|
$localeObj = new Locale($locale);
|
||||||
if (is_null($template)) {
|
if (is_null($template)) {
|
||||||
$message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
|
$message = $localeObj->getText("emails.{$type}.body");
|
||||||
$message = $message
|
|
||||||
->setParam('{{hello}}', $localeObj->getText("emails.{$type}.hello"))
|
|
||||||
->setParam('{{name}}', '')
|
|
||||||
->setParam('{{body}}', $localeObj->getText("emails.{$type}.body"))
|
|
||||||
->setParam('{{footer}}', $localeObj->getText("emails.{$type}.footer"))
|
|
||||||
->setParam('{{thanks}}', $localeObj->getText("emails.{$type}.thanks"))
|
|
||||||
->setParam('{{signature}}', $localeObj->getText("emails.{$type}.signature"))
|
|
||||||
->setParam('{{direction}}', $localeObj->getText('settings.direction'))
|
|
||||||
->setParam('{{bg-body}}', '#f7f7f7')
|
|
||||||
->setParam('{{bg-content}}', '#ffffff')
|
|
||||||
->setParam('{{text-content}}', '#000000')
|
|
||||||
->render();
|
|
||||||
|
|
||||||
$from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($localeObj->getText('emails.sender'), $project->getAttribute('name'));
|
$from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($localeObj->getText('emails.sender'), $project->getAttribute('name'));
|
||||||
$from = empty($from) ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server')) : $from;
|
$from = empty($from) ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server')) : $from;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Appwrite\Resque\Worker;
|
use Appwrite\Resque\Worker;
|
||||||
|
use Appwrite\Template\Template;
|
||||||
use Utopia\App;
|
use Utopia\App;
|
||||||
use Utopia\CLI\Console;
|
use Utopia\CLI\Console;
|
||||||
use PHPMailer\PHPMailer\PHPMailer;
|
use PHPMailer\PHPMailer\PHPMailer;
|
||||||
|
@ -32,13 +33,26 @@ class MailsV1 extends Worker
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$recipient = $this->args['recipient'];
|
$recipient = $this->args['recipient'];
|
||||||
$subject = $this->args['subject'];
|
$subject = $this->args['subject'];
|
||||||
$name = $this->args['name'];
|
$name = $this->args['name'];
|
||||||
$body = $this->args['body'];
|
$body = $this->args['body'];
|
||||||
|
$variables = $this->args['variables'];
|
||||||
$from = $this->args['from'];
|
$from = $this->args['from'];
|
||||||
|
|
||||||
|
$body = Template::fromFile(__DIR__ . '/../config/locale/templates/email-base.tpl');
|
||||||
|
|
||||||
|
foreach ($variables as $key => $value) {
|
||||||
|
var_dump($key, $value);
|
||||||
|
$body->setParam('{{'.$key.'}}', $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
var_dump($body);
|
||||||
|
|
||||||
|
$body = $body->render();
|
||||||
|
|
||||||
|
var_dump($body);
|
||||||
|
|
||||||
/** @var \PHPMailer\PHPMailer\PHPMailer $mail */
|
/** @var \PHPMailer\PHPMailer\PHPMailer $mail */
|
||||||
$mail = empty($smtp) ? $register->get('smtp') : $this->getMailer($smtp);
|
$mail = empty($smtp) ? $register->get('smtp') : $this->getMailer($smtp);
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ class Mail extends Event
|
||||||
protected string $subject = '';
|
protected string $subject = '';
|
||||||
protected string $body = '';
|
protected string $body = '';
|
||||||
protected array $smtp = [];
|
protected array $smtp = [];
|
||||||
|
protected array $variables = [];
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
@ -310,6 +311,28 @@ class Mail extends Event
|
||||||
return $this->smtp['replyTo'] ?? '';
|
return $this->smtp['replyTo'] ?? '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get Email Variables
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getVariables(): array
|
||||||
|
{
|
||||||
|
return $this->variables;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set Email Variables
|
||||||
|
*
|
||||||
|
* @param array $variables
|
||||||
|
* @return self
|
||||||
|
*/
|
||||||
|
public function setVariables(array $variables): self
|
||||||
|
{
|
||||||
|
$this->variables = $variables;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes the event and sends it to the mails worker.
|
* Executes the event and sends it to the mails worker.
|
||||||
*
|
*
|
||||||
|
@ -325,6 +348,7 @@ class Mail extends Event
|
||||||
'subject' => $this->subject,
|
'subject' => $this->subject,
|
||||||
'body' => $this->body,
|
'body' => $this->body,
|
||||||
'smtp' => $this->smtp,
|
'smtp' => $this->smtp,
|
||||||
|
'variables' => $this->variables,
|
||||||
'events' => Event::generateEvents($this->getEvent(), $this->getParams())
|
'events' => Event::generateEvents($this->getEvent(), $this->getParams())
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue