Minor refactorings and dependencies updates

basicondoadmin · basicondoadmin · commit 17047521689d · 2024-02-27T11:21:14.000-03:00
diff --git a/FluentEmail.MailerSend.Tests/FluentEmail.MailerSend.Tests.csproj b/FluentEmail.MailerSend.Tests/FluentEmail.MailerSend.Tests.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/FluentEmail.MailerSend.Tests/MailerSendSenderTests.cs b/FluentEmail.MailerSend.Tests/MailerSendSenderTests.cs
@@ -19,7 +19,7 @@ public async void SendEmailTest()
                 .Body("<html><body><h1>Test</h1><p>Greetings from the team, you got this message through MailerSend.</p></body></html>", true)
                 .Tag("test_tag")
                 .SendAsync()
-                .ConfigureAwait(false);
+                .ConfigureAwait(true);
 
         response.MessageId.Should().BeEmpty();
         response.ErrorMessages.Should().BeEmpty();
diff --git a/FluentEmail.MailerSend/FluentEmail.MailerSend.csproj b/FluentEmail.MailerSend/FluentEmail.MailerSend.csproj
@@ -9,7 +9,7 @@
 		<Authors>Marco Ribeiro</Authors>
 		<Company />
 		<PackageId>FluentEmail.MailerSend</PackageId>
-		<PackageVersion>1.0.0</PackageVersion>
+		<PackageVersion>1.0.1</PackageVersion>
 		<PackageTags>mailersend;email;razor;liquid;fluent;fluentemail</PackageTags>
 		<PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>
 	</PropertyGroup>
diff --git a/FluentEmail.MailerSend/FluentEmailMailerSendBuilderExtensions.cs b/FluentEmail.MailerSend/FluentEmailMailerSendBuilderExtensions.cs
@@ -2,13 +2,13 @@
 using FluentEmail.MailerSend;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
-using System.Collections.Generic;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class FluentEmailMailerSendBuilderExtensions
     {
-        public static FluentEmailServicesBuilder AddMailerSendSender(this FluentEmailServicesBuilder builder, string apiToken, Action<MailerSendOptions>? options = null)
+        public static FluentEmailServicesBuilder AddMailerSendSender(this FluentEmailServicesBuilder builder,
+            string apiToken, Action<MailerSendOptions>? options = null)
         {
             builder.Services.TryAdd(ServiceDescriptor.Scoped<ISender>(_ => new MailerSendSender(apiToken, options)));
             return builder;
diff --git a/FluentEmail.MailerSend/MailerSendSender.cs b/FluentEmail.MailerSend/MailerSendSender.cs
@@ -20,16 +20,15 @@ public class MailerSendSender : ISender
         private const string _emailEndPoint = "email";
 
         private readonly HttpClient _httpClient;
-        private readonly string _apiKey;
         private readonly MailerSendOptions _options = new MailerSendOptions();
 
         public MailerSendSender(string apiKey, Action<MailerSendOptions>? options = null)
         {
-            _apiKey = apiKey ?? throw new ArgumentNullException(nameof(apiKey));
+            var apiKey1 = apiKey ?? throw new ArgumentNullException(nameof(apiKey));
             options?.Invoke(_options);
 
             _httpClient = new HttpClient { BaseAddress = new Uri(_baseAddress) };
-            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _apiKey);
+            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", apiKey1);
         }
 
         public SendResponse Send(IFluentEmail email, CancellationToken? token = null)
diff --git a/FluentEmail.MailerSend/Utils/StringExtensions.cs b/FluentEmail.MailerSend/Utils/StringExtensions.cs
@@ -6,7 +6,7 @@ internal static class StringExtensions
     {
         public static string ToSnakeCase(this string str)
         {
-            return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();
+            return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x : x.ToString())).ToLower();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`	`using FluentEmail.MailerSend;`
`3`	`3`	`using Microsoft.Extensions.DependencyInjection.Extensions;`
`4`	`4`	`using System;`
`5`		`-using System.Collections.Generic;`
`6`	`5`
`7`	`6`	`namespace Microsoft.Extensions.DependencyInjection`
`8`	`7`	`{`
`9`	`8`	`public static class FluentEmailMailerSendBuilderExtensions`
`10`	`9`	`{`
`11`		`- public static FluentEmailServicesBuilder AddMailerSendSender(this FluentEmailServicesBuilder builder, string apiToken, Action<MailerSendOptions>? options = null)`
	`10`	`+ public static FluentEmailServicesBuilder AddMailerSendSender(this FluentEmailServicesBuilder builder,`
	`11`	`+ string apiToken, Action<MailerSendOptions>? options = null)`
`12`	`12`	`{`
`13`	`13`	`builder.Services.TryAdd(ServiceDescriptor.Scoped<ISender>(_ => new MailerSendSender(apiToken, options)));`
`14`	`14`	`return builder;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ internal static class StringExtensions`
`6`	`6`	`{`
`7`	`7`	`public static string ToSnakeCase(this string str)`
`8`	`8`	`{`
`9`		`- return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();`
	`9`	`+ return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x : x.ToString())).ToLower();`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`