Added DocFX

CHANGELOG.md

@@ -7,7 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-_No changes yet_
+### Added
+
+- `Validation` utility class for specifications as MSISDN
+- Docs rendering using DocFX
+
+### Changed
+
+- Channel implementations (SMS, WhatsApp, ...) are extensions to the `ILinkMobilityClient` interface.
+- Reorganized namespaces to reflect parts of the API
+
+### Removed
+
+- `IQueryParameter` as no usage on API docs found (for now)
+
 
 ## [v0.1.1] - 2026-03-13
 

README.md

@@ -10,11 +10,11 @@ So I decided to implement the current available API myself with a more modern (a
 
 ---
 
-Published under [MIT License] (see [**tl;dr**Legal])
+Published under [MIT License] (see [choose a license])
 
 
 [LINK Mobility REST API]: https://developer.linkmobility.eu/
 [outdated repository]: https://github.com/websms-com/websmscom-csharp
 [.NET Standard 2.0]: https://learn.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-standard-2-0
 [MIT License]: LICENSE.txt
-[**tl;dr**Legal]: https://www.tldrlegal.com/license/mit-license
+[choose a license]: https://choosealicense.com/licenses/mit/

docs/docfx.json

@@ -0,0 +1,61 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dotnet/docfx/main/schemas/docfx.schema.json",
+  "metadata": [
+    {
+      "src": [
+        {
+          "src": "../",
+          "files": [
+            "src/LinkMobility/bin/Release/netstandard2.0/amwd-linkmobility.dll"
+          ]
+        }
+      ],
+      "dest": "api",
+      "outputFormat": "apiPage"
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "files": [ "**/*.{md,yml}" ],
+        "exclude": [ "_site/**", "obj/**" ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [ "images/**" ],
+        "exclude": [ "_site/**", "obj/**" ]
+      }
+    ],
+    "output": "_site",
+    "template": [ "default", "modern", "templates/amwd" ],
+    "postProcessors": ["ExtractSearchIndex"],
+    "globalMetadata": {
+      "_appName": "LINK Mobility REST API for .NET",
+      "_appTitle": "LINK Mobility REST API for .NET",
+      "_appFooter": "<span>&copy; AM.WD &mdash; Docs generated using <a href=\"https://dotnet.github.io/docfx\" target=\"_blank\">docfx</a>.</span>",
+      "_appLogoPath": "images/icon.png",
+      "_appFaviconPath": "images/favicon.ico",
+      "_disableBreadcrumb": true,
+      "_disableContribution": true,
+      "_enableSearch": true,
+      "_enableNewTab": true,
+      "pdf": false
+    },
+    "markdownEngineName": "markdig",
+    "markdownEngineProperties": {
+      "alerts": {
+        "TODO": "alert alert-secondary"
+      }
+    },
+    "sitemap": {
+      "baseUrl": "https://docs.am-wd.de/linkmobility",
+      "priority": 0.5,
+      "changefreq": "weekly"
+    },
+    "noLangKeyword": false,
+    "keepFileLink": false,
+    "cleanupCacheHistory": false,
+    "disableGitFeatures": true
+  }
+}

docs/index.md

@@ -0,0 +1,22 @@
+---
+_layout: landing
+---
+
+# LINK Mobility API
+
+[LINK Mobility] is a company specialized in customer communication.
+
+The available channels are SMS, RCS and WhatsApp Business.
+
+## NuGet packages
+
+Here is an overview of the latest package.
+
+| Package URL | Version | Short Description |
+|-------------|---------|-------------------|
+| [AMWD.Net.Api.LinkMobility] | ![NuGet Version](https://img.shields.io/nuget/v/AMWD.Net.Api.LinkMobility?style=flat-square&logo=nuget) | Package contains the interfaces to handle the API. |
+
+
+
+[LINK Mobility]: https://linkmobility.eu
+[AMWD.Net.Api.LinkMobility]: https://www.nuget.org/packages/AMWD.Net.Api.LinkMobility

docs/templates/amwd/public/main.css

@@ -0,0 +1,3 @@
+#logo {
+	margin-right: 8px;
+}

docs/toc.yml

@@ -0,0 +1,4 @@
+- name: API
+  href: api/
+- name: GitHub
+  href: https://github.com/AM-WD/LinkMobility

src/LinkMobility/Enums/StatusCodes.cs

@@ -1,7 +1,8 @@
 namespace AMWD.Net.Api.LinkMobility
 {
 	/// <summary>
-	/// Custom status codes as defined by <see href="https://developer.linkmobility.eu/sms-api/rest-api#section/Status-codes">Link Mobility</see>.
+	/// Custom status codes as defined by
+	/// <see href="https://developer.linkmobility.eu/sms-api/rest-api#section/Status-codes">LINK Mobility</see>.
 	/// </summary>
 	public enum StatusCodes : int
 	{

src/LinkMobility/ILinkMobilityClient.cs

@@ -9,17 +9,13 @@ namespace AMWD.Net.Api.LinkMobility
 	public interface ILinkMobilityClient
 	{
 		/// <summary>
-		/// Sends a text message to a list of recipients.
+		/// Performs a POST request to the LINK mobility API.
 		/// </summary>
+		/// <typeparam name="TResponse">The type of the response.</typeparam>
+		/// <typeparam name="TRequest">The type of the request.</typeparam>
+		/// <param name="requestPath">The path of the API endpoint.</param>
 		/// <param name="request">The request data.</param>
 		/// <param name="cancellationToken">A cancellation token to propagate notification that operations should be canceled.</param>
-		Task<SendMessageResponse> SendTextMessage(SendTextMessageRequest request, CancellationToken cancellationToken = default);
-
-		/// <summary>
-		/// Sends a binary message to a list of recipients.
-		/// </summary>
-		/// <param name="request">The request data.</param>
-		/// <param name="cancellationToken">A cancellation token to propagate notification that operations should be canceled.</param>
-		Task<SendMessageResponse> SendBinaryMessage(SendBinaryMessageRequest request, CancellationToken cancellationToken = default);
+		Task<TResponse> PostAsync<TResponse, TRequest>(string requestPath, TRequest? request, CancellationToken cancellationToken = default);
 	}
 }

src/LinkMobility/LinkMobilityClient.Sms.cs

@@ -1,68 +0,0 @@
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Implementation of text messaging (SMS). <see href="https://developer.linkmobility.eu/sms-api/rest-api">API</see>
-	/// </summary>
-	public partial class LinkMobilityClient : ILinkMobilityClient, IDisposable
-	{
-		/// <inheritdoc/>
-		public Task<SendMessageResponse> SendTextMessage(SendTextMessageRequest request, CancellationToken cancellationToken = default)
-		{
-			if (request == null)
-				throw new ArgumentNullException(nameof(request));
-
-			if (string.IsNullOrWhiteSpace(request.MessageContent))
-				throw new ArgumentException("A message must be provided.", nameof(request.MessageContent));
-
-			if (request.RecipientAddressList == null || request.RecipientAddressList.Count == 0)
-				throw new ArgumentException("At least one recipient must be provided.", nameof(request.RecipientAddressList));
-
-			foreach (string recipient in request.RecipientAddressList)
-			{
-				if (!IsValidMSISDN(recipient))
-					throw new ArgumentException($"Recipient address '{recipient}' is not a valid MSISDN format.", nameof(request.RecipientAddressList));
-			}
-
-			return PostAsync<SendMessageResponse, SendTextMessageRequest>("/smsmessaging/text", request, cancellationToken: cancellationToken);
-		}
-
-		/// <inheritdoc/>
-		public Task<SendMessageResponse> SendBinaryMessage(SendBinaryMessageRequest request, CancellationToken cancellationToken = default)
-		{
-			if (request == null)
-				throw new ArgumentNullException(nameof(request));
-
-			if (request.MessageContent?.Count > 0)
-			{
-				// Validate that the string is a valid Base64 string
-				// Might throw a ArgumentNullException or FormatException
-				foreach (string str in request.MessageContent)
-					Convert.FromBase64String(str);
-			}
-
-			if (request.RecipientAddressList == null || request.RecipientAddressList.Count == 0)
-				throw new ArgumentException("At least one recipient must be provided.", nameof(request.RecipientAddressList));
-
-			foreach (string recipient in request.RecipientAddressList)
-			{
-				if (!IsValidMSISDN(recipient))
-					throw new ArgumentException($"Recipient address '{recipient}' is not a valid MSISDN format.", nameof(request.RecipientAddressList));
-			}
-
-			return PostAsync<SendMessageResponse, SendBinaryMessageRequest>("/smsmessaging/binary", request, cancellationToken: cancellationToken);
-		}
-
-		// https://en.wikipedia.org/wiki/MSISDN
-		private static bool IsValidMSISDN(string msisdn)
-		{
-			if (string.IsNullOrWhiteSpace(msisdn))
-				return false;
-
-			return Regex.IsMatch(msisdn, @"^[1-9][0-9]{7,14}$", RegexOptions.Compiled);
-		}
-	}
-}

src/LinkMobility/LinkMobilityClient.cs

@@ -7,13 +7,14 @@ using System.Security.Authentication;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using AMWD.Net.Api.LinkMobility.Utils;
 
 namespace AMWD.Net.Api.LinkMobility
 {
 	/// <summary>
 	/// Provides a client for interacting with the Link Mobility API.
 	/// </summary>
-	public partial class LinkMobilityClient : ILinkMobilityClient, IDisposable
+	public class LinkMobilityClient : ILinkMobilityClient, IDisposable
 	{
 		private readonly ClientOptions _clientOptions;
 		private readonly HttpClient _httpClient;
@@ -78,6 +79,45 @@ namespace AMWD.Net.Api.LinkMobility
 			GC.SuppressFinalize(this);
 		}
 
+		/// <inheritdoc/>
+		public async Task<TResponse> PostAsync<TResponse, TRequest>(string requestPath, TRequest? request, CancellationToken cancellationToken = default)
+		{
+			ThrowIfDisposed();
+			ValidateRequestPath(requestPath);
+
+			string requestUrl = BuildRequestUrl(requestPath);
+			var httpContent = ConvertRequest(request);
+
+			var httpRequest = new HttpRequestMessage
+			{
+				Method = HttpMethod.Post,
+				RequestUri = new Uri(requestUrl, UriKind.Relative),
+				Content = httpContent,
+			};
+
+			var httpResponse = await _httpClient.SendAsync(httpRequest, cancellationToken).ConfigureAwait(false);
+			var response = await GetResponse<TResponse>(httpResponse, cancellationToken).ConfigureAwait(false);
+			return response;
+		}
+
+		private string BuildRequestUrl(string requestPath)
+		{
+			string path = requestPath.Trim().TrimStart('/');
+			var param = new Dictionary<string, string>();
+
+			if (_clientOptions.DefaultQueryParams.Count > 0)
+			{
+				foreach (var kvp in _clientOptions.DefaultQueryParams)
+					param[kvp.Key] = kvp.Value;
+			}
+
+			if (param.Count == 0)
+				return path;
+
+			string queryString = string.Join("&", param.Select(kvp => $"{WebUtility.UrlEncode(kvp.Key)}={WebUtility.UrlEncode(kvp.Value)}"));
+			return $"{path}?{queryString}";
+		}
+
 		private void ValidateClientOptions()
 		{
 			if (string.IsNullOrWhiteSpace(_clientOptions.BaseUrl))
@@ -148,51 +188,6 @@ namespace AMWD.Net.Api.LinkMobility
 			}
 		}
 
-		private async Task<TResponse> PostAsync<TResponse, TRequest>(string requestPath, TRequest? request, IQueryParameter? queryParams = null, CancellationToken cancellationToken = default)
-		{
-			ThrowIfDisposed();
-			ValidateRequestPath(requestPath);
-
-			string requestUrl = BuildRequestUrl(requestPath, queryParams);
-			var httpContent = ConvertRequest(request);
-
-			var httpRequest = new HttpRequestMessage
-			{
-				Method = HttpMethod.Post,
-				RequestUri = new Uri(requestUrl, UriKind.Relative),
-				Content = httpContent,
-			};
-
-			var httpResponse = await _httpClient.SendAsync(httpRequest, cancellationToken).ConfigureAwait(false);
-			var response = await GetResponse<TResponse>(httpResponse, cancellationToken).ConfigureAwait(false);
-			return response;
-		}
-
-		private string BuildRequestUrl(string requestPath, IQueryParameter? queryParams = null)
-		{
-			string path = requestPath.Trim().TrimStart('/');
-			var param = new Dictionary<string, string>();
-
-			if (_clientOptions.DefaultQueryParams.Count > 0)
-			{
-				foreach (var kvp in _clientOptions.DefaultQueryParams)
-					param[kvp.Key] = kvp.Value;
-			}
-
-			var customQueryParams = queryParams?.GetQueryParameters();
-			if (customQueryParams?.Count > 0)
-			{
-				foreach (var kvp in customQueryParams)
-					param[kvp.Key] = kvp.Value;
-			}
-
-			if (param.Count == 0)
-				return path;
-
-			string queryString = string.Join("&", param.Select(kvp => $"{WebUtility.UrlEncode(kvp.Key)}={WebUtility.UrlEncode(kvp.Value)}"));
-			return $"{path}?{queryString}";
-		}
-
 		private static HttpContent? ConvertRequest<T>(T request)
 		{
 			if (request == null)

src/LinkMobility/QueryParameters/IQueryParameter.cs

@@ -1,13 +0,0 @@
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Represents options defined via query parameters.
-	/// </summary>
-	public interface IQueryParameter
-	{
-		/// <summary>
-		/// Retrieves the query parameters.
-		/// </summary>
-		IReadOnlyDictionary<string, string> GetQueryParameters();
-	}
-}

src/LinkMobility/README.md

@@ -12,7 +12,7 @@ In this project the REST API of LINK Mobility will be implemented.
 
 ---
 
-Published under MIT License (see [**tl;dr**Legal])
+Published under MIT License (see [choose a license])
 
 [LINK Mobility REST API]: https://developer.linkmobility.eu/
-[**tl;dr**Legal]: https://www.tldrlegal.com/license/mit-license
+[choose a license]: https://choosealicense.com/licenses/mit/

src/LinkMobility/Responses/SendMessageResponse.cs

@@ -11,12 +11,6 @@
 		[JsonProperty("clientMessageId")]
 		public string? ClientMessageId { get; set; }
 
-		/// <summary>
-		/// The actual number of generated SMS.
-		/// </summary>
-		[JsonProperty("smsCount")]
-		public int? SmsCount { get; set; }
-
 		/// <summary>
 		/// Status code.
 		/// </summary>

src/LinkMobility/Responses/SendTextMessageResponse.cs

@@ -0,0 +1,14 @@
+namespace AMWD.Net.Api.LinkMobility
+{
+	/// <summary>
+	/// Response of a text message sent to a list of recipients.
+	/// </summary>
+	public class SendTextMessageResponse : SendMessageResponse
+	{
+		/// <summary>
+		/// The actual number of generated SMS.
+		/// </summary>
+		[JsonProperty("smsCount")]
+		public int? SmsCount { get; set; }
+	}
+}

src/LinkMobility/Text/AddressType.cs

@@ -1,36 +1,36 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json.Converters;
-
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Specifies the type of sender address.
-	/// </summary>
-	[JsonConverter(typeof(StringEnumConverter))]
-	public enum AddressType
-	{
-		/// <summary>
-		/// National number.
-		/// </summary>
-		[EnumMember(Value = "national")]
-		National = 1,
-
-		/// <summary>
-		/// International number.
-		/// </summary>
-		[EnumMember(Value = "international")]
-		International = 2,
-
-		/// <summary>
-		/// Alphanumeric sender ID.
-		/// </summary>
-		[EnumMember(Value = "alphanumeric")]
-		Alphanumeric = 3,
-
-		/// <summary>
-		/// Shortcode.
-		/// </summary>
-		[EnumMember(Value = "shortcode")]
-		Shortcode = 4,
-	}
-}
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+
+namespace AMWD.Net.Api.LinkMobility.Text
+{
+	/// <summary>
+	/// Specifies the type of sender address.
+	/// </summary>
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum AddressType
+	{
+		/// <summary>
+		/// National number.
+		/// </summary>
+		[EnumMember(Value = "national")]
+		National = 1,
+
+		/// <summary>
+		/// International number.
+		/// </summary>
+		[EnumMember(Value = "international")]
+		International = 2,
+
+		/// <summary>
+		/// Alphanumeric sender ID.
+		/// </summary>
+		[EnumMember(Value = "alphanumeric")]
+		Alphanumeric = 3,
+
+		/// <summary>
+		/// Shortcode.
+		/// </summary>
+		[EnumMember(Value = "shortcode")]
+		Shortcode = 4,
+	}
+}

src/LinkMobility/Text/DeliveryType.cs

@@ -1,36 +1,36 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json.Converters;
-
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Defines the types of delivery methods on a report.
-	/// </summary>
-	[JsonConverter(typeof(StringEnumConverter))]
-	public enum DeliveryType
-	{
-		/// <summary>
-		/// Message sent via SMS.
-		/// </summary>
-		[EnumMember(Value = "sms")]
-		Sms = 1,
-
-		/// <summary>
-		/// Message sent as Push message.
-		/// </summary>
-		[EnumMember(Value = "push")]
-		Push = 2,
-
-		/// <summary>
-		/// Message sent as failover SMS.
-		/// </summary>
-		[EnumMember(Value = "failover-sms")]
-		FailoverSms = 3,
-
-		/// <summary>
-		/// Message sent as voice message.
-		/// </summary>
-		[EnumMember(Value = "voice")]
-		Voice = 4
-	}
-}
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+
+namespace AMWD.Net.Api.LinkMobility.Text
+{
+	/// <summary>
+	/// Defines the types of delivery methods on a report.
+	/// </summary>
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum DeliveryType
+	{
+		/// <summary>
+		/// Message sent via SMS.
+		/// </summary>
+		[EnumMember(Value = "sms")]
+		Sms = 1,
+
+		/// <summary>
+		/// Message sent as Push message.
+		/// </summary>
+		[EnumMember(Value = "push")]
+		Push = 2,
+
+		/// <summary>
+		/// Message sent as failover SMS.
+		/// </summary>
+		[EnumMember(Value = "failover-sms")]
+		FailoverSms = 3,
+
+		/// <summary>
+		/// Message sent as voice message.
+		/// </summary>
+		[EnumMember(Value = "voice")]
+		Voice = 4
+	}
+}

src/LinkMobility/Text/MessageType.cs

@@ -1,24 +1,24 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json.Converters;
-
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Specifies the message type.
-	/// </summary>
-	[JsonConverter(typeof(StringEnumConverter))]
-	public enum MessageType
-	{
-		/// <summary>
-		/// The message is sent as defined in the account settings.
-		/// </summary>
-		[EnumMember(Value = "default")]
-		Default = 1,
-
-		/// <summary>
-		/// The message is sent as voice call.
-		/// </summary>
-		[EnumMember(Value = "voice")]
-		Voice = 2,
-	}
-}
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+
+namespace AMWD.Net.Api.LinkMobility.Text
+{
+	/// <summary>
+	/// Specifies the message type.
+	/// </summary>
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum MessageType
+	{
+		/// <summary>
+		/// The message is sent as defined in the account settings.
+		/// </summary>
+		[EnumMember(Value = "default")]
+		Default = 1,
+
+		/// <summary>
+		/// The message is sent as voice call.
+		/// </summary>
+		[EnumMember(Value = "voice")]
+		Voice = 2,
+	}
+}

src/LinkMobility/Text/SendBinaryMessageRequest.cs

@@ -1,128 +1,130 @@
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Request to send a text message to a list of recipients.
-	/// </summary>
-	public class SendBinaryMessageRequest
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SendBinaryMessageRequest"/> class.
-		/// </summary>
-		/// <param name="recipientAddressList">The recipient list.</param>
-		public SendBinaryMessageRequest(IReadOnlyCollection<string> recipientAddressList)
-		{
-			RecipientAddressList = recipientAddressList;
-		}
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// May contain a freely definable message id.
-		/// </summary>
-		[JsonProperty("clientMessageId")]
-		public string? ClientMessageId { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// The content category that is used to categorize the message (used for blacklisting).
-		/// </summary>
-		/// <remarks>
-		///  The following content categories are supported: <see cref="ContentCategory.Informational"/> or <see cref="ContentCategory.Advertisement"/>.
-		///  If no content category is provided, the default setting is used (may be changed inside the web interface).
-		/// </remarks>
-		[JsonProperty("contentCategory")]
-		public ContentCategory? ContentCategory { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Array of <c>Base64</c> encoded binary data.
-		/// </summary>
-		/// <remarks>
-		/// Every element of the array corresponds to a message segment.
-		/// The binary data is transmitted without being changed (using 8 bit alphabet).
-		/// </remarks>
-		[JsonProperty("messageContent")]
-		public IReadOnlyCollection<string>? MessageContent { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// When setting a <c>NotificationCallbackUrl</c> all delivery reports are forwarded to this URL.
-		/// </summary>
-		[JsonProperty("notificationCallbackUrl")]
-		public string? NotificationCallbackUrl { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Priority of the message.
-		/// </summary>
-		/// <remarks>
-		/// Must not exceed the value configured for the account used to send the message.
-		/// For more information please contact our customer service.
-		/// </remarks>
-		[JsonProperty("priority")]
-		public int? Priority { get; set; }
-
-		/// <summary>
-		/// List of recipients (E.164 formatted <see href="https://en.wikipedia.org/wiki/MSISDN">MSISDN</see>s)
-		/// to whom the message should be sent.
-		/// <br/>
-		/// The list of recipients may contain a maximum of <em>1000</em> entries.
-		/// </summary>
-		[JsonProperty("recipientAddressList")]
-		public IReadOnlyCollection<string> RecipientAddressList { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// <br/>
-		/// <see langword="true"/>: The message is sent as flash SMS (displayed directly on the screen of the mobile phone).
-		/// <br/>
-		/// <see langword="false"/>: The message is sent as standard text SMS (default).
-		/// </summary>
-		[JsonProperty("sendAsFlashSms")]
-		public bool? SendAsFlashSms { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Address of the sender (assigned to the account) from which the message is sent.
-		/// </summary>
-		[JsonProperty("senderAddress")]
-		public string? SenderAddress { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// The sender address type.
-		/// </summary>
-		[JsonProperty("senderAddressType")]
-		public AddressType? SenderAddressType { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// <br/>
-		/// <see langword="true"/>: The transmission is only simulated, no SMS is sent.
-		/// Depending on the number of recipients the status code <see cref="StatusCodes.Ok"/> or <see cref="StatusCodes.OkQueued"/> is returned.
-		/// <br/>
-		/// <see langword="false"/>: No simulation is done. The SMS is sent via the SMS Gateway. (default)
-		/// </summary>
-		[JsonProperty("test")]
-		public bool? Test { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// <br/>
-		/// <see langword="true"/>: Indicates the presence of a user data header in the <see cref="MessageContent"/> property.
-		/// <br/>
-		/// <see langword="false"/>: Indicates the absence of a user data header in the <see cref="MessageContent"/> property. (default)
-		/// </summary>
-		[JsonProperty("userDataHeaderPresent")]
-		public bool? UserDataHeaderPresent { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Specifies the validity periode (in seconds) in which the message is tried to be delivered to the recipient.
-		/// </summary>
-		/// <remarks>
-		/// A minimum of 1 minute (<c>60</c> seconds) and a maximum of 3 days (<c>259200</c> seconds) are allowed.
-		/// </remarks>
-		[JsonProperty("validityPeriode")]
-		public int? ValidityPeriode { get; set; }
-	}
-}
+namespace AMWD.Net.Api.LinkMobility.Text
+{
+	/// <summary>
+	/// Request to send a text message to a list of recipients.
+	/// </summary>
+	public class SendBinaryMessageRequest
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SendBinaryMessageRequest"/> class.
+		/// </summary>
+		/// <param name="messageContent">A binary message as base64 encoded lines.</param>
+		/// <param name="recipientAddressList">A list of recipient numbers.</param>
+		public SendBinaryMessageRequest(IReadOnlyCollection<string> messageContent, IReadOnlyCollection<string> recipientAddressList)
+		{
+			MessageContent = messageContent;
+			RecipientAddressList = recipientAddressList;
+		}
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// May contain a freely definable message id.
+		/// </summary>
+		[JsonProperty("clientMessageId")]
+		public string? ClientMessageId { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// The content category that is used to categorize the message (used for blacklisting).
+		/// </summary>
+		/// <remarks>
+		///  The following content categories are supported: <see cref="ContentCategory.Informational"/> or <see cref="ContentCategory.Advertisement"/>.
+		///  If no content category is provided, the default setting is used (may be changed inside the web interface).
+		/// </remarks>
+		[JsonProperty("contentCategory")]
+		public ContentCategory? ContentCategory { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Array of <c>Base64</c> encoded binary data.
+		/// </summary>
+		/// <remarks>
+		/// Every element of the array corresponds to a message segment.
+		/// The binary data is transmitted without being changed (using 8 bit alphabet).
+		/// </remarks>
+		[JsonProperty("messageContent")]
+		public IReadOnlyCollection<string> MessageContent { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// When setting a <c>NotificationCallbackUrl</c> all delivery reports are forwarded to this URL.
+		/// </summary>
+		[JsonProperty("notificationCallbackUrl")]
+		public string? NotificationCallbackUrl { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Priority of the message.
+		/// </summary>
+		/// <remarks>
+		/// Must not exceed the value configured for the account used to send the message.
+		/// For more information please contact our customer service.
+		/// </remarks>
+		[JsonProperty("priority")]
+		public int? Priority { get; set; }
+
+		/// <summary>
+		/// List of recipients (E.164 formatted <see href="https://en.wikipedia.org/wiki/MSISDN">MSISDN</see>s)
+		/// to whom the message should be sent.
+		/// <br/>
+		/// The list of recipients may contain a maximum of <em>1000</em> entries.
+		/// </summary>
+		[JsonProperty("recipientAddressList")]
+		public IReadOnlyCollection<string> RecipientAddressList { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// <br/>
+		/// <see langword="true"/>: The message is sent as flash SMS (displayed directly on the screen of the mobile phone).
+		/// <br/>
+		/// <see langword="false"/>: The message is sent as standard text SMS (default).
+		/// </summary>
+		[JsonProperty("sendAsFlashSms")]
+		public bool? SendAsFlashSms { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Address of the sender (assigned to the account) from which the message is sent.
+		/// </summary>
+		[JsonProperty("senderAddress")]
+		public string? SenderAddress { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// The sender address type.
+		/// </summary>
+		[JsonProperty("senderAddressType")]
+		public AddressType? SenderAddressType { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// <br/>
+		/// <see langword="true"/>: The transmission is only simulated, no SMS is sent.
+		/// Depending on the number of recipients the status code <see cref="StatusCodes.Ok"/> or <see cref="StatusCodes.OkQueued"/> is returned.
+		/// <br/>
+		/// <see langword="false"/>: No simulation is done. The SMS is sent via the SMS Gateway. (default)
+		/// </summary>
+		[JsonProperty("test")]
+		public bool? Test { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// <br/>
+		/// <see langword="true"/>: Indicates the presence of a user data header in the <see cref="MessageContent"/> property.
+		/// <br/>
+		/// <see langword="false"/>: Indicates the absence of a user data header in the <see cref="MessageContent"/> property. (default)
+		/// </summary>
+		[JsonProperty("userDataHeaderPresent")]
+		public bool? UserDataHeaderPresent { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Specifies the validity periode (in seconds) in which the message is tried to be delivered to the recipient.
+		/// </summary>
+		/// <remarks>
+		/// A minimum of 1 minute (<c>60</c> seconds) and a maximum of 3 days (<c>259200</c> seconds) are allowed.
+		/// </remarks>
+		[JsonProperty("validityPeriode")]
+		public int? ValidityPeriode { get; set; }
+	}
+}

src/LinkMobility/Text/SendTextMessageRequest.cs

@@ -1,139 +1,139 @@
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Request to send a text message to a list of recipients.
-	/// </summary>
-	public class SendTextMessageRequest
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SendTextMessageRequest"/> class.
-		/// </summary>
-		/// <param name="messageContent">The message.</param>
-		/// <param name="recipientAddressList">The recipient list.</param>
-		public SendTextMessageRequest(string messageContent, IReadOnlyCollection<string> recipientAddressList)
-		{
-			MessageContent = messageContent;
-			RecipientAddressList = recipientAddressList;
-		}
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// May contain a freely definable message id.
-		/// </summary>
-		[JsonProperty("clientMessageId")]
-		public string? ClientMessageId { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// The content category that is used to categorize the message (used for blacklisting).
-		/// </summary>
-		/// <remarks>
-		///  The following content categories are supported: <see cref="ContentCategory.Informational"/> or <see cref="ContentCategory.Advertisement"/>.
-		///  If no content category is provided, the default setting is used (may be changed inside the web interface).
-		/// </remarks>
-		[JsonProperty("contentCategory")]
-		public ContentCategory? ContentCategory { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Specifies the maximum number of SMS to be generated.
-		/// </summary>
-		/// <remarks>
-		/// If the system generates more than this number of SMS, the status code <see cref="StatusCodes.MaxSmsPerMessageExceeded"/> is returned.
-		/// The default value of this parameter is <c>0</c>.
-		/// If set to <c>0</c>, no limitation is applied.
-		/// </remarks>
-		[JsonProperty("maxSmsPerMessage")]
-		public int? MaxSmsPerMessage { get; set; }
-
-		/// <summary>
-		/// <em>UTF-8</em> encoded message content.
-		/// </summary>
-		[JsonProperty("messageContent")]
-		public string MessageContent { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Specifies the message type.
-		/// </summary>
-		/// <remarks>
-		/// Allowed values are <see cref="MessageType.Default"/> and <see cref="MessageType.Voice"/>.
-		/// When using the message type <see cref="MessageType.Default"/>, the outgoing message type is determined based on account settings.
-		/// Using the message type <see cref="MessageType.Voice"/> triggers a voice call.
-		/// </remarks>
-		[JsonProperty("messageType")]
-		public MessageType? MessageType { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// When setting a <c>NotificationCallbackUrl</c> all delivery reports are forwarded to this URL.
-		/// </summary>
-		[JsonProperty("notificationCallbackUrl")]
-		public string? NotificationCallbackUrl { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Priority of the message.
-		/// </summary>
-		/// <remarks>
-		/// Must not exceed the value configured for the account used to send the message.
-		/// For more information please contact our customer service.
-		/// </remarks>
-		[JsonProperty("priority")]
-		public int? Priority { get; set; }
-
-		/// <summary>
-		/// List of recipients (E.164 formatted <see href="https://en.wikipedia.org/wiki/MSISDN">MSISDN</see>s)
-		/// to whom the message should be sent.
-		/// <br/>
-		/// The list of recipients may contain a maximum of <em>1000</em> entries.
-		/// </summary>
-		[JsonProperty("recipientAddressList")]
-		public IReadOnlyCollection<string> RecipientAddressList { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// <br/>
-		/// <see langword="true"/>: The message is sent as flash SMS (displayed directly on the screen of the mobile phone).
-		/// <br/>
-		/// <see langword="false"/>: The message is sent as standard text SMS (default).
-		/// </summary>
-		[JsonProperty("sendAsFlashSms")]
-		public bool? SendAsFlashSms { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Address of the sender (assigned to the account) from which the message is sent.
-		/// </summary>
-		[JsonProperty("senderAddress")]
-		public string? SenderAddress { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// The sender address type.
-		/// </summary>
-		[JsonProperty("senderAddressType")]
-		public AddressType? SenderAddressType { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// <br/>
-		/// <see langword="true"/>: The transmission is only simulated, no SMS is sent.
-		/// Depending on the number of recipients the status code <see cref="StatusCodes.Ok"/> or <see cref="StatusCodes.OkQueued"/> is returned.
-		/// <br/>
-		/// <see langword="false"/>: No simulation is done. The SMS is sent via the SMS Gateway. (default)
-		/// </summary>
-		[JsonProperty("test")]
-		public bool? Test { get; set; }
-
-		/// <summary>
-		/// <em>Optional</em>.
-		/// Specifies the validity periode (in seconds) in which the message is tried to be delivered to the recipient.
-		/// </summary>
-		/// <remarks>
-		/// A minimum of 1 minute (<c>60</c> seconds) and a maximum of 3 days (<c>259200</c> seconds) are allowed.
-		/// </remarks>
-		[JsonProperty("validityPeriode")]
-		public int? ValidityPeriode { get; set; }
-	}
-}
+namespace AMWD.Net.Api.LinkMobility.Text
+{
+	/// <summary>
+	/// Request to send a text message to a list of recipients.
+	/// </summary>
+	public class SendTextMessageRequest
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SendTextMessageRequest"/> class.
+		/// </summary>
+		/// <param name="messageContent">A text message.</param>
+		/// <param name="recipientAddressList">A list of recipient numbers.</param>
+		public SendTextMessageRequest(string messageContent, IReadOnlyCollection<string> recipientAddressList)
+		{
+			MessageContent = messageContent;
+			RecipientAddressList = recipientAddressList;
+		}
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// May contain a freely definable message id.
+		/// </summary>
+		[JsonProperty("clientMessageId")]
+		public string? ClientMessageId { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// The content category that is used to categorize the message (used for blacklisting).
+		/// </summary>
+		/// <remarks>
+		///  The following content categories are supported: <see cref="ContentCategory.Informational"/> or <see cref="ContentCategory.Advertisement"/>.
+		///  If no content category is provided, the default setting is used (may be changed inside the web interface).
+		/// </remarks>
+		[JsonProperty("contentCategory")]
+		public ContentCategory? ContentCategory { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Specifies the maximum number of SMS to be generated.
+		/// </summary>
+		/// <remarks>
+		/// If the system generates more than this number of SMS, the status code <see cref="StatusCodes.MaxSmsPerMessageExceeded"/> is returned.
+		/// The default value of this parameter is <c>0</c>.
+		/// If set to <c>0</c>, no limitation is applied.
+		/// </remarks>
+		[JsonProperty("maxSmsPerMessage")]
+		public int? MaxSmsPerMessage { get; set; }
+
+		/// <summary>
+		/// <em>UTF-8</em> encoded message content.
+		/// </summary>
+		[JsonProperty("messageContent")]
+		public string MessageContent { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Specifies the message type.
+		/// </summary>
+		/// <remarks>
+		/// Allowed values are <see cref="MessageType.Default"/> and <see cref="MessageType.Voice"/>.
+		/// When using the message type <see cref="MessageType.Default"/>, the outgoing message type is determined based on account settings.
+		/// Using the message type <see cref="MessageType.Voice"/> triggers a voice call.
+		/// </remarks>
+		[JsonProperty("messageType")]
+		public MessageType? MessageType { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// When setting a <c>NotificationCallbackUrl</c> all delivery reports are forwarded to this URL.
+		/// </summary>
+		[JsonProperty("notificationCallbackUrl")]
+		public string? NotificationCallbackUrl { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Priority of the message.
+		/// </summary>
+		/// <remarks>
+		/// Must not exceed the value configured for the account used to send the message.
+		/// For more information please contact our customer service.
+		/// </remarks>
+		[JsonProperty("priority")]
+		public int? Priority { get; set; }
+
+		/// <summary>
+		/// List of recipients (E.164 formatted <see href="https://en.wikipedia.org/wiki/MSISDN">MSISDN</see>s)
+		/// to whom the message should be sent.
+		/// <br/>
+		/// The list of recipients may contain a maximum of <em>1000</em> entries.
+		/// </summary>
+		[JsonProperty("recipientAddressList")]
+		public IReadOnlyCollection<string> RecipientAddressList { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// <br/>
+		/// <see langword="true"/>: The message is sent as flash SMS (displayed directly on the screen of the mobile phone).
+		/// <br/>
+		/// <see langword="false"/>: The message is sent as standard text SMS (default).
+		/// </summary>
+		[JsonProperty("sendAsFlashSms")]
+		public bool? SendAsFlashSms { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Address of the sender (assigned to the account) from which the message is sent.
+		/// </summary>
+		[JsonProperty("senderAddress")]
+		public string? SenderAddress { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// The sender address type.
+		/// </summary>
+		[JsonProperty("senderAddressType")]
+		public AddressType? SenderAddressType { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// <br/>
+		/// <see langword="true"/>: The transmission is only simulated, no SMS is sent.
+		/// Depending on the number of recipients the status code <see cref="StatusCodes.Ok"/> or <see cref="StatusCodes.OkQueued"/> is returned.
+		/// <br/>
+		/// <see langword="false"/>: No simulation is done. The SMS is sent via the SMS Gateway. (default)
+		/// </summary>
+		[JsonProperty("test")]
+		public bool? Test { get; set; }
+
+		/// <summary>
+		/// <em>Optional</em>.
+		/// Specifies the validity periode (in seconds) in which the message is tried to be delivered to the recipient.
+		/// </summary>
+		/// <remarks>
+		/// A minimum of 1 minute (<c>60</c> seconds) and a maximum of 3 days (<c>259200</c> seconds) are allowed.
+		/// </remarks>
+		[JsonProperty("validityPeriode")]
+		public int? ValidityPeriode { get; set; }
+	}
+}

src/LinkMobility/Text/TextMessageExtensions.cs

@@ -0,0 +1,78 @@
+using System.Threading;
+using System.Threading.Tasks;
+using AMWD.Net.Api.LinkMobility.Utils;
+
+namespace AMWD.Net.Api.LinkMobility.Text
+{
+	/// <summary>
+	/// Implementation of text messaging (SMS). <see href="https://developer.linkmobility.eu/sms-api/rest-api">API</see>
+	/// </summary>
+	public static class TextMessageExtensions
+	{
+		/// <summary>
+		/// Sends a text message to a list of recipients.
+		/// </summary>
+		/// <param name="client">The <see cref="ILinkMobilityClient"/> instance.</param>
+		/// <param name="request">The request data.</param>
+		/// <param name="cancellationToken">A cancellation token to propagate notification that operations should be canceled.</param>
+		public static Task<SendTextMessageResponse> SendTextMessage(this ILinkMobilityClient client, SendTextMessageRequest request, CancellationToken cancellationToken = default)
+		{
+			if (request == null)
+				throw new ArgumentNullException(nameof(request));
+
+			if (string.IsNullOrWhiteSpace(request.MessageContent))
+				throw new ArgumentException("A message must be provided.", nameof(request.MessageContent));
+
+			ValidateRecipientList(request.RecipientAddressList);
+			ValidateContentCategory(request.ContentCategory);
+
+			return client.PostAsync<SendTextMessageResponse, SendTextMessageRequest>("/smsmessaging/text", request, cancellationToken: cancellationToken);
+		}
+
+		/// <summary>
+		/// Sends a binary message to a list of recipients.
+		/// </summary>
+		/// <param name="client">The <see cref="ILinkMobilityClient"/> instance.</param>
+		/// <param name="request">The request data.</param>
+		/// <param name="cancellationToken">A cancellation token to propagate notification that operations should be canceled.</param>
+		public static Task<SendTextMessageResponse> SendBinaryMessage(this ILinkMobilityClient client, SendBinaryMessageRequest request, CancellationToken cancellationToken = default)
+		{
+			if (request == null)
+				throw new ArgumentNullException(nameof(request));
+
+			if (request.MessageContent == null || request.MessageContent.Count == 0)
+				throw new ArgumentException("A message must be provided.", nameof(request.MessageContent));
+
+			// Easiest way to validate that the string is a valid Base64 string.
+			// Might throw a ArgumentNullException or FormatException.
+			foreach (string str in request.MessageContent)
+				Convert.FromBase64String(str);
+
+			ValidateRecipientList(request.RecipientAddressList);
+			ValidateContentCategory(request.ContentCategory);
+
+			return client.PostAsync<SendTextMessageResponse, SendBinaryMessageRequest>("/smsmessaging/binary", request, cancellationToken: cancellationToken);
+		}
+
+		private static void ValidateRecipientList(IReadOnlyCollection<string>? recipientAddressList)
+		{
+			if (recipientAddressList == null || recipientAddressList.Count == 0)
+				throw new ArgumentException("At least one recipient must be provided.", nameof(recipientAddressList));
+
+			foreach (string recipient in recipientAddressList)
+			{
+				if (!Validation.IsValidMSISDN(recipient))
+					throw new ArgumentException($"Recipient address '{recipient}' is not a valid MSISDN format.", nameof(recipientAddressList));
+			}
+		}
+
+		private static void ValidateContentCategory(ContentCategory? contentCategory)
+		{
+			if (!contentCategory.HasValue)
+				return;
+
+			if (contentCategory.Value != ContentCategory.Informational && contentCategory.Value != ContentCategory.Advertisement)
+				throw new ArgumentException($"Content category '{contentCategory.Value}' is not valid.", nameof(contentCategory));
+		}
+	}
+}

src/LinkMobility/Utils/SerializerExtensions.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace AMWD.Net.Api.LinkMobility
+namespace AMWD.Net.Api.LinkMobility.Utils
 {
 	internal static class SerializerExtensions
 	{

src/LinkMobility/Utils/Validation.cs

@@ -0,0 +1,25 @@
+using System.Text.RegularExpressions;
+
+namespace AMWD.Net.Api.LinkMobility.Utils
+{
+	/// <summary>
+	/// Validation helper for LINK Mobility API requirements.
+	/// </summary>
+	public static class Validation
+	{
+		/// <summary>
+		/// Validates whether the provided string is a valid MSISDN (E.164 formatted).
+		/// <br/>
+		/// See <see href="https://en.wikipedia.org/wiki/MSISDN">Wikipedia: MSISDN</see> for more information.
+		/// </summary>
+		/// <param name="msisdn">The string to validate.</param>
+		/// <returns><see langword="true"/> for a valid MSISDN number, <see langword="false"/> otherwise.</returns>
+		public static bool IsValidMSISDN(string msisdn)
+		{
+			if (string.IsNullOrWhiteSpace(msisdn))
+				return false;
+
+			return Regex.IsMatch(msisdn, @"^[1-9][0-9]{7,14}$", RegexOptions.Compiled);
+		}
+	}
+}

src/LinkMobility/Webhook/NotificationResponse.cs

@@ -1,27 +1,33 @@
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Representes the response to an incoming message notification. (<see href="https://developer.linkmobility.eu/sms-api/receive-incoming-messages">API</see>)
-	/// </summary>
-	public class IncomingMessageNotificationResponse
-	{
-		/// <summary>
-		/// Gets or sets the status code of the response.
-		/// </summary>
-		[JsonProperty("statusCode")]
-		public StatusCodes StatusCode { get; set; } = StatusCodes.Ok;
-
-		/// <summary>
-		/// Gets or sets the status message of the response.
-		/// </summary>
-		[JsonProperty("statusMessage")]
-		public string StatusMessage { get; set; } = "OK";
-
-		/// <summary>
-		/// Returns a string representation of the current object in serialized format.
-		/// </summary>
-		/// <returns>A string containing the serialized form of the object (json).</returns>
-		public override string ToString()
-			=> this.SerializeObject();
-	}
-}
+using AMWD.Net.Api.LinkMobility.Utils;
+
+namespace AMWD.Net.Api.LinkMobility.Webhook
+{
+	/// <summary>
+	/// Representes the response to an incoming message notification.
+	/// (See <see href="https://developer.linkmobility.eu/sms-api/receive-incoming-messages">API</see>)
+	/// </summary>
+	/// <remarks>
+	/// This notification acknowlegement is the same for all webhooks of LINK Mobility.
+	/// </remarks>
+	public class NotificationResponse
+	{
+		/// <summary>
+		/// Gets or sets the status code of the response.
+		/// </summary>
+		[JsonProperty("statusCode")]
+		public StatusCodes StatusCode { get; set; } = StatusCodes.Ok;
+
+		/// <summary>
+		/// Gets or sets the status message of the response.
+		/// </summary>
+		[JsonProperty("statusMessage")]
+		public string StatusMessage { get; set; } = "OK";
+
+		/// <summary>
+		/// Returns a string representation of the current object in serialized format.
+		/// </summary>
+		/// <returns>A string containing the serialized form of the object (json).</returns>
+		public override string ToString()
+			=> this.SerializeObject();
+	}
+}

src/LinkMobility/Webhook/Text/DeliveryStatus.cs

@@ -1,48 +1,48 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json.Converters;
-
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Defines the delivery status of a message on a report.
-	/// </summary>
-	[JsonConverter(typeof(StringEnumConverter))]
-	public enum DeliveryStatus
-	{
-		/// <summary>
-		/// Message has been delivered to the recipient.
-		/// </summary>
-		[EnumMember(Value = "delivered")]
-		Delivered = 1,
-
-		/// <summary>
-		/// Message not delivered and will be re-tried.
-		/// </summary>
-		[EnumMember(Value = "undelivered")]
-		Undelivered = 2,
-
-		/// <summary>
-		/// Message has expired and will no longer re-tried.
-		/// </summary>
-		[EnumMember(Value = "expired")]
-		Expired = 3,
-
-		/// <summary>
-		/// Message has been deleted.
-		/// </summary>
-		[EnumMember(Value = "deleted")]
-		Deleted = 4,
-
-		/// <summary>
-		/// Message has been accepted by the carrier.
-		/// </summary>
-		[EnumMember(Value = "accepted")]
-		Accepted = 5,
-
-		/// <summary>
-		/// Message has been rejected by the carrier.
-		/// </summary>
-		[EnumMember(Value = "rejected")]
-		Rejected = 6
-	}
-}
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+
+namespace AMWD.Net.Api.LinkMobility.Webhook.Text
+{
+	/// <summary>
+	/// Defines the delivery status of a message on a report.
+	/// </summary>
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum DeliveryStatus
+	{
+		/// <summary>
+		/// Message has been delivered to the recipient.
+		/// </summary>
+		[EnumMember(Value = "delivered")]
+		Delivered = 1,
+
+		/// <summary>
+		/// Message not delivered and will be re-tried.
+		/// </summary>
+		[EnumMember(Value = "undelivered")]
+		Undelivered = 2,
+
+		/// <summary>
+		/// Message has expired and will no longer re-tried.
+		/// </summary>
+		[EnumMember(Value = "expired")]
+		Expired = 3,
+
+		/// <summary>
+		/// Message has been deleted.
+		/// </summary>
+		[EnumMember(Value = "deleted")]
+		Deleted = 4,
+
+		/// <summary>
+		/// Message has been accepted by the carrier.
+		/// </summary>
+		[EnumMember(Value = "accepted")]
+		Accepted = 5,
+
+		/// <summary>
+		/// Message has been rejected by the carrier.
+		/// </summary>
+		[EnumMember(Value = "rejected")]
+		Rejected = 6
+	}
+}

src/LinkMobility/Webhook/Text/TextMessageType.cs

@@ -0,0 +1,30 @@
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+
+namespace AMWD.Net.Api.LinkMobility.Webhook.Text
+{
+	/// <summary>
+	/// Defines the type of notification.
+	/// </summary>
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum TextMessageType
+	{
+		/// <summary>
+		/// Notification of an incoming text message.
+		/// </summary>
+		[EnumMember(Value = "text")]
+		Text = 1,
+
+		/// <summary>
+		/// Notification of an incoming binary message.
+		/// </summary>
+		[EnumMember(Value = "binary")]
+		Binary = 2,
+
+		/// <summary>
+		/// Notification of a delivery report.
+		/// </summary>
+		[EnumMember(Value = "deliveryReport")]
+		DeliveryReport = 3
+	}
+}

src/LinkMobility/Webhook/Text/TextNotification.cs

@@ -1,194 +1,170 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json.Converters;
-
-namespace AMWD.Net.Api.LinkMobility
-{
-	/// <summary>
-	/// Represents a notification for an incoming message or delivery report. (<see href="https://developer.linkmobility.eu/sms-api/receive-incoming-messages">API</see>)
-	/// </summary>
-	public class IncomingMessageNotification
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="IncomingMessageNotification"/> class.
-		/// </summary>
-		/// <param name="notificationId">The notification id.</param>
-		/// <param name="transferId">The transfer id.</param>
-		public IncomingMessageNotification(string notificationId, string transferId)
-		{
-			NotificationId = notificationId;
-			TransferId = transferId;
-		}
-
-		/// <summary>
-		/// Defines the content type of your notification.
-		/// </summary>
-		[JsonProperty("messageType")]
-		public Type MessageType { get; set; }
-
-		/// <summary>
-		/// 20 digit long identification of your notification.
-		/// </summary>
-		[JsonProperty("notificationId")]
-		public string NotificationId { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.DeliveryReport"/>:
-		/// <br/>
-		/// Unique transfer-id to connect the deliveryReport to the initial message.
-		/// </summary>
-		[JsonProperty("transferId")]
-		public string TransferId { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.Text"/>, <see cref="Type.Binary"/>:
-		/// <br/>
-		/// Indicates whether you received message is a SMS or a flash-SMS.
-		/// </summary>
-		[JsonProperty("messageFlashSms")]
-		public bool? MessageFlashSms { get; set; }
-
-		/// <summary>
-		/// Originator of the sender.
-		/// </summary>
-		[JsonProperty("senderAddress")]
-		public string? SenderAddress { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.Text"/>, <see cref="Type.Binary"/>:
-		/// <br/>
-		/// <see cref="AddressType.International"/> – defines the number format of the mobile originated <see cref="SenderAddress"/>.
-		/// International numbers always includes the country prefix.
-		/// </summary>
-		[JsonProperty("senderAddressType")]
-		public AddressType? SenderAddressType { get; set; }
-
-		/// <summary>
-		/// Senders address, can either be
-		/// <see cref="AddressType.International"/> (4366012345678),
-		/// <see cref="AddressType.National"/> (066012345678) or a
-		/// <see cref="AddressType.Shortcode"/> (1234).
-		/// </summary>
-		[JsonProperty("recipientAddress")]
-		public string? RecipientAddress { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.Text"/>, <see cref="Type.Binary"/>:
-		/// <br/>
-		/// Defines the number format of the mobile originated message.
-		/// </summary>
-		[JsonProperty("recipientAddressType")]
-		public AddressType? RecipientAddressType { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.Text"/>:
-		/// <br/>
-		/// Text body of the message encoded in <c>UTF-8</c>.
-		/// In the case of concatenated SMS it will contain the complete content of all segments.
-		/// </summary>
-		[JsonProperty("textMessageContent")]
-		public string? TextMessageContent { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.Binary"/>:
-		/// <br/>
-		/// Indicates whether a user-data-header is included within a <c>Base64</c> encoded byte segment.
-		/// </summary>
-		[JsonProperty("userDataHeaderPresent")]
-		public bool? UserDataHeaderPresent { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.Binary"/>:
-		/// <br/>
-		/// Content of a binary SMS in an array of <c>Base64</c> strings (URL safe).
-		/// </summary>
-		[JsonProperty("binaryMessageContent")]
-		public IReadOnlyCollection<string>? BinaryMessageContent { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.DeliveryReport"/>:
-		/// <br/>
-		/// Status of the message.
-		/// </summary>
-		[JsonProperty("deliveryReportMessageStatus")]
-		public DeliveryStatus? DeliveryReportMessageStatus { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.DeliveryReport"/>:
-		/// <br/>
-		/// ISO 8601 timestamp. Point of time sending the message to recipients address.
-		/// </summary>
-		[JsonProperty("sentOn")]
-		public DateTime? SentOn { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.DeliveryReport"/>:
-		/// <br/>
-		/// ISO 8601 timestamp. Point of time of submitting the message to the mobile operators network.
-		/// </summary>
-		[JsonProperty("deliveredOn")]
-		public DateTime? DeliveredOn { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.DeliveryReport"/>:
-		/// <br/>
-		/// Type of delivery used to send the message.
-		/// </summary>
-		[JsonProperty("deliveredAs")]
-		public DeliveryType? DeliveredAs { get; set; }
-
-		/// <summary>
-		/// <see cref="Type.DeliveryReport"/>:
-		/// <br/>
-		/// In the case of a delivery report, the <see cref="ClientMessageId"/> contains the optional submitted message id.
-		/// </summary>
-		[JsonProperty("clientMessageId")]
-		public string? ClientMessageId { get; set; }
-
-		/// <summary>
-		/// Defines the type of notification.
-		/// </summary>
-		[JsonConverter(typeof(StringEnumConverter))]
-		public enum Type
-		{
-			/// <summary>
-			/// Notification of an incoming text message.
-			/// </summary>
-			[EnumMember(Value = "text")]
-			Text = 1,
-
-			/// <summary>
-			/// Notification of an incoming binary message.
-			/// </summary>
-			[EnumMember(Value = "binary")]
-			Binary = 2,
-
-			/// <summary>
-			/// Notification of a delivery report.
-			/// </summary>
-			[EnumMember(Value = "deliveryReport")]
-			DeliveryReport = 3
-		}
-
-		/// <summary>
-		/// Tries to parse the given content as <see cref="IncomingMessageNotification"/>.
-		/// </summary>
-		/// <param name="json">The given content (should be the notification json).</param>
-		/// <param name="notification">The deserialized notification.</param>
-		/// <returns>
-		/// <see langword="true"/> if the content could be parsed; otherwise, <see langword="false"/>.
-		/// </returns>
-		public static bool TryParse(string json, out IncomingMessageNotification? notification)
-		{
-			try
-			{
-				notification = json.DeserializeObject<IncomingMessageNotification>();
-				return notification != null;
-			}
-			catch
-			{
-				notification = null;
-				return false;
-			}
-		}
-	}
-}
+using AMWD.Net.Api.LinkMobility.Text;
+using AMWD.Net.Api.LinkMobility.Utils;
+
+namespace AMWD.Net.Api.LinkMobility.Webhook.Text
+{
+	/// <summary>
+	/// Represents a notification for an incoming text message or delivery report.
+	/// (<see href="https://developer.linkmobility.eu/sms-api/receive-incoming-messages">API</see>)
+	/// </summary>
+	public class TextNotification
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TextNotification"/> class.
+		/// </summary>
+		/// <param name="notificationId">The notification id.</param>
+		/// <param name="transferId">The transfer id.</param>
+		public TextNotification(string notificationId, string transferId)
+		{
+			NotificationId = notificationId;
+			TransferId = transferId;
+		}
+
+		/// <summary>
+		/// Defines the content type of your notification.
+		/// </summary>
+		[JsonProperty("messageType")]
+		public TextMessageType MessageType { get; set; }
+
+		/// <summary>
+		/// 20 digit long identification of your notification.
+		/// </summary>
+		[JsonProperty("notificationId")]
+		public string NotificationId { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.DeliveryReport"/>:
+		/// <br/>
+		/// Unique transfer-id to connect the deliveryReport to the initial message.
+		/// </summary>
+		[JsonProperty("transferId")]
+		public string TransferId { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.Text"/>, <see cref="Text.TextMessageType.Binary"/>:
+		/// <br/>
+		/// Indicates whether you received message is a SMS or a flash-SMS.
+		/// </summary>
+		[JsonProperty("messageFlashSms")]
+		public bool? MessageFlashSms { get; set; }
+
+		/// <summary>
+		/// Originator of the sender.
+		/// </summary>
+		[JsonProperty("senderAddress")]
+		public string? SenderAddress { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.Text"/>, <see cref="Text.TextMessageType.Binary"/>:
+		/// <br/>
+		/// <see cref="AddressType.International"/> - defines the number format of the mobile originated <see cref="SenderAddress"/>.
+		/// International numbers always includes the country prefix.
+		/// </summary>
+		[JsonProperty("senderAddressType")]
+		public AddressType? SenderAddressType { get; set; }
+
+		/// <summary>
+		/// Senders address, can either be
+		/// <see cref="AddressType.International"/> (4366012345678),
+		/// <see cref="AddressType.National"/> (066012345678) or a
+		/// <see cref="AddressType.Shortcode"/> (1234).
+		/// </summary>
+		[JsonProperty("recipientAddress")]
+		public string? RecipientAddress { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.Text"/>, <see cref="Text.TextMessageType.Binary"/>:
+		/// <br/>
+		/// Defines the number format of the mobile originated message.
+		/// </summary>
+		[JsonProperty("recipientAddressType")]
+		public AddressType? RecipientAddressType { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.Text"/>:
+		/// <br/>
+		/// Text body of the message encoded in <c>UTF-8</c>.
+		/// In the case of concatenated SMS it will contain the complete content of all segments.
+		/// </summary>
+		[JsonProperty("textMessageContent")]
+		public string? TextMessageContent { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.Binary"/>:
+		/// <br/>
+		/// Indicates whether a user-data-header is included within a <c>Base64</c> encoded byte segment.
+		/// </summary>
+		[JsonProperty("userDataHeaderPresent")]
+		public bool? UserDataHeaderPresent { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.Binary"/>:
+		/// <br/>
+		/// Content of a binary SMS in an array of <c>Base64</c> strings (URL safe).
+		/// </summary>
+		[JsonProperty("binaryMessageContent")]
+		public IReadOnlyCollection<string>? BinaryMessageContent { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.DeliveryReport"/>:
+		/// <br/>
+		/// Status of the message.
+		/// </summary>
+		[JsonProperty("deliveryReportMessageStatus")]
+		public DeliveryStatus? DeliveryReportMessageStatus { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.DeliveryReport"/>:
+		/// <br/>
+		/// ISO 8601 timestamp. Point of time sending the message to recipients address.
+		/// </summary>
+		[JsonProperty("sentOn")]
+		public DateTime? SentOn { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.DeliveryReport"/>:
+		/// <br/>
+		/// ISO 8601 timestamp. Point of time of submitting the message to the mobile operators network.
+		/// </summary>
+		[JsonProperty("deliveredOn")]
+		public DateTime? DeliveredOn { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.DeliveryReport"/>:
+		/// <br/>
+		/// Type of delivery used to send the message.
+		/// </summary>
+		[JsonProperty("deliveredAs")]
+		public DeliveryType? DeliveredAs { get; set; }
+
+		/// <summary>
+		/// <see cref="Text.TextMessageType.DeliveryReport"/>:
+		/// <br/>
+		/// In the case of a delivery report, the <see cref="ClientMessageId"/> contains the optional submitted message id.
+		/// </summary>
+		[JsonProperty("clientMessageId")]
+		public string? ClientMessageId { get; set; }
+
+		/// <summary>
+		/// Tries to parse the given content as <see cref="TextNotification"/>.
+		/// </summary>
+		/// <param name="json">The given content (should be the notification json).</param>
+		/// <param name="notification">The deserialized notification.</param>
+		/// <returns>
+		/// <see langword="true"/> if the content could be parsed; otherwise, <see langword="false"/>.
+		/// </returns>
+		public static bool TryParse(string json, out TextNotification? notification)
+		{
+			try
+			{
+				notification = json.DeserializeObject<TextNotification>();
+				return notification != null;
+			}
+			catch
+			{
+				notification = null;
+				return false;
+			}
+		}
+	}
+}

test/LinkMobility.Tests/Helpers/HttpMessageHandlerMock.cs

@@ -39,6 +39,8 @@ namespace LinkMobility.Tests.Helpers
 		public Queue<HttpResponseMessage> Responses { get; } = new();
 
 		public Mock<HttpClientHandler> Mock { get; }
+
+		public IProtectedMock<HttpClientHandler> Protected => Mock.Protected();
 	}
 
 	internal class HttpRequestMessageCallback

test/LinkMobility.Tests/LinkMobilityClientTest.cs

@@ -145,7 +145,7 @@ namespace LinkMobility.Tests
 			var client = GetClient();
 
 			// Act
-			var response = await ReflectionHelper.InvokePrivateMethodAsync<TestClass>(client, "PostAsync", "test", _request, null, TestContext.CancellationToken);
+			var response = await client.PostAsync<TestClass, TestClass>("test", _request, TestContext.CancellationToken);
 
 			// Assert
 			Assert.IsNotNull(response);
@@ -166,57 +166,12 @@ namespace LinkMobility.Tests
 			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
 			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
 
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
 
 			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Exactly(2));
 			VerifyNoOtherCalls();
 		}
 
-		[TestMethod]
-		public async Task ShouldAddCustomQueryParameters()
-		{
-			// Arrange
-			var queryParams = new TestParams();
-			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
-			{
-				StatusCode = HttpStatusCode.OK,
-				Content = new StringContent(@"{ ""string"": ""some-string"", ""integer"": 123 }", Encoding.UTF8, "application/json"),
-			});
-
-			var client = GetClient();
-
-			// Act
-			var response = await ReflectionHelper.InvokePrivateMethodAsync<TestClass>(client, "PostAsync", "params/path", _request, queryParams, TestContext.CancellationToken);
-
-			// Assert
-			Assert.IsNotNull(response);
-
-			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
-
-			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
-			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
-			Assert.AreEqual("https://localhost/rest/params/path?test=query+text", callback.Url);
-			Assert.AreEqual(@"{""string"":""Happy Testing"",""integer"":54321}", callback.Content);
-
-			Assert.HasCount(3, callback.Headers);
-			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
-			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
-			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
-
-			Assert.AreEqual("application/json", callback.Headers["Accept"]);
-			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
-			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
-
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
-
-			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
-			VerifyNoOtherCalls();
-		}
-
 		[TestMethod]
 		public void ShouldDisposeHttpClient()
 		{
@@ -227,9 +182,7 @@ namespace LinkMobility.Tests
 			client.Dispose();
 
 			// Assert
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("Dispose", Times.Once(), exactParameterMatch: true, true);
+			_httpMessageHandlerMock.Protected.Verify("Dispose", Times.Once(), exactParameterMatch: true, true);
 
 			VerifyNoOtherCalls();
 		}
@@ -245,9 +198,7 @@ namespace LinkMobility.Tests
 			client.Dispose();
 
 			// Assert
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("Dispose", Times.Once(), exactParameterMatch: true, true);
+			_httpMessageHandlerMock.Protected.Verify("Dispose", Times.Once(), exactParameterMatch: true, true);
 
 			VerifyNoOtherCalls();
 		}
@@ -256,7 +207,7 @@ namespace LinkMobility.Tests
 		public void ShouldAssertClientOptions()
 		{
 			// Arrange + Act
-			var client = GetClient();
+			_ = GetClient();
 
 			// Assert
 			VerifyNoOtherCalls();
@@ -320,7 +271,7 @@ namespace LinkMobility.Tests
 			// Act & Assert
 			await Assert.ThrowsExactlyAsync<ObjectDisposedException>(async () =>
 			{
-				await ReflectionHelper.InvokePrivateMethodAsync<object>(client, "PostAsync", "/request/path", _request, null, TestContext.CancellationToken);
+				await client.PostAsync<object, TestClass>("/request/path", _request, TestContext.CancellationToken);
 			});
 		}
 
@@ -336,7 +287,7 @@ namespace LinkMobility.Tests
 			// Act & Assert
 			await Assert.ThrowsExactlyAsync<ArgumentNullException>(async () =>
 			{
-				await ReflectionHelper.InvokePrivateMethodAsync<object>(client, "PostAsync", path, _request, null, TestContext.CancellationToken);
+				await client.PostAsync<object, TestClass>(path, _request, TestContext.CancellationToken);
 			});
 		}
 
@@ -349,7 +300,7 @@ namespace LinkMobility.Tests
 			// Act & Assert
 			await Assert.ThrowsExactlyAsync<ArgumentException>(async () =>
 			{
-				await ReflectionHelper.InvokePrivateMethodAsync<object>(client, "PostAsync", "foo?bar=baz", _request, null, TestContext.CancellationToken);
+				await client.PostAsync<object, TestClass>("foo?bar=baz", _request, TestContext.CancellationToken);
 			});
 		}
 
@@ -366,7 +317,7 @@ namespace LinkMobility.Tests
 			var client = GetClient();
 
 			// Act
-			var response = await ReflectionHelper.InvokePrivateMethodAsync<TestClass>(client, "PostAsync", "/request/path", _request, null, TestContext.CancellationToken);
+			var response = await client.PostAsync<TestClass, TestClass>("/request/path", _request, TestContext.CancellationToken);
 
 			// Assert
 			Assert.IsNotNull(response);
@@ -389,9 +340,7 @@ namespace LinkMobility.Tests
 			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
 			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
 
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
 
 			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
 			VerifyNoOtherCalls();
@@ -411,7 +360,7 @@ namespace LinkMobility.Tests
 			var client = GetClient();
 
 			// Act
-			var response = await ReflectionHelper.InvokePrivateMethodAsync<TestClass>(client, "PostAsync", "/request/path", stringContent, null, TestContext.CancellationToken);
+			var response = await client.PostAsync<TestClass, HttpContent>("/request/path", stringContent, TestContext.CancellationToken);
 
 			// Assert
 			Assert.IsNotNull(response);
@@ -434,9 +383,7 @@ namespace LinkMobility.Tests
 			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
 			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
 
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
 
 			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
 			VerifyNoOtherCalls();
@@ -455,7 +402,7 @@ namespace LinkMobility.Tests
 			var client = GetClient();
 
 			// Act
-			var response = await ReflectionHelper.InvokePrivateMethodAsync<TestClass>(client, "PostAsync", "posting", null, null, TestContext.CancellationToken);
+			var response = await client.PostAsync<TestClass, object>("posting", null, TestContext.CancellationToken);
 
 			// Assert
 			Assert.IsNotNull(response);
@@ -479,9 +426,7 @@ namespace LinkMobility.Tests
 			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
 			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
 
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
 		}
 
 		[TestMethod]
@@ -501,7 +446,7 @@ namespace LinkMobility.Tests
 			// Act & Assert
 			var ex = await Assert.ThrowsExactlyAsync<AuthenticationException>(async () =>
 			{
-				await ReflectionHelper.InvokePrivateMethodAsync<object>(client, "PostAsync", "foo", _request, null, TestContext.CancellationToken);
+				await client.PostAsync<object, TestClass>("foo", _request, TestContext.CancellationToken);
 			});
 			Assert.IsNull(ex.InnerException);
 			Assert.AreEqual($"HTTP auth missing: {statusCode}", ex.Message);
@@ -524,7 +469,7 @@ namespace LinkMobility.Tests
 			// Act & Assert
 			var ex = await Assert.ThrowsExactlyAsync<ApplicationException>(async () =>
 			{
-				await ReflectionHelper.InvokePrivateMethodAsync<object>(client, "PostAsync", "foo", _request, null, TestContext.CancellationToken);
+				await client.PostAsync<object, TestClass>("foo", _request, TestContext.CancellationToken);
 			});
 			Assert.IsNull(ex.InnerException);
 			Assert.AreEqual($"Unknown HTTP response: {statusCode}", ex.Message);
@@ -545,7 +490,7 @@ namespace LinkMobility.Tests
 			// Act & Assert
 			await Assert.ThrowsExactlyAsync<JsonReaderException>(async () =>
 			{
-				await ReflectionHelper.InvokePrivateMethodAsync<TestClass>(client, "PostAsync", "some-path", _request, null, TestContext.CancellationToken);
+				await client.PostAsync<TestClass, TestClass>("some-path", _request, TestContext.CancellationToken);
 			});
 		}
 
@@ -563,7 +508,7 @@ namespace LinkMobility.Tests
 			var client = GetClient();
 
 			// Act
-			string response = await ReflectionHelper.InvokePrivateMethodAsync<string>(client, "PostAsync", "path", _request, null, TestContext.CancellationToken);
+			string response = await client.PostAsync<string, TestClass>("path", _request, TestContext.CancellationToken);
 
 			// Assert
 			Assert.IsNotNull(response);
@@ -586,9 +531,7 @@ namespace LinkMobility.Tests
 			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
 			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
 
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
 
 			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
 			VerifyNoOtherCalls();
@@ -638,16 +581,5 @@ namespace LinkMobility.Tests
 			[JsonProperty("integer")]
 			public int Int { get; set; }
 		}
-
-		private class TestParams : IQueryParameter
-		{
-			public IReadOnlyDictionary<string, string> GetQueryParameters()
-			{
-				return new Dictionary<string, string>
-				{
-					{ "test", "query text" }
-				};
-			}
-		}
 	}
 }

test/LinkMobility.Tests/Text/SendBinaryMessageTest.cs

@@ -1,264 +1,303 @@
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using AMWD.Net.Api.LinkMobility;
-using LinkMobility.Tests.Helpers;
-using Moq.Protected;
-
-namespace LinkMobility.Tests.Sms
-{
-	[TestClass]
-	public class SendBinaryMessageTest
-	{
-		public TestContext TestContext { get; set; }
-
-		private const string BASE_URL = "https://localhost/rest/";
-
-		private Mock<IAuthentication> _authenticationMock;
-		private Mock<ClientOptions> _clientOptionsMock;
-		private HttpMessageHandlerMock _httpMessageHandlerMock;
-
-		private SendBinaryMessageRequest _request;
-
-		[TestInitialize]
-		public void Initialize()
-		{
-			_authenticationMock = new Mock<IAuthentication>();
-			_clientOptionsMock = new Mock<ClientOptions>();
-			_httpMessageHandlerMock = new HttpMessageHandlerMock();
-
-			_authenticationMock
-				.Setup(a => a.AddHeader(It.IsAny<HttpClient>()))
-				.Callback<HttpClient>(c => c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Scheme", "Parameter"));
-
-			_clientOptionsMock.Setup(c => c.BaseUrl).Returns(BASE_URL);
-			_clientOptionsMock.Setup(c => c.Timeout).Returns(TimeSpan.FromSeconds(30));
-			_clientOptionsMock.Setup(c => c.DefaultHeaders).Returns(new Dictionary<string, string>());
-			_clientOptionsMock.Setup(c => c.DefaultQueryParams).Returns(new Dictionary<string, string>());
-			_clientOptionsMock.Setup(c => c.AllowRedirects).Returns(true);
-			_clientOptionsMock.Setup(c => c.UseProxy).Returns(false);
-
-			_request = new SendBinaryMessageRequest(["436991234567"])
-			{
-				MessageContent = ["SGVsbG8gV29ybGQ="] // "Hello World" base64
-			};
-		}
-
-		[TestMethod]
-		public async Task ShouldSendBinaryMessage()
-		{
-			// Arrange
-			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
-			{
-				StatusCode = HttpStatusCode.OK,
-				Content = new StringContent(@"{ ""clientMessageId"": ""binId"", ""smsCount"": 1, ""statusCode"": 2000, ""statusMessage"": ""OK"", ""transferId"": ""abc123"" }", Encoding.UTF8, "application/json"),
-			});
-
-			var client = GetClient();
-
-			// Act
-			var response = await client.SendBinaryMessage(_request, TestContext.CancellationToken);
-
-			// Assert
-			Assert.IsNotNull(response);
-			Assert.AreEqual("binId", response.ClientMessageId);
-			Assert.AreEqual(1, response.SmsCount);
-			Assert.AreEqual(StatusCodes.Ok, response.StatusCode);
-			Assert.AreEqual("OK", response.StatusMessage);
-			Assert.AreEqual("abc123", response.TransferId);
-
-			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
-
-			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
-			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
-			Assert.AreEqual("https://localhost/rest/smsmessaging/binary", callback.Url);
-			Assert.AreEqual(@"{""messageContent"":[""SGVsbG8gV29ybGQ=""],""recipientAddressList"":[""436991234567""]}", callback.Content);
-
-			Assert.HasCount(3, callback.Headers);
-			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
-			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
-			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
-
-			Assert.AreEqual("application/json", callback.Headers["Accept"]);
-			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
-			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
-
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
-
-			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public async Task ShouldSendBinaryMessageFullDetails()
-		{
-			// Arrange
-			_request.ClientMessageId = "myCustomId";
-			_request.ContentCategory = ContentCategory.Advertisement;
-			_request.NotificationCallbackUrl = "https://user:pass@example.com/callback/";
-			_request.Priority = 5;
-			_request.SendAsFlashSms = false;
-			_request.SenderAddress = "4369912345678";
-			_request.SenderAddressType = AddressType.International;
-			_request.Test = false;
-			_request.UserDataHeaderPresent = true;
-			_request.ValidityPeriode = 300;
-
-			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
-			{
-				StatusCode = HttpStatusCode.OK,
-				Content = new StringContent(@"{ ""clientMessageId"": ""myCustomId"", ""smsCount"": 1, ""statusCode"": 2000, ""statusMessage"": ""OK"", ""transferId"": ""abc123"" }", Encoding.UTF8, "application/json"),
-			});
-
-			var client = GetClient();
-
-			// Act
-			var response = await client.SendBinaryMessage(_request, TestContext.CancellationToken);
-
-			// Assert
-			Assert.IsNotNull(response);
-			Assert.AreEqual("myCustomId", response.ClientMessageId);
-			Assert.AreEqual(1, response.SmsCount);
-			Assert.AreEqual(StatusCodes.Ok, response.StatusCode);
-			Assert.AreEqual("OK", response.StatusMessage);
-			Assert.AreEqual("abc123", response.TransferId);
-
-			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
-
-			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
-			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
-			Assert.AreEqual("https://localhost/rest/smsmessaging/binary", callback.Url);
-			Assert.AreEqual(@"{""clientMessageId"":""myCustomId"",""contentCategory"":""advertisement"",""messageContent"":[""SGVsbG8gV29ybGQ=""],""notificationCallbackUrl"":""https://user:pass@example.com/callback/"",""priority"":5,""recipientAddressList"":[""436991234567""],""sendAsFlashSms"":false,""senderAddress"":""4369912345678"",""senderAddressType"":""international"",""test"":false,""userDataHeaderPresent"":true,""validityPeriode"":300}", callback.Content);
-
-			Assert.HasCount(3, callback.Headers);
-			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
-			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
-			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
-
-			Assert.AreEqual("application/json", callback.Headers["Accept"]);
-			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
-			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
-
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
-
-			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public void ShouldThrowOnNullRequest()
-		{
-			// Arrange
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentNullException>(() => client.SendBinaryMessage(null, TestContext.CancellationToken));
-
-			Assert.AreEqual("request", ex.ParamName);
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public void ShouldThrowOnInvalidMessageEncoding()
-		{
-			// Arrange
-			_request.MessageContent = ["InvalidBase64!!"];
-			var client = GetClient();
-
-			// Act & Assert
-			Assert.ThrowsExactly<FormatException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public void ShouldThrowOnNullMessageContent()
-		{
-			// Arrange
-			_request.MessageContent = [null];
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentNullException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		[DataRow(null)]
-		[DataRow("")]
-		public void ShouldThrowOnNoRecipients(string recipients)
-		{
-			// Arrange
-			_request.RecipientAddressList = recipients?.Split(',');
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
-
-			Assert.AreEqual("RecipientAddressList", ex.ParamName);
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		[DataRow(null)]
-		[DataRow("")]
-		[DataRow("   ")]
-		[DataRow("invalid-recipient")]
-		public void ShouldThrowOnInvalidRecipient(string recipient)
-		{
-			// Arrange
-			_request.RecipientAddressList = ["436991234567", recipient];
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
-
-			Assert.AreEqual("RecipientAddressList", ex.ParamName);
-			Assert.StartsWith($"Recipient address '{recipient}' is not a valid MSISDN format.", ex.Message);
-
-			VerifyNoOtherCalls();
-		}
-
-		private void VerifyNoOtherCalls()
-		{
-			_authenticationMock.VerifyNoOtherCalls();
-			_clientOptionsMock.VerifyNoOtherCalls();
-			_httpMessageHandlerMock.Mock.VerifyNoOtherCalls();
-		}
-
-		private ILinkMobilityClient GetClient()
-		{
-			var client = new LinkMobilityClient(_authenticationMock.Object, _clientOptionsMock.Object);
-
-			var httpClient = new HttpClient(_httpMessageHandlerMock.Mock.Object)
-			{
-				Timeout = _clientOptionsMock.Object.Timeout,
-				BaseAddress = new Uri(_clientOptionsMock.Object.BaseUrl)
-			};
-
-			httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("LinkMobilityClient", "1.0.0"));
-			httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-			_authenticationMock.Object.AddHeader(httpClient);
-
-			_authenticationMock.Invocations.Clear();
-			_clientOptionsMock.Invocations.Clear();
-
-			ReflectionHelper.GetPrivateField<HttpClient>(client, "_httpClient")?.Dispose();
-			ReflectionHelper.SetPrivateField(client, "_httpClient", httpClient);
-
-			return client;
-		}
-	}
-}
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using AMWD.Net.Api.LinkMobility;
+using AMWD.Net.Api.LinkMobility.Text;
+using LinkMobility.Tests.Helpers;
+using Moq.Protected;
+
+namespace LinkMobility.Tests.Text
+{
+	[TestClass]
+	public class SendBinaryMessageTest
+	{
+		public TestContext TestContext { get; set; }
+
+		private const string BASE_URL = "https://localhost/rest/";
+
+		private Mock<IAuthentication> _authenticationMock;
+		private Mock<ClientOptions> _clientOptionsMock;
+		private HttpMessageHandlerMock _httpMessageHandlerMock;
+
+		private SendBinaryMessageRequest _request;
+
+		[TestInitialize]
+		public void Initialize()
+		{
+			_authenticationMock = new Mock<IAuthentication>();
+			_clientOptionsMock = new Mock<ClientOptions>();
+			_httpMessageHandlerMock = new HttpMessageHandlerMock();
+
+			_authenticationMock
+				.Setup(a => a.AddHeader(It.IsAny<HttpClient>()))
+				.Callback<HttpClient>(c => c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Scheme", "Parameter"));
+
+			_clientOptionsMock.Setup(c => c.BaseUrl).Returns(BASE_URL);
+			_clientOptionsMock.Setup(c => c.Timeout).Returns(TimeSpan.FromSeconds(30));
+			_clientOptionsMock.Setup(c => c.DefaultHeaders).Returns(new Dictionary<string, string>());
+			_clientOptionsMock.Setup(c => c.DefaultQueryParams).Returns(new Dictionary<string, string>());
+			_clientOptionsMock.Setup(c => c.AllowRedirects).Returns(true);
+			_clientOptionsMock.Setup(c => c.UseProxy).Returns(false);
+
+			_request = new SendBinaryMessageRequest(["SGVsbG8gV29ybGQ="], ["436991234567"]); // "Hello World" in Base64
+		}
+
+		[TestMethod]
+		public async Task ShouldSendBinaryMessage()
+		{
+			// Arrange
+			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
+			{
+				StatusCode = HttpStatusCode.OK,
+				Content = new StringContent(@"{ ""clientMessageId"": ""binId"", ""smsCount"": 1, ""statusCode"": 2000, ""statusMessage"": ""OK"", ""transferId"": ""abc123"" }", Encoding.UTF8, "application/json"),
+			});
+
+			var client = GetClient();
+
+			// Act
+			var response = await client.SendBinaryMessage(_request, TestContext.CancellationToken);
+
+			// Assert
+			Assert.IsNotNull(response);
+			Assert.AreEqual("binId", response.ClientMessageId);
+			Assert.AreEqual(1, response.SmsCount);
+			Assert.AreEqual(StatusCodes.Ok, response.StatusCode);
+			Assert.AreEqual("OK", response.StatusMessage);
+			Assert.AreEqual("abc123", response.TransferId);
+
+			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
+
+			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
+			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
+			Assert.AreEqual("https://localhost/rest/smsmessaging/binary", callback.Url);
+			Assert.AreEqual(@"{""messageContent"":[""SGVsbG8gV29ybGQ=""],""recipientAddressList"":[""436991234567""]}", callback.Content);
+
+			Assert.HasCount(3, callback.Headers);
+			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
+			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
+			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
+
+			Assert.AreEqual("application/json", callback.Headers["Accept"]);
+			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
+			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
+
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+
+			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnInvalidContentCategoryForBinary()
+		{
+			// Arrange
+			_request.ContentCategory = 0;
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+			Assert.AreEqual("contentCategory", ex.ParamName);
+			Assert.StartsWith("Content category '0' is not valid.", ex.Message);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public async Task ShouldSendBinaryMessageFullDetails()
+		{
+			// Arrange
+			_request.ClientMessageId = "myCustomId";
+			_request.ContentCategory = ContentCategory.Advertisement;
+			_request.NotificationCallbackUrl = "https://user:pass@example.com/callback/";
+			_request.Priority = 5;
+			_request.SendAsFlashSms = false;
+			_request.SenderAddress = "4369912345678";
+			_request.SenderAddressType = AddressType.International;
+			_request.Test = false;
+			_request.UserDataHeaderPresent = true;
+			_request.ValidityPeriode = 300;
+
+			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
+			{
+				StatusCode = HttpStatusCode.OK,
+				Content = new StringContent(@"{ ""clientMessageId"": ""myCustomId"", ""smsCount"": 1, ""statusCode"": 2000, ""statusMessage"": ""OK"", ""transferId"": ""abc123"" }", Encoding.UTF8, "application/json"),
+			});
+
+			var client = GetClient();
+
+			// Act
+			var response = await client.SendBinaryMessage(_request, TestContext.CancellationToken);
+
+			// Assert
+			Assert.IsNotNull(response);
+			Assert.AreEqual("myCustomId", response.ClientMessageId);
+			Assert.AreEqual(1, response.SmsCount);
+			Assert.AreEqual(StatusCodes.Ok, response.StatusCode);
+			Assert.AreEqual("OK", response.StatusMessage);
+			Assert.AreEqual("abc123", response.TransferId);
+
+			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
+
+			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
+			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
+			Assert.AreEqual("https://localhost/rest/smsmessaging/binary", callback.Url);
+			Assert.AreEqual(@"{""clientMessageId"":""myCustomId"",""contentCategory"":""advertisement"",""messageContent"":[""SGVsbG8gV29ybGQ=""],""notificationCallbackUrl"":""https://user:pass@example.com/callback/"",""priority"":5,""recipientAddressList"":[""436991234567""],""sendAsFlashSms"":false,""senderAddress"":""4369912345678"",""senderAddressType"":""international"",""test"":false,""userDataHeaderPresent"":true,""validityPeriode"":300}", callback.Content);
+
+			Assert.HasCount(3, callback.Headers);
+			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
+			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
+			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
+
+			Assert.AreEqual("application/json", callback.Headers["Accept"]);
+			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
+			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
+
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+
+			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnNullRequest()
+		{
+			// Arrange
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentNullException>(() => client.SendBinaryMessage(null, TestContext.CancellationToken));
+
+			Assert.AreEqual("request", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnNullMessageContentList()
+		{
+			// Arrange
+			_request.MessageContent = null;
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+
+			Assert.AreEqual("MessageContent", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnEmptyMessageContentList()
+		{
+			// Arrange
+			_request.MessageContent = [];
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+
+			Assert.AreEqual("MessageContent", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnInvalidMessageEncoding()
+		{
+			// Arrange
+			_request.MessageContent = ["InvalidBase64!!"];
+			var client = GetClient();
+
+			// Act & Assert
+			Assert.ThrowsExactly<FormatException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnNullMessageContent()
+		{
+			// Arrange
+			_request.MessageContent = [null];
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentNullException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		[DataRow(null)]
+		[DataRow("")]
+		public void ShouldThrowOnNoRecipients(string recipients)
+		{
+			// Arrange
+			_request.RecipientAddressList = recipients?.Split(',');
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+
+			Assert.AreEqual("recipientAddressList", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		[DataRow(null)]
+		[DataRow("")]
+		[DataRow("   ")]
+		[DataRow("invalid-recipient")]
+		public void ShouldThrowOnInvalidRecipient(string recipient)
+		{
+			// Arrange
+			_request.RecipientAddressList = ["436991234567", recipient];
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendBinaryMessage(_request, TestContext.CancellationToken));
+
+			Assert.AreEqual("recipientAddressList", ex.ParamName);
+			Assert.StartsWith($"Recipient address '{recipient}' is not a valid MSISDN format.", ex.Message);
+
+			VerifyNoOtherCalls();
+		}
+
+		private void VerifyNoOtherCalls()
+		{
+			_authenticationMock.VerifyNoOtherCalls();
+			_clientOptionsMock.VerifyNoOtherCalls();
+			_httpMessageHandlerMock.Mock.VerifyNoOtherCalls();
+		}
+
+		private ILinkMobilityClient GetClient()
+		{
+			var client = new LinkMobilityClient(_authenticationMock.Object, _clientOptionsMock.Object);
+
+			var httpClient = new HttpClient(_httpMessageHandlerMock.Mock.Object)
+			{
+				Timeout = _clientOptionsMock.Object.Timeout,
+				BaseAddress = new Uri(_clientOptionsMock.Object.BaseUrl)
+			};
+
+			httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("LinkMobilityClient", "1.0.0"));
+			httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+			_authenticationMock.Object.AddHeader(httpClient);
+
+			_authenticationMock.Invocations.Clear();
+			_clientOptionsMock.Invocations.Clear();
+
+			ReflectionHelper.GetPrivateField<HttpClient>(client, "_httpClient")?.Dispose();
+			ReflectionHelper.SetPrivateField(client, "_httpClient", httpClient);
+
+			return client;
+		}
+	}
+}

test/LinkMobility.Tests/Text/SendTextMessageTest.cs

@@ -1,251 +1,263 @@
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using AMWD.Net.Api.LinkMobility;
-using LinkMobility.Tests.Helpers;
-using Moq.Protected;
-
-namespace LinkMobility.Tests.Sms
-{
-	[TestClass]
-	public class SendTextMessageTest
-	{
-		public TestContext TestContext { get; set; }
-
-		private const string BASE_URL = "https://localhost/rest/";
-
-		private Mock<IAuthentication> _authenticationMock;
-		private Mock<ClientOptions> _clientOptionsMock;
-		private HttpMessageHandlerMock _httpMessageHandlerMock;
-
-		private SendTextMessageRequest _request;
-
-		[TestInitialize]
-		public void Initialize()
-		{
-			_authenticationMock = new Mock<IAuthentication>();
-			_clientOptionsMock = new Mock<ClientOptions>();
-			_httpMessageHandlerMock = new HttpMessageHandlerMock();
-
-			_authenticationMock
-				.Setup(a => a.AddHeader(It.IsAny<HttpClient>()))
-				.Callback<HttpClient>(c => c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Scheme", "Parameter"));
-
-			_clientOptionsMock.Setup(c => c.BaseUrl).Returns(BASE_URL);
-			_clientOptionsMock.Setup(c => c.Timeout).Returns(TimeSpan.FromSeconds(30));
-			_clientOptionsMock.Setup(c => c.DefaultHeaders).Returns(new Dictionary<string, string>());
-			_clientOptionsMock.Setup(c => c.DefaultQueryParams).Returns(new Dictionary<string, string>());
-			_clientOptionsMock.Setup(c => c.AllowRedirects).Returns(true);
-			_clientOptionsMock.Setup(c => c.UseProxy).Returns(false);
-
-			_request = new SendTextMessageRequest("example message content", ["436991234567"]);
-		}
-
-		[TestMethod]
-		public async Task ShouldSendTextMessage()
-		{
-			// Arrange
-			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
-			{
-				StatusCode = HttpStatusCode.OK,
-				Content = new StringContent(@"{ ""clientMessageId"": ""myUniqueId"", ""smsCount"": 1, ""statusCode"": 2000, ""statusMessage"": ""OK"", ""transferId"": ""0059d0b20100a0a8b803"" }", Encoding.UTF8, "application/json"),
-			});
-
-			var client = GetClient();
-
-			// Act
-			var response = await client.SendTextMessage(_request, TestContext.CancellationToken);
-
-			// Assert
-			Assert.IsNotNull(response);
-
-			Assert.AreEqual("myUniqueId", response.ClientMessageId);
-			Assert.AreEqual(1, response.SmsCount);
-			Assert.AreEqual(StatusCodes.Ok, response.StatusCode);
-			Assert.AreEqual("OK", response.StatusMessage);
-			Assert.AreEqual("0059d0b20100a0a8b803", response.TransferId);
-
-			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
-
-			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
-			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
-			Assert.AreEqual("https://localhost/rest/smsmessaging/text", callback.Url);
-			Assert.AreEqual(@"{""messageContent"":""example message content"",""recipientAddressList"":[""436991234567""]}", callback.Content);
-
-			Assert.HasCount(3, callback.Headers);
-			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
-			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
-			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
-
-			Assert.AreEqual("application/json", callback.Headers["Accept"]);
-			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
-			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
-
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
-
-			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public async Task ShouldSendTextMessageFullDetails()
-		{
-			// Arrange
-			_request.ClientMessageId = "myCustomId";
-			_request.ContentCategory = ContentCategory.Informational;
-			_request.MaxSmsPerMessage = 1;
-			_request.MessageType = MessageType.Voice;
-			_request.NotificationCallbackUrl = "https://user:pass@example.com/callback/";
-			_request.Priority = 5;
-			_request.SendAsFlashSms = false;
-			_request.SenderAddress = "4369912345678";
-			_request.SenderAddressType = AddressType.International;
-			_request.Test = false;
-			_request.ValidityPeriode = 300;
-
-			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
-			{
-				StatusCode = HttpStatusCode.OK,
-				Content = new StringContent(@"{ ""clientMessageId"": ""myCustomId"", ""smsCount"": 1, ""statusCode"": 4035, ""statusMessage"": ""SMS_DISABLED"", ""transferId"": ""0059d0b20100a0a8b803"" }", Encoding.UTF8, "application/json"),
-			});
-
-			var client = GetClient();
-
-			// Act
-			var response = await client.SendTextMessage(_request, TestContext.CancellationToken);
-
-			// Assert
-			Assert.IsNotNull(response);
-
-			Assert.AreEqual("myCustomId", response.ClientMessageId);
-			Assert.AreEqual(1, response.SmsCount);
-			Assert.AreEqual(StatusCodes.SmsDisabled, response.StatusCode);
-			Assert.AreEqual("SMS_DISABLED", response.StatusMessage);
-			Assert.AreEqual("0059d0b20100a0a8b803", response.TransferId);
-
-			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
-
-			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
-			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
-			Assert.AreEqual("https://localhost/rest/smsmessaging/text", callback.Url);
-			Assert.AreEqual(@"{""clientMessageId"":""myCustomId"",""contentCategory"":""informational"",""maxSmsPerMessage"":1,""messageContent"":""example message content"",""messageType"":""voice"",""notificationCallbackUrl"":""https://user:pass@example.com/callback/"",""priority"":5,""recipientAddressList"":[""436991234567""],""sendAsFlashSms"":false,""senderAddress"":""4369912345678"",""senderAddressType"":""international"",""test"":false,""validityPeriode"":300}", callback.Content);
-
-			Assert.HasCount(3, callback.Headers);
-			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
-			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
-			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
-
-			Assert.AreEqual("application/json", callback.Headers["Accept"]);
-			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
-			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
-
-			_httpMessageHandlerMock.Mock
-				.Protected()
-				.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
-
-			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public void ShouldThrowOnNullRequest()
-		{
-			// Arrange
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentNullException>(() => client.SendTextMessage(null, TestContext.CancellationToken));
-			Assert.AreEqual("request", ex.ParamName);
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		[DataRow(null)]
-		[DataRow("")]
-		[DataRow("   ")]
-		public void ShouldThrowOnMissingMessage(string message)
-		{
-			// Arrange
-			var req = new SendTextMessageRequest(message, ["4791234567"]);
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(req, TestContext.CancellationToken));
-			Assert.AreEqual("MessageContent", ex.ParamName);
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		public void ShouldThrowOnNoRecipients()
-		{
-			// Arrange
-			var req = new SendTextMessageRequest("Hello", []);
-			var client = GetClient();
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(req, TestContext.CancellationToken));
-			Assert.AreEqual("RecipientAddressList", ex.ParamName);
-
-			VerifyNoOtherCalls();
-		}
-
-		[TestMethod]
-		[DataRow(null)]
-		[DataRow("")]
-		[DataRow("   ")]
-		[DataRow("invalid-recipient")]
-		public void ShouldThrowOnInvalidRecipient(string recipient)
-		{
-			// Arrange
-			var client = GetClient();
-			var req = new SendTextMessageRequest("Hello", ["4791234567", recipient]);
-
-			// Act & Assert
-			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(req, TestContext.CancellationToken));
-
-			Assert.AreEqual("RecipientAddressList", ex.ParamName);
-			Assert.StartsWith($"Recipient address '{recipient}' is not a valid MSISDN format.", ex.Message);
-
-			VerifyNoOtherCalls();
-		}
-
-		private void VerifyNoOtherCalls()
-		{
-			_authenticationMock.VerifyNoOtherCalls();
-			_clientOptionsMock.VerifyNoOtherCalls();
-			_httpMessageHandlerMock.Mock.VerifyNoOtherCalls();
-		}
-
-		private ILinkMobilityClient GetClient()
-		{
-			var client = new LinkMobilityClient(_authenticationMock.Object, _clientOptionsMock.Object);
-
-			var httpClient = new HttpClient(_httpMessageHandlerMock.Mock.Object)
-			{
-				Timeout = _clientOptionsMock.Object.Timeout,
-				BaseAddress = new Uri(_clientOptionsMock.Object.BaseUrl)
-			};
-
-			httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("LinkMobilityClient", "1.0.0"));
-			httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-			_authenticationMock.Object.AddHeader(httpClient);
-
-			_authenticationMock.Invocations.Clear();
-			_clientOptionsMock.Invocations.Clear();
-
-			ReflectionHelper.GetPrivateField<HttpClient>(client, "_httpClient")?.Dispose();
-			ReflectionHelper.SetPrivateField(client, "_httpClient", httpClient);
-
-			return client;
-		}
-	}
-}
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using AMWD.Net.Api.LinkMobility;
+using AMWD.Net.Api.LinkMobility.Text;
+using LinkMobility.Tests.Helpers;
+using Moq.Protected;
+
+namespace LinkMobility.Tests.Text
+{
+	[TestClass]
+	public class SendTextMessageTest
+	{
+		public TestContext TestContext { get; set; }
+
+		private const string BASE_URL = "https://localhost/rest/";
+
+		private Mock<IAuthentication> _authenticationMock;
+		private Mock<ClientOptions> _clientOptionsMock;
+		private HttpMessageHandlerMock _httpMessageHandlerMock;
+
+		private SendTextMessageRequest _request;
+
+		[TestInitialize]
+		public void Initialize()
+		{
+			_authenticationMock = new Mock<IAuthentication>();
+			_clientOptionsMock = new Mock<ClientOptions>();
+			_httpMessageHandlerMock = new HttpMessageHandlerMock();
+
+			_authenticationMock
+				.Setup(a => a.AddHeader(It.IsAny<HttpClient>()))
+				.Callback<HttpClient>(c => c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Scheme", "Parameter"));
+
+			_clientOptionsMock.Setup(c => c.BaseUrl).Returns(BASE_URL);
+			_clientOptionsMock.Setup(c => c.Timeout).Returns(TimeSpan.FromSeconds(30));
+			_clientOptionsMock.Setup(c => c.DefaultHeaders).Returns(new Dictionary<string, string>());
+			_clientOptionsMock.Setup(c => c.DefaultQueryParams).Returns(new Dictionary<string, string>());
+			_clientOptionsMock.Setup(c => c.AllowRedirects).Returns(true);
+			_clientOptionsMock.Setup(c => c.UseProxy).Returns(false);
+
+			_request = new SendTextMessageRequest("example message content", ["436991234567"]);
+		}
+
+		[TestMethod]
+		public async Task ShouldSendTextMessage()
+		{
+			// Arrange
+			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
+			{
+				StatusCode = HttpStatusCode.OK,
+				Content = new StringContent(@"{ ""clientMessageId"": ""myUniqueId"", ""smsCount"": 1, ""statusCode"": 2000, ""statusMessage"": ""OK"", ""transferId"": ""0059d0b20100a0a8b803"" }", Encoding.UTF8, "application/json"),
+			});
+
+			var client = GetClient();
+
+			// Act
+			var response = await client.SendTextMessage(_request, TestContext.CancellationToken);
+
+			// Assert
+			Assert.IsNotNull(response);
+
+			Assert.AreEqual("myUniqueId", response.ClientMessageId);
+			Assert.AreEqual(1, response.SmsCount);
+			Assert.AreEqual(StatusCodes.Ok, response.StatusCode);
+			Assert.AreEqual("OK", response.StatusMessage);
+			Assert.AreEqual("0059d0b20100a0a8b803", response.TransferId);
+
+			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
+
+			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
+			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
+			Assert.AreEqual("https://localhost/rest/smsmessaging/text", callback.Url);
+			Assert.AreEqual(@"{""messageContent"":""example message content"",""recipientAddressList"":[""436991234567""]}", callback.Content);
+
+			Assert.HasCount(3, callback.Headers);
+			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
+			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
+			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
+
+			Assert.AreEqual("application/json", callback.Headers["Accept"]);
+			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
+			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
+
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+
+			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnInvalidContentCategory()
+		{
+			// Arrange
+			_request.ContentCategory = 0;
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(_request, TestContext.CancellationToken));
+			Assert.AreEqual("contentCategory", ex.ParamName);
+			Assert.StartsWith("Content category '0' is not valid.", ex.Message);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public async Task ShouldSendTextMessageFullDetails()
+		{
+			// Arrange
+			_request.ClientMessageId = "myCustomId";
+			_request.ContentCategory = ContentCategory.Informational;
+			_request.MaxSmsPerMessage = 1;
+			_request.MessageType = MessageType.Voice;
+			_request.NotificationCallbackUrl = "https://user:pass@example.com/callback/";
+			_request.Priority = 5;
+			_request.SendAsFlashSms = false;
+			_request.SenderAddress = "4369912345678";
+			_request.SenderAddressType = AddressType.International;
+			_request.Test = false;
+			_request.ValidityPeriode = 300;
+
+			_httpMessageHandlerMock.Responses.Enqueue(new HttpResponseMessage
+			{
+				StatusCode = HttpStatusCode.OK,
+				Content = new StringContent(@"{ ""clientMessageId"": ""myCustomId"", ""smsCount"": 1, ""statusCode"": 4035, ""statusMessage"": ""SMS_DISABLED"", ""transferId"": ""0059d0b20100a0a8b803"" }", Encoding.UTF8, "application/json"),
+			});
+
+			var client = GetClient();
+
+			// Act
+			var response = await client.SendTextMessage(_request, TestContext.CancellationToken);
+
+			// Assert
+			Assert.IsNotNull(response);
+
+			Assert.AreEqual("myCustomId", response.ClientMessageId);
+			Assert.AreEqual(1, response.SmsCount);
+			Assert.AreEqual(StatusCodes.SmsDisabled, response.StatusCode);
+			Assert.AreEqual("SMS_DISABLED", response.StatusMessage);
+			Assert.AreEqual("0059d0b20100a0a8b803", response.TransferId);
+
+			Assert.HasCount(1, _httpMessageHandlerMock.RequestCallbacks);
+
+			var callback = _httpMessageHandlerMock.RequestCallbacks.First();
+			Assert.AreEqual(HttpMethod.Post, callback.HttpMethod);
+			Assert.AreEqual("https://localhost/rest/smsmessaging/text", callback.Url);
+			Assert.AreEqual(@"{""clientMessageId"":""myCustomId"",""contentCategory"":""informational"",""maxSmsPerMessage"":1,""messageContent"":""example message content"",""messageType"":""voice"",""notificationCallbackUrl"":""https://user:pass@example.com/callback/"",""priority"":5,""recipientAddressList"":[""436991234567""],""sendAsFlashSms"":false,""senderAddress"":""4369912345678"",""senderAddressType"":""international"",""test"":false,""validityPeriode"":300}", callback.Content);
+
+			Assert.HasCount(3, callback.Headers);
+			Assert.IsTrue(callback.Headers.ContainsKey("Accept"));
+			Assert.IsTrue(callback.Headers.ContainsKey("Authorization"));
+			Assert.IsTrue(callback.Headers.ContainsKey("User-Agent"));
+
+			Assert.AreEqual("application/json", callback.Headers["Accept"]);
+			Assert.AreEqual("Scheme Parameter", callback.Headers["Authorization"]);
+			Assert.AreEqual("LinkMobilityClient/1.0.0", callback.Headers["User-Agent"]);
+
+			_httpMessageHandlerMock.Protected.Verify("SendAsync", Times.Once(), ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>());
+
+			_clientOptionsMock.VerifyGet(o => o.DefaultQueryParams, Times.Once);
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnNullRequest()
+		{
+			// Arrange
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentNullException>(() => client.SendTextMessage(null, TestContext.CancellationToken));
+			Assert.AreEqual("request", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		[DataRow(null)]
+		[DataRow("")]
+		[DataRow("   ")]
+		public void ShouldThrowOnMissingMessage(string message)
+		{
+			// Arrange
+			var req = new SendTextMessageRequest(message, ["4791234567"]);
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(req, TestContext.CancellationToken));
+			Assert.AreEqual("MessageContent", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		public void ShouldThrowOnNoRecipients()
+		{
+			// Arrange
+			var req = new SendTextMessageRequest("Hello", []);
+			var client = GetClient();
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(req, TestContext.CancellationToken));
+			Assert.AreEqual("recipientAddressList", ex.ParamName);
+
+			VerifyNoOtherCalls();
+		}
+
+		[TestMethod]
+		[DataRow(null)]
+		[DataRow("")]
+		[DataRow("   ")]
+		[DataRow("invalid-recipient")]
+		public void ShouldThrowOnInvalidRecipient(string recipient)
+		{
+			// Arrange
+			var client = GetClient();
+			var req = new SendTextMessageRequest("Hello", ["4791234567", recipient]);
+
+			// Act & Assert
+			var ex = Assert.ThrowsExactly<ArgumentException>(() => client.SendTextMessage(req, TestContext.CancellationToken));
+
+			Assert.AreEqual("recipientAddressList", ex.ParamName);
+			Assert.StartsWith($"Recipient address '{recipient}' is not a valid MSISDN format.", ex.Message);
+
+			VerifyNoOtherCalls();
+		}
+
+		private void VerifyNoOtherCalls()
+		{
+			_authenticationMock.VerifyNoOtherCalls();
+			_clientOptionsMock.VerifyNoOtherCalls();
+			_httpMessageHandlerMock.Mock.VerifyNoOtherCalls();
+		}
+
+		private ILinkMobilityClient GetClient()
+		{
+			var client = new LinkMobilityClient(_authenticationMock.Object, _clientOptionsMock.Object);
+
+			var httpClient = new HttpClient(_httpMessageHandlerMock.Mock.Object)
+			{
+				Timeout = _clientOptionsMock.Object.Timeout,
+				BaseAddress = new Uri(_clientOptionsMock.Object.BaseUrl)
+			};
+
+			httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("LinkMobilityClient", "1.0.0"));
+			httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+			_authenticationMock.Object.AddHeader(httpClient);
+
+			_authenticationMock.Invocations.Clear();
+			_clientOptionsMock.Invocations.Clear();
+
+			ReflectionHelper.GetPrivateField<HttpClient>(client, "_httpClient")?.Dispose();
+			ReflectionHelper.SetPrivateField(client, "_httpClient", httpClient);
+
+			return client;
+		}
+	}
+}

test/LinkMobility.Tests/Utils/ValidationTest.cs

@@ -0,0 +1,33 @@
+using AMWD.Net.Api.LinkMobility.Utils;
+
+namespace LinkMobility.Tests.Utils
+{
+	[TestClass]
+	public class ValidationTest
+	{
+		[TestMethod]
+		[DataRow("10000000")]
+		[DataRow("12345678")]
+		[DataRow("123456789012345")]
+		[DataRow("14155552671")]
+		public void ShouldValidateMSISDNSuccessful(string msisdn)
+		{
+			Assert.IsTrue(Validation.IsValidMSISDN(msisdn));
+		}
+
+		[TestMethod]
+		[DataRow(null)]
+		[DataRow("")]
+		[DataRow(" ")]
+		[DataRow("012345678")]
+		[DataRow("+123456789")]
+		[DataRow("1234 5678")]
+		[DataRow("1234567")]
+		[DataRow("1234567890123456")]
+		[DataRow("abc1234567")]
+		public void ShouldValidateMSISDNNotSuccessful(string msisdn)
+		{
+			Assert.IsFalse(Validation.IsValidMSISDN(msisdn));
+		}
+	}
+}

test/LinkMobility.Tests/Webhook/Text/TextNotificationTest.cs

@@ -1,90 +1,91 @@
-using AMWD.Net.Api.LinkMobility;
-
-namespace LinkMobility.Tests.Models
-{
-	[TestClass]
-	public class IncomingMessageNotificationTest
-	{
-		[TestMethod]
-		public void ShouldParseAllPropertiesForTextNotification()
-		{
-			// Arrange
-			string json = @"{
-				""messageType"": ""text"",
-				""notificationId"": ""notif-123"",
-				""transferId"": ""trans-456"",
-				""messageFlashSms"": true,
-				""senderAddress"": ""436991234567"",
-				""senderAddressType"": ""international"",
-				""recipientAddress"": ""066012345678"",
-				""recipientAddressType"": ""national"",
-				""textMessageContent"": ""Hello from user"",
-				""userDataHeaderPresent"": false,
-				""binaryMessageContent"": [""SGVsbG8=""],
-				""deliveryReportMessageStatus"": 2,
-				""sentOn"": ""2025-12-03T12:34:56Z"",
-				""deliveredOn"": ""2025-12-03T12:35:30Z"",
-				""deliveredAs"": 1,
-				""clientMessageId"": ""client-789""
-			}";
-
-			// Act
-			bool successful = IncomingMessageNotification.TryParse(json, out var notification);
-
-			// Assert
-			Assert.IsTrue(successful, "TryParse should return true for valid json");
-			Assert.IsNotNull(notification);
-
-			Assert.AreEqual(IncomingMessageNotification.Type.Text, notification.MessageType);
-			Assert.AreEqual("notif-123", notification.NotificationId);
-			Assert.AreEqual("trans-456", notification.TransferId);
-
-			Assert.IsTrue(notification.MessageFlashSms.HasValue && notification.MessageFlashSms.Value);
-			Assert.AreEqual("436991234567", notification.SenderAddress);
-			Assert.IsTrue(notification.SenderAddressType.HasValue);
-			Assert.AreEqual(AddressType.International, notification.SenderAddressType.Value);
-
-			Assert.AreEqual("066012345678", notification.RecipientAddress);
-			Assert.IsTrue(notification.RecipientAddressType.HasValue);
-			Assert.AreEqual(AddressType.National, notification.RecipientAddressType.Value);
-
-			Assert.AreEqual("Hello from user", notification.TextMessageContent);
-			Assert.IsTrue(notification.UserDataHeaderPresent.HasValue && !notification.UserDataHeaderPresent.Value);
-
-			Assert.IsNotNull(notification.BinaryMessageContent);
-			CollectionAssert.AreEqual(new List<string> { "SGVsbG8=" }, new List<string>(notification.BinaryMessageContent));
-
-			// delivery status and deliveredAs are numeric in the test json: assert underlying integral values
-			Assert.IsTrue(notification.DeliveryReportMessageStatus.HasValue);
-			Assert.AreEqual(2, (int)notification.DeliveryReportMessageStatus.Value);
-
-			Assert.IsTrue(notification.SentOn.HasValue);
-			Assert.IsTrue(notification.DeliveredOn.HasValue);
-
-			// Compare instants in UTC
-			var expectedSent = DateTime.Parse("2025-12-03T12:34:56Z").ToUniversalTime();
-			var expectedDelivered = DateTime.Parse("2025-12-03T12:35:30Z").ToUniversalTime();
-			Assert.AreEqual(expectedSent, notification.SentOn.Value.ToUniversalTime());
-			Assert.AreEqual(expectedDelivered, notification.DeliveredOn.Value.ToUniversalTime());
-
-			Assert.IsTrue(notification.DeliveredAs.HasValue);
-			Assert.AreEqual(1, (int)notification.DeliveredAs.Value);
-
-			Assert.AreEqual("client-789", notification.ClientMessageId);
-		}
-
-		[TestMethod]
-		public void TryParseShouldReturnFalseOnInvalidJson()
-		{
-			// Arrange
-			string invalid = "this is not json";
-
-			// Act
-			bool successful = IncomingMessageNotification.TryParse(invalid, out var notification);
-
-			// Assert
-			Assert.IsFalse(successful);
-			Assert.IsNull(notification);
-		}
-	}
-}
+using AMWD.Net.Api.LinkMobility.Text;
+using AMWD.Net.Api.LinkMobility.Webhook.Text;
+
+namespace LinkMobility.Tests.Webhook.Text
+{
+	[TestClass]
+	public class TextNotificationTest
+	{
+		[TestMethod]
+		public void ShouldParseAllPropertiesForTextNotification()
+		{
+			// Arrange
+			string json = @"{
+				""messageType"": ""text"",
+				""notificationId"": ""notif-123"",
+				""transferId"": ""trans-456"",
+				""messageFlashSms"": true,
+				""senderAddress"": ""436991234567"",
+				""senderAddressType"": ""international"",
+				""recipientAddress"": ""066012345678"",
+				""recipientAddressType"": ""national"",
+				""textMessageContent"": ""Hello from user"",
+				""userDataHeaderPresent"": false,
+				""binaryMessageContent"": [""SGVsbG8=""],
+				""deliveryReportMessageStatus"": 2,
+				""sentOn"": ""2025-12-03T12:34:56Z"",
+				""deliveredOn"": ""2025-12-03T12:35:30Z"",
+				""deliveredAs"": 1,
+				""clientMessageId"": ""client-789""
+			}";
+
+			// Act
+			bool successful = TextNotification.TryParse(json, out var notification);
+
+			// Assert
+			Assert.IsTrue(successful, "TryParse should return true for valid json");
+			Assert.IsNotNull(notification);
+
+			Assert.AreEqual(TextMessageType.Text, notification.MessageType);
+			Assert.AreEqual("notif-123", notification.NotificationId);
+			Assert.AreEqual("trans-456", notification.TransferId);
+
+			Assert.IsTrue(notification.MessageFlashSms.HasValue && notification.MessageFlashSms.Value);
+			Assert.AreEqual("436991234567", notification.SenderAddress);
+			Assert.IsTrue(notification.SenderAddressType.HasValue);
+			Assert.AreEqual(AddressType.International, notification.SenderAddressType.Value);
+
+			Assert.AreEqual("066012345678", notification.RecipientAddress);
+			Assert.IsTrue(notification.RecipientAddressType.HasValue);
+			Assert.AreEqual(AddressType.National, notification.RecipientAddressType.Value);
+
+			Assert.AreEqual("Hello from user", notification.TextMessageContent);
+			Assert.IsTrue(notification.UserDataHeaderPresent.HasValue && !notification.UserDataHeaderPresent.Value);
+
+			Assert.IsNotNull(notification.BinaryMessageContent);
+			CollectionAssert.AreEqual(new List<string> { "SGVsbG8=" }, new List<string>(notification.BinaryMessageContent));
+
+			// delivery status and deliveredAs are numeric in the test json: assert underlying integral values
+			Assert.IsTrue(notification.DeliveryReportMessageStatus.HasValue);
+			Assert.AreEqual(2, (int)notification.DeliveryReportMessageStatus.Value);
+
+			Assert.IsTrue(notification.SentOn.HasValue);
+			Assert.IsTrue(notification.DeliveredOn.HasValue);
+
+			// Compare instants in UTC
+			var expectedSent = DateTime.Parse("2025-12-03T12:34:56Z").ToUniversalTime();
+			var expectedDelivered = DateTime.Parse("2025-12-03T12:35:30Z").ToUniversalTime();
+			Assert.AreEqual(expectedSent, notification.SentOn.Value.ToUniversalTime());
+			Assert.AreEqual(expectedDelivered, notification.DeliveredOn.Value.ToUniversalTime());
+
+			Assert.IsTrue(notification.DeliveredAs.HasValue);
+			Assert.AreEqual(1, (int)notification.DeliveredAs.Value);
+
+			Assert.AreEqual("client-789", notification.ClientMessageId);
+		}
+
+		[TestMethod]
+		public void TryParseShouldReturnFalseOnInvalidJson()
+		{
+			// Arrange
+			string invalid = "this is not json";
+
+			// Act
+			bool successful = TextNotification.TryParse(invalid, out var notification);
+
+			// Assert
+			Assert.IsFalse(successful);
+			Assert.IsNull(notification);
+		}
+	}
+}