mcndave
/
lean
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/lean

This commit is contained in:
Dave M. 2023-05-31 18:11:38 +00:00
parent 428e26fbfb e2d2ff72bb
commit 4404943f8b
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/definitions/email.php
View File

@ -4,12 +4,12 @@ use function DI\autowire, DI\create, DI\get;
use TheBugs\Email\EmailConfiguration, use TheBugs\Email\EmailConfiguration,
TheBugs\Email\MailerInterface, TheBugs\Email\MailerInterface,
TheBugs\Email\SwiftMailer; TheBugs\Email\SymfonyMailer;
return [ return [
EmailConfiguration::class => function($c) { EmailConfiguration::class => function($c) {
$email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP ); $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP );
$email->smtpHost = getenv('SMTP_HOST'); $email->smtpHost = getenv('SMTP_HOSTNAME');
$email->smtpPort = getenv('SMTP_PORT'); $email->smtpPort = getenv('SMTP_PORT');
$email->smtpUsername = getenv('SMTP_USERNAME'); $email->smtpUsername = getenv('SMTP_USERNAME');
$email->smtpPassword = getenv('SMTP_PASSWORD'); $email->smtpPassword = getenv('SMTP_PASSWORD');
@ -20,5 +20,5 @@ return [
return $email; return $email;
}, },
MailerInterface::class => autowire(SwiftMailer::class), MailerInterface::class => autowire(SymfonyMailer::class),
]; ];

8
skeleton/meta/config.php
View File

@ -17,6 +17,14 @@ return [
'application_name' => "", 'application_name' => "",
], ],
'api' => [
'auth' => [
'type' => \CSLSJ\Api\AuthType::AUTH_HEADER_BASIC,
'username' => getenv('CSSLSJ_API_USERNAME'),
'password' => getenv('CSSLSJ_API_PASSWORD'),
]
],
'ulmus' => [ 'ulmus' => [
'connections' => [ 'connections' => [
'default' => [ 'default' => [

6
skeleton/meta/definitions/auth.php
View File

@ -50,9 +50,13 @@ return [
}; };
}, },
CSLSJ\Api\Client::class => create(CSLSJ\Api\Client::class)->constructor(get('api.authentication'), getenv('CSSLSJ_API_URL')),
'api.authentication' => function ($c) { return $c->get('config')['api']['auth']; },
EmailConfiguration::class => function($c) { EmailConfiguration::class => function($c) {
$email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP ); $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP );
$email->smtpHost = getenv('SMTP_HOST'); $email->smtpHost = getenv('SMTP_HOSTNAME');
$email->smtpPort = getenv('SMTP_PORT'); $email->smtpPort = getenv('SMTP_PORT');
$email->smtpUsername = getenv('SMTP_USERNAME'); $email->smtpUsername = getenv('SMTP_USERNAME');
$email->smtpPassword = getenv('SMTP_PASSWORD'); $email->smtpPassword = getenv('SMTP_PASSWORD');