Merge pull request #850 from ITfoxtec/qa

Qa
ITfoxtec · Jun 18, 2024 · b9f0dbf · b9f0dbf
2 parents 4276a30 + 2fdd1ff
commit b9f0dbf
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/FoxIDs.Control/Controllers/Helpers/TDownPartyTestController.cs b/src/FoxIDs.Control/Controllers/Helpers/TDownPartyTestController.cs
@@ -150,7 +150,7 @@ public TDownPartyTestController(FoxIDsControlSettings settings, TelemetryScopedL
                     Name = mParty.Name,
                     DisplayName = mParty.DisplayName,
                     TestUrl = testUrl,
-                    TestExpireAt = mParty.TestExpireAt,
+                    TestExpireAt = mParty.TestExpireAt.Value,
                 });
             }
             catch (ValidationException)

diff --git a/src/FoxIDs.Control/Controllers/Parties/GenericPartyApiController.cs b/src/FoxIDs.Control/Controllers/Parties/GenericPartyApiController.cs
@@ -54,7 +54,7 @@ protected async Task<ActionResult<AParty>> Get(string name)
                 var mParty = await tenantDataRepository.GetAsync<MParty>(await GetId(IsUpParty(), name));
                 if (mParty is DownParty mDownParty)
                 {
-                    if (mDownParty.IsTest)
+                    if (mDownParty.IsTest == true)
                     {
                         var mDownPartyTest = await tenantDataRepository.GetAsync<OidcDownPartyTest>(await DownParty.IdFormatAsync(RouteBinding, name));
                         var arDownPartyTest = mapper.Map<Api.OidcDownParty>(mDownPartyTest);
@@ -163,7 +163,7 @@ protected async Task<ActionResult<AParty>> Put(AParty party, Func<AParty, ValueT
                         mOidcDownParty.Client.Secrets = tempMParty.Client.Secrets;
                     }
 
-                    if(tempMParty.IsTest)
+                    if(tempMParty.IsTest == true)
                     {
                         var tempMPartyTest = await tenantDataRepository.GetAsync<OidcDownPartyTest>(mParty.Id);
                         tempMPartyTest.TestExpireAt = DateTimeOffset.UtcNow.AddSeconds(settings.DownPartyTestLifetime).ToUnixTimeSeconds();

diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.6.8</Version>
+		<Version>1.6.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Control/Logic/PartyLogic.cs b/src/FoxIDs.Control/Logic/PartyLogic.cs
@@ -35,7 +35,7 @@ public async Task DeleteExporedDownParties()
         {
             var idKey = new Track.IdKey { TenantName = RouteBinding.TenantName, TrackName = RouteBinding.TrackName };
             var now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-            await tenantDataRepository.DeleteListAsync<DownParty>(idKey, whereQuery: p => p.DataType.Equals(Constants.Models.DataType.DownParty) && p.TestExpireAt < now);
+            await tenantDataRepository.DeleteListAsync<DownParty>(idKey, whereQuery: p => p.DataType.Equals(Constants.Models.DataType.DownParty) && p.IsTest == true && p.TestExpireAt < now);
         }
     }
 }
diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.6.8</Version>
+		<Version>1.6.9</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.6.8</Version>
+		<Version>1.6.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.6.8</Version>
+		<Version>1.6.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/Models/Parties/DownParty.cs b/src/FoxIDs.Shared/Models/Parties/DownParty.cs
@@ -47,14 +47,14 @@ public static async Task<string> IdFormatAsync(RouteBinding routeBinding, string
 
         #region TestApp
         [JsonProperty(PropertyName = "is_test")]
-        public bool IsTest { get; set; }
+        public bool? IsTest { get; set; }
 
         [MaxLength(Constants.Models.DownParty.UrlLengthMax)]
         [JsonProperty(PropertyName = "test_url")]
         public string TestUrl { get; set; }
 
         [JsonProperty(PropertyName = "test_expire_at")]
-        public long TestExpireAt { get; set; }
+        public long? TestExpireAt { get; set; }
         #endregion
 
         public async Task SetIdAsync(IdKey idKey)

diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.6.8</Version>
+		<Version>1.6.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.6.8</Version>
+		<Version>1.6.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>