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

Merge branch 'main' into epic/1256-bidiko

# Conflicts:
#	Examples/ConsoleAppExample/ConsoleAppExample.csproj
#	FitConnect/ClientFactory.cs
#	FitConnect/FitConnect.csproj
#	Tests/BasicUnitTest/BasicUnitTest.csproj
#	Tests/BasicUnitTest/SubscriberTests.cs
#	Tests/E2ETest/E2ETest.csproj
#	Tests/EncryptionTests/EncryptionTests.csproj
#	Tests/IntegrationTests/IntegrationTests.csproj
#	Tests/IntegrationTests/Routing/RoutingTests.cs
#	Tests/MockContainer/MockContainer.csproj
parents 51f87180 0ea49e8d
No related branches found
No related tags found
1 merge request!94Epic/1256 bidiko
File added
......@@ -48,6 +48,7 @@ public static class ClientFactory {
List<string> privateDecryptionKeys,
string privateSigningKey,
ILogger? logger = null) {
CheckKeysForValidJsonFormat(privateDecryptionKeys, privateSigningKey);
if (privateDecryptionKeys.Count != 1)
......@@ -66,7 +67,7 @@ public static class ClientFactory {
private static void CheckKeysForValidJsonFormat(List<string> privateDecryptionKeys,
string privateSigningKey) {
foreach (var key in privateDecryptionKeys)
foreach (var key in privateDecryptionKeys){
try {
var json = JObject.Parse(key);
}
......@@ -74,6 +75,7 @@ public static class ClientFactory {
throw new FitConnectInitialisationException(
"Private decryption key is not in valid JSON format", e);
}
}
try {
var json = JObject.Parse(privateSigningKey);
......
......@@ -12,6 +12,9 @@ namespace BasicUnitTest;
[TestFixture]
public class SubscriberTests {
IFitConnectSettings _settings = null!;
[SetUp]
public void Setup() {
var container = Container.Create();
......
......@@ -163,6 +163,7 @@ public class AutoRejectReplyChannel : EndToEndTestBase {
}
[Ignore("missing feature from other branch, reactivate after merge 717")]
[Test]
[Order(70)]
public void T070_SendingSubmissionWithReplyChannel_ToDestinationWithoutReplyChannel_ThrowsError() {
......
......@@ -69,7 +69,7 @@ public class RoutingTests {
route.DestinationSignature.Should().NotBeNull();
}
[Ignore("Invalid result from server")]
[Ignore("Invalid server response")]
[TestCase("99123456760610", "931")]
public void FindDestination_WithAreaId(string leika, string areaId) {
// Arrange
......
......@@ -3,5 +3,14 @@
"extends": [
"config:base",
"local>fit-connect/renovate/renovate-config"
]
],
"major": {
"enabled": false
},
"minor": {
"enabled": true
},
"patch": {
"enabled": true
}
}
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