Skip to content
Snippets Groups Projects
Commit de3cddc4 authored by Klaus Fischer's avatar Klaus Fischer
Browse files

Merge branch 'feature/564-routing-api' of...

Merge branch 'feature/564-routing-api' of https://git.fitko.de/fit-connect/sdk-dotnet into feature/564-routing-api

# Conflicts:
#	BasicUnitTest/SecurityEventTokenTests.cs
#	E2ETest/EndToEndTestBase.cs
#	FitConnect/Models/FitConnectEnvironment.cs
#	FitConnect/Models/SecurityEventToken.cs
#	FitConnect/Properties/AssemblyInfo.cs
#	FitConnect/Subscriber.cs
#	IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs
parents 2480a1c7 04f57e1f
No related branches found
No related tags found
1 merge request!6Routing Api
...@@ -26,6 +26,7 @@ public class SecurityEventTokenTests { ...@@ -26,6 +26,7 @@ public class SecurityEventTokenTests {
_encryption = new FitEncryption(container.Resolve<KeySet>(), null); _encryption = new FitEncryption(container.Resolve<KeySet>(), null);
} }
private FitEncryption _encryption = null!;
[Test] [Test]
public void CreateJwt_AcceptSubmission() { public void CreateJwt_AcceptSubmission() {
...@@ -139,7 +140,7 @@ public class SecurityEventTokenTests { ...@@ -139,7 +140,7 @@ public class SecurityEventTokenTests {
var token = _encryption.CreateSecurityEventToken(Guid.NewGuid().ToString(), var token = _encryption.CreateSecurityEventToken(Guid.NewGuid().ToString(),
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(),
rejectSubmission,
new[] { new Problems() { Description = "A real big issue" } } new[] { new Problems() { Description = "A real big issue" } }
); );
Console.WriteLine(token); Console.WriteLine(token);
......
...@@ -9,6 +9,8 @@ using MockContainer; ...@@ -9,6 +9,8 @@ using MockContainer;
namespace E2ETest; namespace E2ETest;
public abstract class EndToEndTestBase { public abstract class EndToEndTestBase {
protected ISender Sender = null!;
protected ISubscriber Subscriber = null!;
protected ILogger Logger = null!; protected ILogger Logger = null!;
protected ISender Sender = null!; protected ISender Sender = null!;
protected MockSettings Settings = null!; protected MockSettings Settings = null!;
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<ItemGroup> <ItemGroup>
<None Remove="metadata.schema.json" /> <None Remove="metadata.schema.json" />
<EmbeddedResource Include="metadata.schema.json" /> <EmbeddedResource Include="metadata.schema.json" />
<Compile Remove="Properties\AssemblyInfo.cs" />
<None Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
namespace FitConnect.Models; namespace FitConnect.Models;
// public enum FitConnectEnvironment {
// Development,
// Testing,
// Production
// }
public class FitConnectEnvironment { public class FitConnectEnvironment {
public static readonly FitConnectEnvironment Testing = new( public static readonly FitConnectEnvironment Testing = new(
......
...@@ -80,7 +80,7 @@ public class SecurityEventToken { ...@@ -80,7 +80,7 @@ public class SecurityEventToken {
if (eventsClaim.Value.Contains( if (eventsClaim.Value.Contains(
ForwardSubmissionSchema)) ForwardSubmissionSchema))
return EventType.Forward; return EventType.Forward;
if (eventsClaim.Value.Contains( if (eventsClaim.Value.Contains(Reject)) {
RejectSubmissionSchema)) { RejectSubmissionSchema)) {
Problems = GetProblems(events?.Values?.FirstOrDefault()?.ToString() ?? ""); Problems = GetProblems(events?.Values?.FirstOrDefault()?.ToString() ?? "");
return EventType.Reject; return EventType.Reject;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment