Debugging password

Frends.SMTP.SendEmail/CHANGELOG.md

@@ -1,11 +1,19 @@
 # Changelog
+
+## [1.1.0] - 2023-11-29
+### Fixed
+- Fixed issue with the attachments can't be given as expression
+
 ## [1.0.3] - 2023-11-03
+### Added
 - Fix missing XML comments.
 
 ## [1.0.2] - 2023-11-03
+### Added
 - Fix bug #20 - Missing Frends tasks metadata file
 
 ## [1.0.1] - 2023-05-15
+### Fixed
 - Fix bug #14 - NullReferenceException when field with 'Expression' type is empty
 
 ## [1.0.0] - 2022-02-09

Frends.SMTP.SendEmail/Frends.Smtp.SendEmail.Tests/SendEmailTests.cs

@@ -1,21 +1,19 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Frends.SMTP.SendEmail.Definitions;
 
 namespace Frends.SMTP.SendEmail.Tests
 {
-    /// <summary>
-    /// NOTE: To run these unit tests, you need an SMTP test server. Fill in the properties below with your values.
-    /// </summary>
     [TestFixture]
     public class SendEmailTests
     {
         // ****************************************** FILL THESE ******************************************************
-        private const string USERNAME = "apikey";
-        private const string PASSWORD = "";
-        private const string SMTPADDRESS = "smtp.sendgrid.net";
-        private const string TOEMAILADDRESS = "jefim.borissov@hiq.fi";
-        private const string FROMEMAILADDRESS = "jefim.borissov@hiq.fi";
+        private static readonly string USERNAME = "apikey"; // Environment.GetEnvironmentVariable("Frends_SMTP_Username");
+        private static readonly string PASSWORD = Environment.GetEnvironmentVariable("SMTP_PASSWORD"); // Environment.GetEnvironmentVariable("Frends_SMTP_Password");
+        private static readonly string SMTPADDRESS = "smtp.sendgrid.net"; // Environment.GetEnvironmentVariable("Frends_SMTP_Address");
+        private static readonly string TOEMAILADDRESS = "jefim.borissov@hiq.fi"; // Environment.GetEnvironmentVariable("Frends_SMTP_Email");
+        private static readonly string FROMEMAILADDRESS = "jefim.borissov@hiq.fi"; // Environment.GetEnvironmentVariable("Frends_SMTP_Email");
         private const int PORT = 587;
         private const bool USESSL = true;
         private const bool USEWINDOWSAUTHENTICATION = false;
@@ -71,12 +69,10 @@ public void EmailTestSetup()
                 MessageEncoding = "utf-8"
             };
 
-            var passwordFromEnvironment = Environment.GetEnvironmentVariable("SMTP_PASSWORD");
-
             _options = new Options()
             {
                 UserName = USERNAME,
-                Password = string.IsNullOrWhiteSpace(passwordFromEnvironment) ? PASSWORD : passwordFromEnvironment,
+                Password = PASSWORD,
                 SMTPServer = SMTPADDRESS,
                 Port = PORT,
                 UseSsl = USESSL,
@@ -97,7 +93,7 @@ public void SendEmailWithPlainText()
             var input = _input;
             input.Subject = "Email test - PlainText";
 
-            var result = SMTP.SendEmail(input, null, _options, new System.Threading.CancellationToken());
+            var result = SMTP.SendEmail(input, null, _options, default);
             Assert.IsTrue(result.EmailSent);
         }
 
@@ -109,15 +105,16 @@ public void SendEmailWithFileAttachment()
 
             var attachment = new Attachment
             {
+                AttachmentType = AttachmentType.FileAttachment,
                 FilePath = _filepath,
                 SendIfNoAttachmentsFound = false,
                 ThrowExceptionIfAttachmentNotFound = true
             };
 
 
-            var Attachments = new Attachment[] { attachment };
+            var Attachments = new AttachmentOptions { Attachments = new Attachment[] { attachment } };
 
-            var result = SMTP.SendEmail(input, Attachments, _options, new System.Threading.CancellationToken());
+            var result = SMTP.SendEmail(input, Attachments, _options, default);
             Assert.IsTrue(result.EmailSent);
         }
 
@@ -132,9 +129,9 @@ public void SendEmailWithStringAttachment()
                 AttachmentType = AttachmentType.AttachmentFromString,
                 stringAttachment = fileAttachment
             };
-            var Attachments = new Attachment[] { attachment };
+            var Attachments = new AttachmentOptions { Attachments = new Attachment[] { attachment } };
 
-            var result = SMTP.SendEmail(input, Attachments, _options, new System.Threading.CancellationToken());
+            var result = SMTP.SendEmail(input, Attachments, _options, default);
             Assert.IsTrue(result.EmailSent);
         }
 
@@ -152,9 +149,9 @@ public void TrySendingEmailWithNoFileAttachmentFound()
             };
 
 
-            var Attachments = new Attachment[] { attachment };
+            var Attachments = new AttachmentOptions { Attachments = new Attachment[] { attachment } };
 
-            var result = SMTP.SendEmail(input, Attachments, _options, new System.Threading.CancellationToken());
+            var result = SMTP.SendEmail(input, Attachments, _options, default);
             Assert.IsFalse(result.EmailSent);
         }
 
@@ -172,9 +169,9 @@ public void TrySendingEmailWithNoCcAndBcc()
             };
 
 
-            var Attachments = new Attachment[] { attachment };
+            var Attachments = new AttachmentOptions { Attachments = new Attachment[] { attachment } };
 
-            var result = SMTP.SendEmail(input, Attachments, _options, new System.Threading.CancellationToken());
+            var result = SMTP.SendEmail(input, Attachments, _options, default);
             Assert.IsFalse(result.EmailSent);
         }
 
@@ -192,9 +189,9 @@ public void TrySendingEmailWithNoFileAttachmentFoundException()
             };
 
 
-            var Attachments = new Attachment[] { attachment };
+            var Attachments = new AttachmentOptions { Attachments = new Attachment[] { attachment } };
 
-            Assert.Throws<FileNotFoundException>(() => SMTP.SendEmail(input, Attachments, _options, new System.Threading.CancellationToken()));
+            Assert.Throws<FileNotFoundException>(() => SMTP.SendEmail(input, Attachments, _options, default));
 
         }
     }

Frends.SMTP.SendEmail/Frends.Smtp.SendEmail/Definitions/Attachment.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace Frends.SMTP.SendEmail.Definitions
+{
+    /// <summary>
+    /// Attachment
+    /// </summary>
+    public class Attachment
+    {
+        /// <summary>
+        /// Chooses if the attachment file is created from a string or copied from disk.
+        /// </summary>
+        public AttachmentType AttachmentType { get; set; }
+
+        /// <summary>
+        /// Attachment from string.
+        /// </summary>
+        [UIHint(nameof(AttachmentType), "", AttachmentType.AttachmentFromString)]
+        public AttachmentFromString stringAttachment { get; set; }
+
+        /// <summary>
+        /// Attachment file's path. Uses Directory.GetFiles(string, string) as a pattern matching technique. See https://msdn.microsoft.com/en-us/library/wz42302f(v=vs.110).aspx.
+        /// Exception: If the path ends in a directory, all files in that folder are added as attachments.
+        /// </summary>
+        [DefaultValue("\"\"")]
+        [UIHint(nameof(AttachmentType), "", AttachmentType.FileAttachment)]
+        public string FilePath { get; set; }
+
+        /// <summary>
+        /// If set true and no files match the given path, an exception is thrown.
+        /// </summary>
+        [UIHint(nameof(AttachmentType), "", AttachmentType.FileAttachment)]
+        public bool ThrowExceptionIfAttachmentNotFound { get; set; }
+
+        /// <summary>
+        /// If set true and no files match the given path, email will be sent nevertheless.
+        /// </summary>
+        [UIHint(nameof(AttachmentType), "", AttachmentType.FileAttachment)]
+        public bool SendIfNoAttachmentsFound { get; set; }
+    }
+}