Merge pull request #69 from GarageGroup/custom-clasim-provider-fix

Fix the non-retryable error when provide custom claims

Author: dotnetenjoyer

src/endpoint/Claims.Provide/Contract/AuthenticationContext.cs

@@ -1,6 +1,10 @@
+using System;
+
 namespace GarageGroup.Internal.Timesheet;
 
 public sealed record class AuthenticationContext
 {
+    public Guid CorrelationId { get; init; }
+    
     public User? User { get; init; }
 }

src/endpoint/Claims.Provide/Contract/Claims.cs

@@ -4,5 +4,7 @@ namespace GarageGroup.Internal.Timesheet;
 
 public sealed record class Claims
 {
+    public required Guid CorrelationId { get; init; }
+    
     public required Guid SystemUserId { get; init; }
 }

src/endpoint/Claims.Provide/Contract/ClaimsProvideFailureCode.cs

@@ -1,7 +1,13 @@
+using GarageGroup.Infra;
+
 namespace GarageGroup.Internal.Timesheet;
 
 public enum ClaimsProvideFailureCode
 {
     Unknown,
-    InvalidQuery
+    
+    InvalidQuery,
+    
+    [Problem(FailureStatusCode.NotFound, "System user was not found")]
+    UserNotFound
 }

src/endpoint/Claims.Provide/Endpoint/Func/ClaimsProvideFunc.cs

@@ -4,4 +4,11 @@ namespace GarageGroup.Internal.Timesheet;
 
 internal sealed partial class ClaimsProvideFunc(IDataverseEntityGetSupplier dataverseApi) : IClaimsProvideFunc
 {
+    private static ClaimsProvideFailureCode MapFailureCodeWhenSearchingForUser(DataverseFailureCode failureCode)
+        => 
+        failureCode switch
+        {
+            DataverseFailureCode.RecordNotFound => ClaimsProvideFailureCode.UserNotFound,
+            _ => ClaimsProvideFailureCode.Unknown
+        };
 }

src/endpoint/Claims.Provide/Endpoint/Func/Func.Invoke.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using GarageGroup.Infra;
 using GarageGroup.Internal.Timesheet.Inner;
 
 namespace GarageGroup.Internal.Timesheet;
@@ -18,9 +19,9 @@ public ValueTask<Result<ClaimsProvideOut, Failure<ClaimsProvideFailureCode>>> In
             UserJson.BuildGetInput)
         .ForwardValue(
             dataverseApi.GetEntityAsync<UserJson>,
-            static failure => failure.WithFailureCode(ClaimsProvideFailureCode.Unknown))
+            static failure => failure.MapFailureCode(MapFailureCodeWhenSearchingForUser))
         .MapSuccess(
-            static systemUser => new ClaimsProvideOut
+            systemUser => new ClaimsProvideOut
             {
                 Data = new AuthenticationEventResponseData
                 {
@@ -30,6 +31,7 @@ public ValueTask<Result<ClaimsProvideOut, Failure<ClaimsProvideFailureCode>>> In
                         {
                             Claims = new Claims
                             {
+                                CorrelationId = input.Data?.AuthenticationContext?.CorrelationId ?? default,
                                 SystemUserId = systemUser.Value.Id
                             }
                         }

src/endpoint/Claims.Provide/Test/Func.Test/ClaimsProvideFuncTest.cs

@@ -14,6 +14,7 @@ private static readonly ClaimsProvideIn SomeInput
         {
             AuthenticationContext = new()
             {
+                CorrelationId = Guid.Parse("1282002b-6a8b-418f-b481-67844abb0cc5"),
                 User = new()
                 {
                     Id = Guid.Parse("5b228f06-d220-4006-844a-374df853108d")

src/endpoint/Claims.Provide/Test/Func.Test/Test.InvokeAsync.cs

@@ -57,19 +57,19 @@ public static async Task InvokeAsync_InputIsValid_ExpectGetUserCalledOnce()
     }
 
     [Theory]
-    [InlineData(DataverseFailureCode.Unknown)]
-    [InlineData(DataverseFailureCode.Unauthorized)]
-    [InlineData(DataverseFailureCode.RecordNotFound)]
-    [InlineData(DataverseFailureCode.PicklistValueOutOfRange)]
-    [InlineData(DataverseFailureCode.UserNotEnabled)]
-    [InlineData(DataverseFailureCode.PrivilegeDenied)]
-    [InlineData(DataverseFailureCode.Throttling)]
-    [InlineData(DataverseFailureCode.SearchableEntityNotFound)]
-    [InlineData(DataverseFailureCode.DuplicateRecord)]
-    [InlineData(DataverseFailureCode.InvalidPayload)]
-    [InlineData(DataverseFailureCode.InvalidFileSize)]
+    [InlineData(DataverseFailureCode.Unknown, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.Unauthorized, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.RecordNotFound, ClaimsProvideFailureCode.UserNotFound)]
+    [InlineData(DataverseFailureCode.PicklistValueOutOfRange, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.UserNotEnabled, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.PrivilegeDenied, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.Throttling, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.SearchableEntityNotFound, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.DuplicateRecord, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.InvalidPayload, ClaimsProvideFailureCode.Unknown)]
+    [InlineData(DataverseFailureCode.InvalidFileSize, ClaimsProvideFailureCode.Unknown)]
     public static async Task InvokeAsync_GetUserResultIsFailure_ExpectUnknownFailure(
-        DataverseFailureCode sourceFailureCode)
+        DataverseFailureCode sourceFailureCode, ClaimsProvideFailureCode expectedFailureCode)
     {
         var sourceException = new Exception("Some exception message");
         var dataverseFailure = sourceException.ToFailure(sourceFailureCode, "Some failure text");
@@ -80,7 +80,7 @@ public static async Task InvokeAsync_GetUserResultIsFailure_ExpectUnknownFailure
         var cancellationToken = CancellationToken.None;
 
         var actual = await func.InvokeAsync(SomeInput, cancellationToken);
-        var expected = Failure.Create(ClaimsProvideFailureCode.Unknown, "Some failure text", sourceException);
+        var expected = Failure.Create(expectedFailureCode, "Some failure text", sourceException);
 
         Assert.StrictEqual(expected, actual);
     }
@@ -94,8 +94,21 @@ public static async Task InvokeAsync_GetUserResultIsSuccess_ExpectSuccess()
         });
         var mockDataverseApi = BuildDataverseMock(dataverseGetUserResult);
 
+        var input = new ClaimsProvideIn(
+            new AuthenticationEventData
+            {
+                AuthenticationContext = new AuthenticationContext
+                {
+                    CorrelationId = Guid.Parse("97d7f13b-24e2-461e-9b57-8d8e3d9d9ba3"),
+                    User = new User
+                    {
+                        Id = Guid.Parse("ac9fdb67-8321-4757-8bd8-3066ca55f7d9")
+                    }
+                }
+            });
+        
         var func = new ClaimsProvideFunc(mockDataverseApi.Object);
-        var actual = await func.InvokeAsync(SomeInput, CancellationToken.None);
+        var actual = await func.InvokeAsync(input, CancellationToken.None);
 
         var expected = new ClaimsProvideOut
         {
@@ -107,6 +120,7 @@ public static async Task InvokeAsync_GetUserResultIsSuccess_ExpectSuccess()
                     {
                         Claims = new Claims
                         {
+                            CorrelationId = Guid.Parse("97d7f13b-24e2-461e-9b57-8d8e3d9d9ba3"),
                             SystemUserId = Guid.Parse("eea93cde-6bbf-4137-a6b9-f6c75d8ea10c")
                         }
                     }