aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 05:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address feedback from code review

Browse Source 
Thanks @kukks
This commit is contained in:
Dennis Reimann
2021-12-20 15:15:32 +01:00
committed by Andrew Camilleri
parent 3a59e2a5c4
commit 8e5a9251d6
6 changed files with 96 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
BTCPayServer/Controllers/AppsController.cs
View File

@@ -49,7 +49,8 @@ namespace BTCPayServer.Controllers
string sortOrderColumn = null
)
{
var apps = await _appService.GetAllApps(GetUserId(), false, CurrentStore.Id);
var store = GetCurrentStore();
var apps = await _appService.GetAllApps(GetUserId(), false, store.Id);
if (sortOrder != null && sortOrderColumn != null)
{
@@ -91,14 +92,15 @@ namespace BTCPayServer.Controllers
{
return View(new CreateAppViewModel
{
StoreId = CurrentStore.Id
StoreId = GetCurrentStore().Id
});
}
[HttpPost("/stores/{storeId}/apps/create")]
public async Task<IActionResult> CreateApp(string storeId, CreateAppViewModel vm)
{
vm.StoreId = CurrentStore.Id;
var store = GetCurrentStore();
vm.StoreId = store.Id;
if (!Enum.TryParse(vm.SelectedAppType, out AppType appType))
ModelState.AddModelError(nameof(vm.SelectedAppType), "Invalid App Type");
@@ -110,7 +112,7 @@ namespace BTCPayServer.Controllers
var appData = new AppData
{
StoreDataId = CurrentStore.Id,
StoreDataId = store.Id,
Name = vm.AppName,
AppType = appType.ToString()
};
@@ -146,22 +148,24 @@ namespace BTCPayServer.Controllers
[HttpGet("{appId}/delete")]
public IActionResult DeleteApp(string appId)
{
if (CurrentApp == null)
var app = GetCurrentApp();
if (app == null)
return NotFound();
return View("Confirm", new ConfirmModel("Delete app", $"The app <strong>{CurrentApp.Name}</strong> and its settings will be permanently deleted. Are you sure?", "Delete"));
return View("Confirm", new ConfirmModel("Delete app", $"The app <strong>{app.Name}</strong> and its settings will be permanently deleted. Are you sure?", "Delete"));
}
[HttpPost("{appId}/delete")]
public async Task<IActionResult> DeleteAppPost(string appId)
{
if (CurrentApp == null)
var app = GetCurrentApp();
if (app == null)
return NotFound();
if (await _appService.DeleteApp(CurrentApp))
if (await _appService.DeleteApp(app))
TempData[WellKnownTempData.SuccessMessage] = "App deleted successfully.";
return RedirectToAction(nameof(ListApps), new { storeId = CurrentApp.StoreDataId });
return RedirectToAction(nameof(ListApps), new { storeId = app.StoreDataId });
}
async Task<string> GetStoreDefaultCurrentIfEmpty(string storeId, string currency)
@@ -173,19 +177,10 @@ namespace BTCPayServer.Controllers
return currency.Trim().ToUpperInvariant();
}
private string GetUserId()
{
return _userManager.GetUserId(User);
}
private string GetUserId() => _userManager.GetUserId(User);
private StoreData CurrentStore
{
get => HttpContext.GetStoreData();
}
private StoreData GetCurrentStore() => HttpContext.GetStoreData();
private AppData CurrentApp
{
get => HttpContext.GetAppData();
}
private AppData GetCurrentApp() => HttpContext.GetAppData();
}
}