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:
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

View file

@ -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)

View file

@ -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");
}