From 5a70345499f6331741119226a0c041e226261f1d Mon Sep 17 00:00:00 2001 From: d11n Date: Wed, 20 Dec 2023 11:27:02 +0100 Subject: [PATCH] Do not redirect to archived store after login (#5566) Now that we have archived stores, we need to exclude them from the selection of the default store the user gets redirected to after login. --- BTCPayServer/Components/StoreSelector/StoreSelector.cs | 3 +-- BTCPayServer/Controllers/UIHomeController.cs | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BTCPayServer/Components/StoreSelector/StoreSelector.cs b/BTCPayServer/Components/StoreSelector/StoreSelector.cs index c99f4b4ee..744a2d95d 100644 --- a/BTCPayServer/Components/StoreSelector/StoreSelector.cs +++ b/BTCPayServer/Components/StoreSelector/StoreSelector.cs @@ -41,14 +41,13 @@ namespace BTCPayServer.Components.StoreSelector .FirstOrDefault()? .Network.CryptoCode; var walletId = cryptoCode != null ? new WalletId(store.Id, cryptoCode) : null; - var role = store.GetStoreRoleOfUser(userId); return new StoreSelectorOption { Text = store.StoreName, Value = store.Id, Selected = store.Id == currentStore?.Id, WalletId = walletId, - Store = store, + Store = store }; }) .OrderBy(s => s.Text) diff --git a/BTCPayServer/Controllers/UIHomeController.cs b/BTCPayServer/Controllers/UIHomeController.cs index 2730576a3..8b1ab5ee8 100644 --- a/BTCPayServer/Controllers/UIHomeController.cs +++ b/BTCPayServer/Controllers/UIHomeController.cs @@ -84,8 +84,9 @@ namespace BTCPayServer.Controllers } var stores = await _storeRepository.GetStoresByUserId(userId); - return stores.Any() - ? RedirectToStore(userId, stores.First()) + var activeStore = stores.FirstOrDefault(s => !s.Archived); + return activeStore != null + ? RedirectToStore(userId, activeStore) : RedirectToAction(nameof(UIUserStoresController.CreateStore), "UIUserStores"); }