From 81edcfff07b1778e7049f1331f69d50b3620be4d Mon Sep 17 00:00:00 2001 From: Loretta Date: Fri, 24 Oct 2025 08:11:50 +0200 Subject: [PATCH] Login hack fix; improvements --- FruitBank.Common/FruitBankConstClient.cs | 2 +- .../Interfaces/ICustomOrderSignalREndpointCommon.cs | 1 + FruitBank.Common/SignalRs/SignalRTags.cs | 5 +++-- FruitBankHybrid.Shared.Tests/OrderClientTests.cs | 2 +- FruitBankHybrid.Shared/Layout/MainLayout.razor | 2 +- FruitBankHybrid.Shared/Layout/MainLayout.razor.cs | 1 + FruitBankHybrid.Shared/Layout/NavMenu.razor | 7 +++++++ FruitBankHybrid.Shared/Pages/Home.razor.cs | 2 +- FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs | 3 +++ FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs | 5 ++++- .../Services/SignalRs/FruitBankSignalRClient.cs | 3 +++ 11 files changed, 26 insertions(+), 7 deletions(-) diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index 5e51fc9..71d6723 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -10,7 +10,7 @@ public static class FruitBankConstClient public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop #if RELEASE - public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop + //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop #endif //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop diff --git a/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs b/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs index 718dfab..b29c81c 100644 --- a/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs +++ b/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs @@ -8,6 +8,7 @@ public interface ICustomOrderSignalREndpointCommon { Task?> GetAllOrderDtos(); Task?> GetPendingOrderDtos(); + Task?> GetPendingOrderDtosForMeasuring(); Task?> GetAllOrderDtoByIds(int[] orderIds); Task GetOrderDtoById(int orderId); Task AddOrUpdateMeasuredOrderItemPallet(OrderItemPallet orderItemPallet); diff --git a/FruitBank.Common/SignalRs/SignalRTags.cs b/FruitBank.Common/SignalRs/SignalRTags.cs index 470b4be..4c003b5 100644 --- a/FruitBank.Common/SignalRs/SignalRTags.cs +++ b/FruitBank.Common/SignalRs/SignalRTags.cs @@ -49,8 +49,9 @@ public class SignalRTags : AcSignalRTags public const int GetOrderDtoById = 112; public const int GetAllOrderDtoByIds = 114; public const int GetPendingOrderDtos = 115; - public const int StartMeasuring = 116; - public const int SetOrderStatusToComplete = 117; + public const int GetPendingOrderDtosForMeasuring = 116; + public const int StartMeasuring = 117; + public const int SetOrderStatusToComplete = 118; public const int AddOrderItemPallet = 131; public const int UpdateOrderItemPallet = 132; diff --git a/FruitBankHybrid.Shared.Tests/OrderClientTests.cs b/FruitBankHybrid.Shared.Tests/OrderClientTests.cs index 0078eff..f0fbbfa 100644 --- a/FruitBankHybrid.Shared.Tests/OrderClientTests.cs +++ b/FruitBankHybrid.Shared.Tests/OrderClientTests.cs @@ -55,7 +55,7 @@ public sealed class OrderClientTests [TestMethod] public async Task GetPendingOrderDtos() { - var pendingOrderDtos = await _signalRClient.GetPendingOrderDtos(); + var pendingOrderDtos = await _signalRClient.GetPendingOrderDtosForMeasuring(); Assert.IsNotNull(pendingOrderDtos); diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor b/FruitBankHybrid.Shared/Layout/MainLayout.razor index 87e7256..8a64a5c 100644 --- a/FruitBankHybrid.Shared/Layout/MainLayout.razor +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor @@ -3,7 +3,7 @@
- +
diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs index e3ab0b8..813431f 100644 --- a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs @@ -14,6 +14,7 @@ public partial class MainLayout : LayoutComponentBase protected override void OnInitialized() { var loginUri = NavManager.ToAbsoluteUri("/Login").ToString(); + if (!LoggedInModel.IsLoggedIn && NavManager.Uri != loginUri) { NavManager.NavigateTo("/Login"); diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor b/FruitBankHybrid.Shared/Layout/NavMenu.razor index 040d23d..c78681c 100644 --- a/FruitBankHybrid.Shared/Layout/NavMenu.razor +++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor @@ -4,7 +4,14 @@
+ @if (LoggedInModel.IsLoggedIn) + { FruitBank + } + else + { + FruitBank + }
diff --git a/FruitBankHybrid.Shared/Pages/Home.razor.cs b/FruitBankHybrid.Shared/Pages/Home.razor.cs index 88a401f..f57ddcb 100644 --- a/FruitBankHybrid.Shared/Pages/Home.razor.cs +++ b/FruitBankHybrid.Shared/Pages/Home.razor.cs @@ -13,6 +13,6 @@ public partial class Home : ComponentBase protected override void OnInitialized() { - //if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login"); + if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login"); } } \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs index 1d5d7a3..9027955 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs @@ -19,6 +19,7 @@ namespace FruitBankHybrid.Shared.Pages { [Inject] public required IEnumerable LogWriters { get; set; } [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; } + [Inject] public required NavigationManager NavManager{ get; set; } [Inject] public required LoggedInModel LoggedInModel { get; set; } private ILogger _logger = null!; @@ -37,6 +38,8 @@ namespace FruitBankHybrid.Shared.Pages protected override async Task OnInitializedAsync() { + if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login"); + LoadingPanelVisible = true; _logger = new LoggerClient(LogWriters.ToArray()); diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs index 40c9096..9f0c522 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs @@ -27,6 +27,7 @@ namespace FruitBankHybrid.Shared.Pages { [Inject] public required IEnumerable LogWriters { get; set; } [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; } + [Inject] public required NavigationManager NavManager{ get; set; } [Inject] private IDialogService DialogService { get; set; } = null!; [Inject] public required LoggedInModel LoggedInModel { get; set; } @@ -45,6 +46,8 @@ namespace FruitBankHybrid.Shared.Pages protected override async Task OnInitializedAsync() { + if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login"); + LoadingPanelVisible = true; _logger = new LoggerClient(LogWriters.ToArray()); _logger.Info("OnInitializedAsync"); @@ -56,7 +59,7 @@ namespace FruitBankHybrid.Shared.Pages private async Task RefreshOrdersFromDb(DateTime dateTime) { LoadingPanelVisible = true; - var orders = (await FruitBankSignalRClient.GetPendingOrderDtos() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList(); + var orders = (await FruitBankSignalRClient.GetPendingOrderDtosForMeasuring() ?? []).Where(o => o.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor)).ToList(); _measuringDates = orders.Select(order => new MeasuringDateSelectorModel(order.Id, order.DateOfReceiptOrCreated, order.IsMeasured)).ToList(); diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index b8f224b..df4de16 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -137,6 +137,9 @@ namespace FruitBankHybrid.Shared.Services.SignalRs public Task?> GetPendingOrderDtos() => GetAllAsync>(SignalRTags.GetPendingOrderDtos); + public Task?> GetPendingOrderDtosForMeasuring() + => GetAllAsync>(SignalRTags.GetPendingOrderDtosForMeasuring); + public Task?> GetAllOrderDtoByIds(int[] orderIds) => GetAllAsync>(SignalRTags.GetAllOrderDtoByIds, [orderIds]);