Resolved merge errors

BasicUnitTest/SecurityEventTokenTests.cs

@@ -14,12 +14,12 @@ namespace BasicUnitTest;
 [TestFixture]
 public class SecurityEventTokenTests {
     private const string rejectSubmission =
-        "https://schema.fitko.de/fit-connect/events/reject-submission";
+        SecurityEventToken.RejectSubmissionSchema;
 
     private FitEncryption _encryption = null!;
 
     private const string acceptSubmission =
-        "https://schema.fitko.de/fit-connect/events/accept-submission";
+        SecurityEventToken.AcceptSubmissionSchema;
 
     [SetUp]
     public void Setup() {
@@ -27,15 +27,12 @@ public class SecurityEventTokenTests {
         _encryption = new FitEncryption(container.Resolve<KeySet>(), null);
     }
 
-    private FitEncryption _encryption = null!;
 
     [Test]
     public void CreateJwt_AcceptSubmission() {
         var token = _encryption.CreateAcceptSecurityEventToken(new SubmissionForPickupDto {
             SubmissionId = Guid.NewGuid().ToString(), CaseId = Guid.NewGuid().ToString(),
-            DestinationId = Guid.NewGuid().ToString()
-            acceptSubmission,
-            null
+            DestinationId = Guid.NewGuid().ToString(),
         });
         Console.WriteLine(token);
         var decoded = new SecurityEventToken(token);
@@ -49,7 +46,6 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateRejectSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
             new[] { Problems.EncryptionIssue }
         );
         Console.WriteLine(token);
@@ -64,7 +60,6 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateRejectSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
             new[] { Problems.MissingSchema }
         );
         Console.WriteLine(token);
@@ -80,7 +75,6 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateRejectSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
             new[] { Problems.SchemaViolation }
         );
         Console.WriteLine(token);
@@ -95,7 +89,6 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateRejectSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
             new[] { Problems.SyntaxViolation }
         );
         Console.WriteLine(token);
@@ -111,7 +104,6 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateRejectSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
             new[] { Problems.UnsupportedSchema }
         );
         Console.WriteLine(token);
@@ -126,7 +118,6 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateRejectSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
             new[] { Problems.IncorrectAuthenticationTag }
         );
         Console.WriteLine(token);
@@ -135,19 +126,4 @@ public class SecurityEventTokenTests {
             .Be(rejectSubmission);
         decoded.EventType.Should().Be(EventType.Reject);
     }
-
-    [Test]
-    public void CreateJwt_Reject_WithCustomProblem() {
-        var token = _encryption.CreateSecurityEventToken(Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(),
-            Guid.NewGuid().ToString(),
-            rejectSubmission,
-            new[] { new Problems() { Description = "A real big issue" } }
-        );
-        Console.WriteLine(token);
-        var decoded = new FitConnect.Models.SecurityEventToken(token);
-        decoded.Event?.Type.Should()
-            .Be(rejectSubmission);
-        decoded.EventType.Should().Be(EventType.Reject);
-    }
 }

FitConnect/Router.cs

@@ -13,7 +13,7 @@ using Route = FitConnect.Services.Models.v1.Routes.Route;
 
 namespace FitConnect;
 
-public class Router : IRouter {
+internal class Router : IRouter {
     private readonly FitConnectEnvironment _environment;
     private readonly ILogger? _logger;
     private readonly IRouteService _routeService;

FitConnect/Services/Interfaces/ISelfServicePortalService.cs

@@ -4,5 +4,5 @@ using Microsoft.IdentityModel.Tokens;
 namespace FitConnect.Services;
 
 public interface ISelfServicePortalService {
-    public Task<JsonWebKeySet> GetSelfServiceValidationJwk();
+    public Task<JsonWebKeySet> GetValidationJwk();
 }

FitConnect/Services/RouteService.cs

@@ -6,7 +6,7 @@ using Route = FitConnect.Services.Models.v1.Routes.Route;
 
 namespace FitConnect.Services;
 
-public class RouteService : RestCallService, IRouteService {
+internal class RouteService : RestCallService, IRouteService {
     public RouteService(string baseUrl, string version = "v1",
         ILogger? logger = null) : base($"{baseUrl}/{version}", logger) {
     }

FitConnect/Services/SelfServicePortalService.cs

-using FitConnect.Services.Interfaces;
+using Jose;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 

IntegrationTests/JwtTokenValidation.cs

@@ -7,23 +7,6 @@ namespace IntegrationTests;
 
 [TestFixture]
 public class JwtTokenValidation {
-    [Test]
-    public void ExampleFromWeb_passes() {
-        var result = FitEncryption.VerifyJwt(
-            "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lLCBpcyBteSBuYW1lIiwiaWF0IjoxNTE2MjM5MDIyfQ.b-j_VvzOD6BAXc6jYOPl38eESJT4zzGrKlhX7j1gNfY",
-            "your-512-bit-secret");
-
-        result.Should().BeTrue();
-    }
-
-    [Test]
-    public void ExampleFromWeb_fails() {
-        var result = FitEncryption.VerifyJwt(
-            "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lLCBpcyBteSBuYW1lIiwiaWF0IjoxNTE2MjM5MDIyfQ.b-j_VvzOD6BAXc6jYOPl38eESJT4zzGrKlhX7j1gNfY",
-            "what_was_this?");
-
-        result.Should().BeFalse();
-    }
 
     [Test]
     public void ExampleFromFitConnect_passes() {