diff options
Diffstat (limited to 'lib/Emails.Transactional.Plugin')
-rw-r--r-- | lib/Emails.Transactional.Plugin/src/Api Endpoints/SendEndpoint.cs | 15 | ||||
-rw-r--r-- | lib/Emails.Transactional.Plugin/src/Transactions/TransactionStore.cs | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/Emails.Transactional.Plugin/src/Api Endpoints/SendEndpoint.cs b/lib/Emails.Transactional.Plugin/src/Api Endpoints/SendEndpoint.cs index e5ca88b..16c0d9a 100644 --- a/lib/Emails.Transactional.Plugin/src/Api Endpoints/SendEndpoint.cs +++ b/lib/Emails.Transactional.Plugin/src/Api Endpoints/SendEndpoint.cs @@ -112,9 +112,12 @@ namespace Emails.Transactional.Endpoints //Load SMTP _ = plugin.ObserveWork(async () => { - using SecretResult? password = await plugin.TryGetSecretAsync("smtp_password") ?? throw new KeyNotFoundException("Missing required 'smtp_password' in secrets"); + //Get the password from the secret store + string password = await plugin.GetSecretAsync("smtp_password").ToLazy(static r => r.Result.ToString()); + //Copy the secre to the network credential - NetworkCredential cred = new(username, password.Result.ToString()); + NetworkCredential cred = new(username, password); + //Init email service EmailService = new(serverUri, cred, timeout); }); @@ -130,13 +133,11 @@ namespace Emails.Transactional.Endpoints //Load the client when the secret finishes loading _ = plugin.ObserveWork(async () => { - using SecretResult? secret = await plugin.TryGetSecretAsync("s3_secret") ?? throw new KeyNotFoundException("Missing required s3 client secret in config"); - + string s3Secret = await plugin.GetSecretAsync("s3_secret").ToLazy(static r => r.Result.ToString()); Client.WithEndpoint(S3Config.ServerAddress) - .WithCredentials(S3Config.ClientId, secret.Result.ToString()); - - Client.WithSSL(S3Config.UseSsl.HasValue && S3Config.UseSsl.Value); + .WithCredentials(S3Config.ClientId, s3Secret) + .WithSSL(S3Config.UseSsl.HasValue && S3Config.UseSsl.Value); //Accept optional region if (!string.IsNullOrWhiteSpace(S3Config.Region)) diff --git a/lib/Emails.Transactional.Plugin/src/Transactions/TransactionStore.cs b/lib/Emails.Transactional.Plugin/src/Transactions/TransactionStore.cs index a6bd4b9..47db7b1 100644 --- a/lib/Emails.Transactional.Plugin/src/Transactions/TransactionStore.cs +++ b/lib/Emails.Transactional.Plugin/src/Transactions/TransactionStore.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Vaughn Nugent +* Copyright (c) 2023 Vaughn Nugent * * Library: VNLib * Package: Transactional Emails |