Merge pull request #1056 from ITfoxtec/1.12.x-development

Client, add catch TokenUnavailableException in SetHourPrice method.
ITfoxtec · Nov 26, 2024 · 999190a · 999190a
2 parents efad6b3 + 9cf656c
commit 999190a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
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.12.7</Version>
+		<Version>1.12.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

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.12.7</Version>
+		<Version>1.12.8</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlClient/Pages/Usage/Usage.cs b/src/FoxIDs.ControlClient/Pages/Usage/Usage.cs
@@ -249,15 +249,22 @@ private async Task UsedViewModelAfterInitAsync(GeneralUsedViewModel generalUsed,
 
         private async Task SetHourPrice(GeneralUsedViewModel generalUsed)
         {
-            var tenant = await TenantService.GetTenantAsync(generalUsed.TenantName);
-            if (tenant.HourPrice > 0)
+            try
             {
-                generalUsed.HourPrice = tenant.HourPrice.Value;
+                var tenant = await TenantService.GetTenantAsync(generalUsed.TenantName);
+                if (tenant.HourPrice > 0)
+                {
+                    generalUsed.HourPrice = tenant.HourPrice.Value;
+                }
+                else
+                {
+                    var rate = GetExchangesRate(tenant.Currency, usageSettings.CurrencyExchanges);
+                    generalUsed.HourPrice = decimal.Round(usageSettings.HourPrice * rate, 2);
+                }
             }
-            else
+            catch (TokenUnavailableException)
             {
-                var rate = GetExchangesRate(tenant.Currency, usageSettings.CurrencyExchanges);
-                generalUsed.HourPrice = decimal.Round(usageSettings.HourPrice * rate, 2);
+                await (OpenidConnectPkce as TenantOpenidConnectPkce).TenantLoginAsync();
             }
         }
 

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.12.7</Version>
+		<Version>1.12.8</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.12.7</Version>
+		<Version>1.12.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

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.12.7</Version>
+		<Version>1.12.8</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.12.7</Version>
+		<Version>1.12.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>