Fixes

Updated version to 6.0.0-preview-0320

Core/src/Umbrella.Utilities/Email/EmailAttachment.cs

@@ -8,6 +8,7 @@ namespace Umbrella.Utilities.Email;
 /// </summary>
 public class EmailAttachment : IDisposable
 {
+	private const string DefaultContentType = "application/octet-stream";
 	private bool _disposedValue;
 
 	/// <summary>
@@ -31,11 +32,11 @@ public class EmailAttachment : IDisposable
 	/// <param name="fileName">The file name.</param>
 	/// <param name="content">The content.</param>
 	/// <param name="contentType">The content type.</param>
-	public EmailAttachment(string fileName, Stream content, string contentType = "application/octet-stream")
+	public EmailAttachment(string fileName, Stream content, string? contentType)
 	{
 		FileName = fileName;
 		Content = content;
-		ContentType = contentType;
+		ContentType = contentType ?? DefaultContentType;
 	}
 
 	/// <summary>
@@ -44,11 +45,11 @@ public EmailAttachment(string fileName, Stream content, string contentType = "ap
 	/// <param name="fileName">The file name.</param>
 	/// <param name="content">The content.</param>
 	/// <param name="contentType">The content type.</param>
-	public EmailAttachment(string fileName, byte[] content, string contentType = "application/octet-stream")
+	public EmailAttachment(string fileName, byte[] content, string? contentType)
 	{
 		FileName = fileName;
 		Content = new MemoryStream(content);
-		ContentType = contentType;
+		ContentType = contentType ?? DefaultContentType;
 	}
 
 	/// <summary>

Core/src/Umbrella.Utilities/Mime/Abstractions/IMimeTypeUtility.cs

@@ -5,7 +5,12 @@
 /// </summary>
 public interface IMimeTypeUtility
 {
-	string? GetFileExtension(string mimeType);
+	/// <summary>
+	/// Gets the file extension for the specified mime type. If the extension cannot be identified then null will be returned.
+	/// </summary>
+	/// <param name="mimeType">The mime type.</param>
+	/// <returns>The file extension or null if the extension cannot be identified.</returns>
+	string? GetFileExtension(string? mimeType);
 
 	/// <summary>
 	/// Gets the MIME Type of the specified filename or extension.

Core/src/Umbrella.Utilities/Mime/MimeTypeUtility.cs

@@ -24,12 +24,7 @@ public MimeTypeUtility(ILogger<MimeTypeUtility> logger)
 		_logger = logger;
 	}
 
-	/// <summary>
-	/// Gets the MIME Type of the specified filename or extension.
-	/// If the extension cannot be identified then the default type of application/octet-stream will be returned.
-	/// </summary>
-	/// <param name="fileNameOrExtension">The file name or extension.</param>
-	/// <exception cref="UmbrellaException">Thrown if there is a problem identifying the mime type.</exception>
+	/// <inheritdoc />
 	public string GetMimeType(string fileNameOrExtension)
 	{
 		Guard.IsNotNullOrWhiteSpace(fileNameOrExtension);
@@ -72,19 +67,12 @@ public string GetMimeType(string fileNameOrExtension)
 		}
 	}
 
-	/// <summary>
-	/// Gets the file extension for the specified mime type. If the extension cannot be identified then null will be returned.
-	/// </summary>
-	/// <param name="mimeType">The mime type.</param>
-	/// <returns>The file extension or null if the extension cannot be identified.</returns>
-	/// <exception cref="UmbrellaException">Thrown if there is a problem identifying the file extension.</exception>
-	public string? GetFileExtension(string mimeType)
+	/// <inheritdoc />
+	public string? GetFileExtension(string? mimeType)
 	{
-		Guard.IsNotNullOrWhiteSpace(mimeType);
-
 		try
 		{
-			return MimeTypes.TryGetExtension(mimeType, out string? extension) ? extension : null;
+			return !string.IsNullOrWhiteSpace(mimeType) && MimeTypes.TryGetExtension(mimeType, out string? extension) ? extension : null;
 		}
 		catch (Exception exc) when (_logger.WriteError(exc, new { mimeType }))
 		{

Core/test/Umbrella.Utilities.Test/Mime/MimeTypeUtilityTest.cs

@@ -69,5 +69,40 @@ public void GetMimeType_FilenameWithPeriods()
 		Assert.Equal("image/png", mimeType);
 	}
 
+	[Fact]
+	public void GetFileExtension_Null()
+	{
+		string? fileExtension = CreateMimeTypeUtility().GetFileExtension(null);
+		Assert.Null(fileExtension);
+	}
+
+	[Fact]
+	public void GetFileExtension_Empty()
+	{
+		string? fileExtension = CreateMimeTypeUtility().GetFileExtension("");
+		Assert.Null(fileExtension);
+	}
+
+	[Fact]
+	public void GetFileExtension_Whitespace()
+	{
+		string? fileExtension = CreateMimeTypeUtility().GetFileExtension("    ");
+		Assert.Null(fileExtension);
+	}
+
+	[Fact]
+	public void GetFileExtension_Invalid()
+	{
+		string? fileExtension = CreateMimeTypeUtility().GetFileExtension("test");
+		Assert.Null(fileExtension);
+	}
+
+	[Fact]
+	public void GetFileExtension_Valid()
+	{
+		string? fileExtension = CreateMimeTypeUtility().GetFileExtension("image/png");
+		Assert.Equal(".png", fileExtension);
+	}
+
 	private static MimeTypeUtility CreateMimeTypeUtility() => new(new Mock<ILogger<MimeTypeUtility>>().Object);
 }

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>6.0.0-preview-0319</Version>
+		<Version>6.0.0-preview-0320</Version>
 
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>