From da9b4311ef006eb16fae1ccc5ed66c566c4079e3 Mon Sep 17 00:00:00 2001
From: Klaus Fischer <klaus.fischer@eloware.com>
Date: Tue, 23 Aug 2022 21:33:05 +0200
Subject: [PATCH] Resovled merge errors
---
BasicUnitTest/SecurityEventTokenTests.cs | 3 +--
E2ETest/EndToEndTestBase.cs | 2 --
FitConnect/FitConnect.csproj | 2 --
FitConnect/Models/SecurityEventToken.cs | 2 +-
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/BasicUnitTest/SecurityEventTokenTests.cs b/BasicUnitTest/SecurityEventTokenTests.cs
index 9482e14a..09fce920 100644
--- a/BasicUnitTest/SecurityEventTokenTests.cs
+++ b/BasicUnitTest/SecurityEventTokenTests.cs
@@ -26,7 +26,6 @@ public class SecurityEventTokenTests {
_encryption = new FitEncryption(container.Resolve<KeySet>(), null);
}
- private FitEncryption _encryption = null!;
[Test]
public void CreateJwt_AcceptSubmission() {
@@ -140,7 +139,7 @@ public class SecurityEventTokenTests {
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);
diff --git a/E2ETest/EndToEndTestBase.cs b/E2ETest/EndToEndTestBase.cs
index 1c462b5b..d4bd4250 100644
--- a/E2ETest/EndToEndTestBase.cs
+++ b/E2ETest/EndToEndTestBase.cs
@@ -9,8 +9,6 @@ using MockContainer;
namespace E2ETest;
public abstract class EndToEndTestBase {
- protected ISender Sender = null!;
- protected ISubscriber Subscriber = null!;
protected ILogger Logger = null!;
protected ISender Sender = null!;
protected MockSettings Settings = null!;
diff --git a/FitConnect/FitConnect.csproj b/FitConnect/FitConnect.csproj
index cf6820bd..c4077619 100644
--- a/FitConnect/FitConnect.csproj
+++ b/FitConnect/FitConnect.csproj
@@ -27,8 +27,6 @@
<ItemGroup>
<None Remove="metadata.schema.json" />
<EmbeddedResource Include="metadata.schema.json" />
- <Compile Remove="Properties\AssemblyInfo.cs" />
- <None Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/FitConnect/Models/SecurityEventToken.cs b/FitConnect/Models/SecurityEventToken.cs
index d267ef58..94fba7ac 100644
--- a/FitConnect/Models/SecurityEventToken.cs
+++ b/FitConnect/Models/SecurityEventToken.cs
@@ -80,7 +80,7 @@ public class SecurityEventToken {
if (eventsClaim.Value.Contains(
ForwardSubmissionSchema))
return EventType.Forward;
- if (eventsClaim.Value.Contains(Reject)) {
+ if (eventsClaim.Value.Contains(
RejectSubmissionSchema)) {
Problems = GetProblems(events?.Values?.FirstOrDefault()?.ToString() ?? "");
return EventType.Reject;
--
GitLab