Merge pull request #1060 from ITfoxtec/test

Test
ITfoxtec · Nov 27, 2024 · 031de37 · 031de37
2 parents c9af149 + 600b8fd
commit 031de37
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 27 deletions.
diff --git a/src/FoxIDs.Control/Controllers/Tenants/TMyTenantController.cs b/src/FoxIDs.Control/Controllers/Tenants/TMyTenantController.cs
@@ -116,7 +116,7 @@ public TMyTenantController(FoxIDsControlSettings settings, TelemetryScopedLogger
                     logger.Error(exp, "Unable to update plan in tenant.");
                 }
 
-                if(!mTenant.CustomDomain.Equals(tenant.CustomDomain, StringComparison.OrdinalIgnoreCase))
+                if(mTenant.CustomDomain.IsNullOrEmpty() || !mTenant.CustomDomain.Equals(tenant.CustomDomain, StringComparison.OrdinalIgnoreCase))
                 {
                     mTenant.CustomDomain = tenant.CustomDomain?.ToLower();
                     mTenant.CustomDomainVerified = false;

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

diff --git a/src/FoxIDs.ControlClient/Logic/RouteBindingLogic.cs b/src/FoxIDs.ControlClient/Logic/RouteBindingLogic.cs
@@ -44,32 +44,21 @@ public RouteBindingLogic(ClientSettings clientSettings, IServiceProvider service
 
         public bool RequestPayment { get; private set; }
 
-        public async Task SetMyTenantAsync(TenantResponse tenant)
+        public void SetMyTenant(TenantResponse tenant)
         {
             myTenant = tenant;
 
             if (!IsMasterTenant && clientSettings.EnablePayment)
             {
-                await UpdatRequestPaymentAsync(myTenant);
+                UpdatRequestPayment(myTenant);
             }
         }
 
-        private async Task UpdatRequestPaymentAsync(TenantResponse myTenant)
+        private void UpdatRequestPayment(TenantResponse myTenant)
         {
-            if (myTenant.EnableUsage && myTenant.DoPayment && !myTenant.PlanName.IsNullOrEmpty() && "free" != myTenant.PlanName && myTenant.Payment?.IsActive != true)
+            if (myTenant.DoPayment && myTenant.Payment?.IsActive != true)
             {
-                var helpersService = serviceProvider.GetService<HelpersService>();
-                var planInfoList = await helpersService.GetPlanInfoAsync();
-
-                decimal planCost = planInfoList.Where(p => p.Name == myTenant.PlanName).Select(p => p.CostPerMonth).FirstOrDefault();
-                if (planCost > 0)
-                {
-                    RequestPayment = true;
-                }
-                else
-                {
-                    RequestPayment = false;
-                }
+                RequestPayment = true;
             }
             else
             {
@@ -152,7 +141,7 @@ private async Task LoadMyTenantAsync()
             if (authenticationState.User.Identity.IsAuthenticated && !IsMasterTenant)
             {
                 var myTenantService = serviceProvider.GetService<MyTenantService>();
-                await SetMyTenantAsync(await myTenantService.GetTenantAsync());
+                SetMyTenant(await myTenantService.GetTenantAsync());
             }
         }
     }

diff --git a/src/FoxIDs.ControlClient/Models/ViewModels/Tenants/TenantViewModel.cs b/src/FoxIDs.ControlClient/Models/ViewModels/Tenants/TenantViewModel.cs
@@ -23,7 +23,7 @@ public class TenantViewModel
         [Display(Name = "Enable usage")]
         public bool EnableUsage { get; set; }
 
-        [Display(Name = "Do payment")]
+        [Display(Name = "Do card payment")]
         public bool DoPayment { get; set; }
 
         /// <summary>

diff --git a/src/FoxIDs.ControlClient/Pages/MasterTenant.cs b/src/FoxIDs.ControlClient/Pages/MasterTenant.cs
@@ -57,6 +57,9 @@ public partial class MasterTenant
         [Inject]
         public MyTenantService MyTenantService { get; set; }
 
+        [Inject]
+        public TrackService TrackService { get; set; }
+
         [Parameter]
         public string TenantName { get; set; }
 
@@ -77,6 +80,11 @@ protected override async Task OnInitializedAsync()
             TrackSelectedLogic.OnTrackSelectedAsync += OnTrackSelectedAsync;
             NotificationLogic.OnClientSettingLoaded += OnClientSettingLoaded;
             NotificationLogic.OnOpenPaymentMethodAsync += OnOpenPaymentMethodAsync;
+            if (TrackSelectedLogic.Track.Name != Constants.Routes.MasterTrackName)
+            {
+                var masterTrack = await TrackService.GetTrackAsync(Constants.Routes.MasterTrackName);
+                await TrackSelectedLogic.TrackSelectedAsync(masterTrack);
+            }
             if (TrackSelectedLogic.IsTrackSelected)
             {
                 await DefaultLoadAsync();
@@ -110,7 +118,7 @@ private async Task DefaultLoadAsync()
                 deleteTenantAcknowledge = false;
 
                 myTenant = await MyTenantService.GetTenantAsync();
-                await RouteBindingLogic.SetMyTenantAsync(myTenant);
+                RouteBindingLogic.SetMyTenant(myTenant);
 
                 savedCustomDomain = myTenant.CustomDomain;
 
@@ -146,7 +154,7 @@ private async Task OnUpdateTenantValidSubmitAsync(EditContext editContext)
                 savedCustomDomain = myTenant.CustomDomain;
                 tenantSettingsForm.Model.CustomDomain = myTenant.CustomDomain;
                 tenantSettingsForm.Model.CustomDomainVerified = myTenant.CustomDomainVerified;
-                await RouteBindingLogic.SetMyTenantAsync(myTenant);
+                RouteBindingLogic.SetMyTenant(myTenant);
                 tenantWorking = false;
             }
             catch (Exception ex)

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.8</Version>
+		<Version>1.12.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.12.8</Version>
+		<Version>1.12.9</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.8</Version>
+		<Version>1.12.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.12.8</Version>
+		<Version>1.12.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>