Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	src/SharedKernel/SharedKernel.csproj

Author: DaveMatosyan

Readme.md

@@ -130,7 +130,7 @@ AssemblyRegistry.Add(typeof(Program).Assembly);
 builder
    .ConfigureWithPandaVault()
    .AddSerilog()
-   .AddResponseCrafter(NamingConvention.ToSnakeCase)
+   .AddResponseCrafter(NamingConvention.ToUpperSnakeCase)
    .AddOpenApi()
    .AddOpenTelemetry()
    .AddMapMinimalApis(AssemblyRegistry.ToArray())
@@ -404,6 +404,9 @@ The package includes extension methods to simplify common validation scenarios:
 - String Validations:
     - IsValidJson(): Validates that a string is a valid JSON.
     - IsXssSanitized(): Validates that a string is sanitized against XSS attacks.
+    - IsEmail(): Validates that a string is a valid email address. Native one is not working correctly.
+    - IsPhoneNumber(): Validates that a string is a valid phone number. Format requires area code to be in `()`.
+    - IsEmailOrPhoneNumber(): Validates that a string is either a valid email address or a valid phone number.
 
 ## Cors
 

Shared.Kernel.Demo/Program.cs

@@ -25,7 +25,7 @@
    .AddControllers(AssemblyRegistry.ToArray())
    .AddMediatrWithBehaviors(AssemblyRegistry.ToArray())
    .AddResilienceDefaultPipeline()
-  // .AddRedis(KeyPrefix.AssemblyNamePrefix)
+   // .AddRedis(KeyPrefix.AssemblyNamePrefix)
    //.AddDistributedSignalR("DistributedSignalR") // or .AddSignalR()
    .MapDefaultTimeZone()
    .AddCors()

src/SharedKernel/Extensions/HttpContextExtensions.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Http;
+
+namespace SharedKernel.Extensions;
+
+public static class HttpContextExtensions
+{
+   public static void MarkAsPrivateEndpoint(this HttpContext context)
+   {
+      context.Response.Headers.Append("X-Private-Endpoint", "1");
+   }
+
+   public static void MarkAsPrivateEndpoint(this HttpResponse response)
+   {
+      response.Headers.Append("X-Private-Endpoint", "1");
+   }
+
+   public static void MarkAsPrivateEndpoint(this IHttpContextAccessor contextAccessor)
+   {
+      contextAccessor.HttpContext?.Response.Headers.Append("X-Private-Endpoint", "1");
+   }
+   
+   public static void MarkAsPrivateEndpoint(this HttpContextAccessor contextAccessor)
+   {
+      contextAccessor.HttpContext?.Response.Headers.Append("X-Private-Endpoint", "1");
+   }
+}

src/SharedKernel/Extensions/SignalRExtensions.cs

@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
+using ResponseCrafter.ExceptionHandlers.SignalR;
 using StackExchange.Redis;
 
 namespace SharedKernel.Extensions;
@@ -11,7 +13,7 @@ public static WebApplicationBuilder AddSignalR(this WebApplicationBuilder builde
    {
       builder
          .Services
-         .AddSignalR()
+         .AddSignalR(o => o.AddFilter<SignalRExceptionFilter>())
          .AddMessagePackProtocol();
 
       return builder;
@@ -21,7 +23,7 @@ public static WebApplicationBuilder AddDistributedSignalR(this WebApplicationBui
    {
       builder
          .Services
-         .AddSignalR()
+         .AddSignalR(o => o.AddFilter<SignalRExceptionFilter>())
          .AddMessagePackProtocol()
          .AddStackExchangeRedis(builder.Configuration.GetRedisUrl(),
             options =>

src/SharedKernel/Logging/RequestResponseLoggingMiddleware.cs

@@ -19,7 +19,7 @@ internal class RequestResponseLoggingMiddleware(RequestDelegate next, ILogger<Re
 
    public async Task InvokeAsync(HttpContext context)
    {
-      if (context.Request.Method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
+      if (HttpMethods.IsOptions(context.Request.Method))
       {
          await next(context);
          return;
@@ -31,6 +31,7 @@ public async Task InvokeAsync(HttpContext context)
       var originalBodyStream = context.Response.Body;
       await using var responseBody = new MemoryStream();
       context.Response.Body = responseBody;
+      
       var stopwatch = Stopwatch.GetTimestamp();
       try
       {
@@ -81,7 +82,6 @@ public async Task InvokeAsync(HttpContext context)
       var body = await reader.ReadToEndAsync();
       var sanitizedHeaders = JsonSerializer.Serialize(RedactSensitiveData(headers));
       var bodyContent = JsonSerializer.Serialize(ParseAndRedactJson(body));
-
       return (sanitizedHeaders, bodyContent);
    }
 

src/SharedKernel/SharedKernel.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.19</Version>
+        <Version>1.0.23</Version>
         <PackageId>Pandatech.SharedKernel</PackageId>
         <Title>Pandatech Shared Kernel Library</Title>
         <PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
@@ -27,8 +27,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="8.0.1" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />        
+        <PackageReference Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="9.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />        
         <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.12.3" />
         <PackageReference Include="FluentDateTime" Version="3.0.0" />
         <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
@@ -51,8 +51,8 @@
         <PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="2.0.1" />
         <PackageReference Include="Pandatech.PandaVaultClient" Version="4.0.3" />
         <PackageReference Include="Pandatech.RegexBox" Version="3.0.0" />
-        <PackageReference Include="Pandatech.ResponseCrafter" Version="5.1.4" />
-        <PackageReference Include="Scalar.AspNetCore" Version="1.2.51" />
+        <PackageReference Include="Pandatech.ResponseCrafter" Version="5.1.3" />
+        <PackageReference Include="Scalar.AspNetCore" Version="1.2.66" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
     </ItemGroup>

src/SharedKernel/ValidatorAndMediatR/Validators/ValidatorExtensions.cs

@@ -1,10 +1,35 @@
 using FluentValidation;
 using Microsoft.AspNetCore.Http;
+using RegexBox;
 
 namespace SharedKernel.ValidatorAndMediatR.Validators;
 
 public static class ValidatorExtensions
 {
+   public static IRuleBuilderOptions<T, string?> IsEmail<T>(this IRuleBuilder<T, string?> ruleBuilder)
+   {
+      return ruleBuilder.Must(x => x is null || PandaValidator.IsEmail(x))
+                        .WithMessage("email_format_is_not_valid");
+   }
+
+   public static IRuleBuilderOptions<T, string?> IsPhoneNumber<T>(this IRuleBuilder<T, string?> ruleBuilder)
+   {
+      return ruleBuilder.Must(x => x is null || PandaValidator.IsPandaFormattedPhoneNumber(x))
+                        .WithMessage("phone_number_format_is_not_valid");
+   }
+
+   public static IRuleBuilderOptions<T, string?> IsEmailOrPhoneNumber<T>(this IRuleBuilder<T, string?> ruleBuilder)
+   {
+      return ruleBuilder
+             .Must(x => x is null || PandaValidator.IsPandaFormattedPhoneNumber(x) || PandaValidator.IsEmail(x))
+             .WithMessage("phone_number_or_email_format_is_not_valid");
+   }
+
+   public static IRuleBuilderOptions<T, string?> IsPhoneNumberOrEmail<T>(this IRuleBuilder<T, string?> ruleBuilder)
+   {
+      return ruleBuilder.IsEmailOrPhoneNumber();
+   }
+
    public static IRuleBuilderOptions<T, IFormFile?> HasMaxFileSize<T>(this IRuleBuilder<T, IFormFile?> ruleBuilder,
       int maxFileSizeInMb)
    {

test/SharedKernel.Tests/SharedKernel.Tests.csproj

@@ -12,7 +12,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>