mirror of
https://github.com/btcpayserver/btcpayserver.git
synced 2025-02-20 13:34:37 +01:00
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.
This commit is contained in:
parent
5114a3a2ea
commit
5a70345499
2 changed files with 4 additions and 4 deletions
|
@ -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)
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue