mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-21 14:04:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not redirect to archived store after login (#5566)

Browse source 
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.
This commit is contained in:
d11n 2023-12-20 11:27:02 +01:00 • committed by GitHub
parent 5114a3a2ea
commit 5a70345499
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BTCPayServer/Components/StoreSelector/StoreSelector.cs
View file

@ -41,14 +41,13 @@ namespace BTCPayServer.Components.StoreSelector
.FirstOrDefault()? .FirstOrDefault()?
.Network.CryptoCode; .Network.CryptoCode;
var walletId = cryptoCode != null ? new WalletId(store.Id, cryptoCode) : null; var walletId = cryptoCode != null ? new WalletId(store.Id, cryptoCode) : null;
var role = store.GetStoreRoleOfUser(userId);
return new StoreSelectorOption return new StoreSelectorOption
{ {
Text = store.StoreName, Text = store.StoreName,
Value = store.Id, Value = store.Id,
Selected = store.Id == currentStore?.Id, Selected = store.Id == currentStore?.Id,
WalletId = walletId, WalletId = walletId,
Store = store, Store = store
}; };
}) })
.OrderBy(s => s.Text) .OrderBy(s => s.Text)

5
BTCPayServer/Controllers/UIHomeController.cs
View file

@ -84,8 +84,9 @@ namespace BTCPayServer.Controllers
} }
var stores = await _storeRepository.GetStoresByUserId(userId); var stores = await _storeRepository.GetStoresByUserId(userId);
return stores.Any() var activeStore = stores.FirstOrDefault(s => !s.Archived);
? RedirectToStore(userId, stores.First()) return activeStore != null
? RedirectToStore(userId, activeStore)
: RedirectToAction(nameof(UIUserStoresController.CreateStore), "UIUserStores"); : RedirectToAction(nameof(UIUserStoresController.CreateStore), "UIUserStores");
} }