From 1523ce73512fa1b9a8102a0c611e80643c2d52b5 Mon Sep 17 00:00:00 2001 From: Kamran Sadin Date: Wed, 25 Jun 2025 14:30:11 +0330 Subject: [PATCH] Update PhoneNumber validation --- .../KSMessaging/Extensions/RegisterMediatorServices.cs | 4 ++-- src/KSFramework/Utilities/ValidationExtensions.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/KSFramework/KSMessaging/Extensions/RegisterMediatorServices.cs b/src/KSFramework/KSMessaging/Extensions/RegisterMediatorServices.cs index 2d3f7bf..a680199 100644 --- a/src/KSFramework/KSMessaging/Extensions/RegisterMediatorServices.cs +++ b/src/KSFramework/KSMessaging/Extensions/RegisterMediatorServices.cs @@ -29,12 +29,12 @@ public static IServiceCollection AddKSFramework(this IServiceCollection services .FromAssemblies(assemblies) // Register request handlers - .AddClasses(c => c.AssignableTo(typeof(IRequestHandler<,>))) + .AddClasses(c => c.AssignableTo(typeof(IRequest<>))) .AsImplementedInterfaces() .WithScopedLifetime() // Register request handlers - .AddClasses(c => c.AssignableTo(typeof(IRequest<>))) + .AddClasses(c => c.AssignableTo(typeof(IRequestHandler<,>))) .AsImplementedInterfaces() .WithScopedLifetime() diff --git a/src/KSFramework/Utilities/ValidationExtensions.cs b/src/KSFramework/Utilities/ValidationExtensions.cs index ccf80ae..104b186 100644 --- a/src/KSFramework/Utilities/ValidationExtensions.cs +++ b/src/KSFramework/Utilities/ValidationExtensions.cs @@ -22,7 +22,7 @@ public static bool IsValidEmail(this string email) public static bool IsValidMobile(this string phone) { - return Regex.IsMatch(phone, @"((\(\d{3}\) ?)|(\d{3}-))?\d{3}-\d{4}"); + return Regex.IsMatch(phone, @"^(?:\+?\d{1,3}[.-\s]?)?(?:\(0?\d{1,4}\)|0?\d{1,4})?[.-\s]?\d{1,4}[.-\s]?\d{1,9}$"); } } \ No newline at end of file