diff --git a/meta/definitions/email.php b/meta/definitions/email.php index 22901ab..508c168 100644 --- a/meta/definitions/email.php +++ b/meta/definitions/email.php @@ -4,12 +4,12 @@ use function DI\autowire, DI\create, DI\get; use TheBugs\Email\EmailConfiguration, TheBugs\Email\MailerInterface, - TheBugs\Email\SwiftMailer; + TheBugs\Email\SymfonyMailer; return [ EmailConfiguration::class => function($c) { $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP ); - $email->smtpHost = getenv('SMTP_HOST'); + $email->smtpHost = getenv('SMTP_HOSTNAME'); $email->smtpPort = getenv('SMTP_PORT'); $email->smtpUsername = getenv('SMTP_USERNAME'); $email->smtpPassword = getenv('SMTP_PASSWORD'); @@ -20,5 +20,5 @@ return [ return $email; }, - MailerInterface::class => autowire(SwiftMailer::class), + MailerInterface::class => autowire(SymfonyMailer::class), ]; diff --git a/skeleton/meta/config.php b/skeleton/meta/config.php index 99fbb40..68fd37f 100644 --- a/skeleton/meta/config.php +++ b/skeleton/meta/config.php @@ -17,6 +17,14 @@ return [ 'application_name' => "", ], + 'api' => [ + 'auth' => [ + 'type' => \CSLSJ\Api\AuthType::AUTH_HEADER_BASIC, + 'username' => getenv('CSSLSJ_API_USERNAME'), + 'password' => getenv('CSSLSJ_API_PASSWORD'), + ] + ], + 'ulmus' => [ 'connections' => [ 'default' => [ diff --git a/skeleton/meta/definitions/auth.php b/skeleton/meta/definitions/auth.php index c07a3d9..5b29ebe 100644 --- a/skeleton/meta/definitions/auth.php +++ b/skeleton/meta/definitions/auth.php @@ -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) { $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP ); - $email->smtpHost = getenv('SMTP_HOST'); + $email->smtpHost = getenv('SMTP_HOSTNAME'); $email->smtpPort = getenv('SMTP_PORT'); $email->smtpUsername = getenv('SMTP_USERNAME'); $email->smtpPassword = getenv('SMTP_PASSWORD');