Switched to new permission handling for front and backend as the moonlight core did
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
using MoonCore.Models;
|
||||
using MoonlightServers.ApiServer.Database.Entities;
|
||||
using MoonlightServers.Shared.Http.Requests.Admin.NodeAllocations;
|
||||
@@ -29,7 +28,7 @@ public class NodeAllocationsController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{nodeId:int}/allocations")]
|
||||
[RequirePermission("admin.servers.nodes.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.get")]
|
||||
public async Task<IPagedData<NodeAllocationDetailResponse>> Get(
|
||||
[FromRoute] int nodeId,
|
||||
[FromQuery] int page,
|
||||
@@ -63,7 +62,7 @@ public class NodeAllocationsController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{nodeId:int}/allocations/{id:int}")]
|
||||
[RequirePermission("admin.servers.nodes.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.get")]
|
||||
public async Task<NodeAllocationDetailResponse> GetSingle([FromRoute] int nodeId, [FromRoute] int id)
|
||||
{
|
||||
var allocation = await AllocationRepository
|
||||
@@ -83,7 +82,7 @@ public class NodeAllocationsController : Controller
|
||||
}
|
||||
|
||||
[HttpPost("{nodeId:int}/allocations")]
|
||||
[RequirePermission("admin.servers.nodes.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.create")]
|
||||
public async Task<NodeAllocationDetailResponse> Create(
|
||||
[FromRoute] int nodeId,
|
||||
[FromBody] CreateNodeAllocationRequest request
|
||||
@@ -202,7 +201,7 @@ public class NodeAllocationsController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{nodeId:int}/allocations/free")]
|
||||
[RequirePermission("admin.servers.nodes.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.get")]
|
||||
public async Task<IPagedData<NodeAllocationDetailResponse>> GetFree([FromRoute] int nodeId, [FromQuery] int page,
|
||||
[FromQuery][Range(1, 100)] int pageSize, [FromQuery] int serverId = -1)
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@ using System.Diagnostics;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonlightServers.ApiServer.Database.Entities;
|
||||
using MoonlightServers.ApiServer.Services;
|
||||
using MoonlightServers.Shared.Http.Responses.Admin.Nodes.Sys;
|
||||
@@ -23,7 +23,7 @@ public class NodeStatusController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{nodeId}/system/status")]
|
||||
[RequirePermission("admin.servers.nodes.status")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.status")]
|
||||
public async Task<NodeSystemStatusResponse> GetStatus([FromRoute] int nodeId)
|
||||
{
|
||||
var node = GetNode(nodeId);
|
||||
|
||||
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Helpers;
|
||||
using MoonCore.Models;
|
||||
using MoonlightServers.ApiServer.Database.Entities;
|
||||
@@ -29,21 +29,21 @@ public class NodesController : Controller
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[RequirePermission("admin.servers.nodes.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.get")]
|
||||
public async Task<IPagedData<NodeDetailResponse>> Get([FromQuery] int page, [FromQuery] int pageSize)
|
||||
{
|
||||
return await CrudHelper.Get(page, pageSize);
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}")]
|
||||
[RequirePermission("admin.servers.nodes.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.get")]
|
||||
public async Task<NodeDetailResponse> GetSingle([FromRoute] int id)
|
||||
{
|
||||
return await CrudHelper.GetSingle(id);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission("admin.servers.nodes.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.create")]
|
||||
public async Task<NodeDetailResponse> Create([FromBody] CreateNodeRequest request)
|
||||
{
|
||||
var node = Mapper.Map<Node>(request);
|
||||
@@ -57,14 +57,14 @@ public class NodesController : Controller
|
||||
}
|
||||
|
||||
[HttpPatch("{id:int}")]
|
||||
[RequirePermission("admin.servers.nodes.update")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.update")]
|
||||
public async Task<NodeDetailResponse> Update([FromRoute] int id, [FromBody] UpdateNodeRequest request)
|
||||
{
|
||||
return await CrudHelper.Update(id, request);
|
||||
}
|
||||
|
||||
[HttpDelete("{id:int}")]
|
||||
[RequirePermission("admin.servers.nodes.delete")]
|
||||
[Authorize(Policy = "permissions:admin.servers.nodes.delete")]
|
||||
public async Task Delete([FromRoute] int id)
|
||||
{
|
||||
await CrudHelper.Delete(id);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Helpers;
|
||||
@@ -24,7 +24,7 @@ public class ServerVariablesController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{serverId}/variables")]
|
||||
[RequirePermission("admin.servers.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.get")]
|
||||
public async Task<PagedData<ServerVariableDetailResponse>> Get([FromRoute] int serverId, [FromQuery] int page, [FromQuery] int pageSize)
|
||||
{
|
||||
var server = await ServerRepository
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
@@ -67,21 +67,21 @@ public class ServersController : Controller
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[RequirePermission("admin.servers.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.get")]
|
||||
public async Task<IPagedData<ServerDetailResponse>> Get([FromQuery] int page, [FromQuery] int pageSize)
|
||||
{
|
||||
return await CrudHelper.Get(page, pageSize);
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}")]
|
||||
[RequirePermission("admin.servers.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.get")]
|
||||
public async Task<ServerDetailResponse> GetSingle([FromRoute] int id)
|
||||
{
|
||||
return await CrudHelper.GetSingle(id);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission("admin.servers.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.create")]
|
||||
public async Task<ServerDetailResponse> Create([FromBody] CreateServerRequest request)
|
||||
{
|
||||
// Construct model
|
||||
|
||||
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Helpers;
|
||||
using MoonCore.Models;
|
||||
using MoonlightServers.ApiServer.Database.Entities;
|
||||
@@ -49,7 +49,7 @@ public class StarDockerImagesController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{starId:int}/dockerImages")]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task<IPagedData<StarDockerImageDetailResponse>> Get([FromRoute] int starId, [FromQuery] int page, [FromQuery] int pageSize)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
@@ -58,7 +58,7 @@ public class StarDockerImagesController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{starId:int}/dockerImages/{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task<StarDockerImageDetailResponse> GetSingle([FromRoute] int starId, [FromRoute] int id)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
@@ -67,7 +67,7 @@ public class StarDockerImagesController : Controller
|
||||
}
|
||||
|
||||
[HttpPost("{starId:int}/dockerImages")]
|
||||
[RequirePermission("admin.servers.stars.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.create")]
|
||||
public async Task<StarDockerImageDetailResponse> Create([FromRoute] int starId, [FromBody] CreateStarDockerImageRequest request)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
@@ -81,7 +81,7 @@ public class StarDockerImagesController : Controller
|
||||
}
|
||||
|
||||
[HttpPatch("{starId:int}/dockerImages/{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.update")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.update")]
|
||||
public async Task<StarDockerImageDetailResponse> Update([FromRoute] int starId, [FromRoute] int id,
|
||||
[FromBody] UpdateStarDockerImageRequest request)
|
||||
{
|
||||
@@ -91,7 +91,7 @@ public class StarDockerImagesController : Controller
|
||||
}
|
||||
|
||||
[HttpDelete("{starId:int}/dockerImages/{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.delete")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.delete")]
|
||||
public async Task Delete([FromRoute] int starId, [FromRoute] int id)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System.Text;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Helpers;
|
||||
using MoonlightServers.ApiServer.Services;
|
||||
@@ -20,7 +20,7 @@ public class StarImportExportController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{starId:int}/export")]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task Export([FromRoute] int starId)
|
||||
{
|
||||
var exportedStar = await ImportExportService.Export(starId);
|
||||
@@ -31,7 +31,7 @@ public class StarImportExportController : Controller
|
||||
}
|
||||
|
||||
[HttpPost("import")]
|
||||
[RequirePermission("admin.servers.stars.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.create")]
|
||||
public async Task<StarDetailResponse> Import()
|
||||
{
|
||||
if (Request.Form.Files.Count == 0)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
@@ -48,7 +48,7 @@ public class StarVariablesController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{starId:int}/variables")]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task<IPagedData<StarVariableDetailResponse>> Get([FromRoute] int starId, [FromQuery] int page, [FromQuery] int pageSize)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
@@ -57,7 +57,7 @@ public class StarVariablesController : Controller
|
||||
}
|
||||
|
||||
[HttpGet("{starId:int}/variables/{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task<StarVariableDetailResponse> GetSingle([FromRoute] int starId, [FromRoute] int id)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
@@ -66,7 +66,7 @@ public class StarVariablesController : Controller
|
||||
}
|
||||
|
||||
[HttpPost("{starId:int}/variables")]
|
||||
[RequirePermission("admin.servers.stars.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.create")]
|
||||
public async Task<StarVariableDetailResponse> Create([FromRoute] int starId, [FromBody] CreateStarVariableRequest request)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
@@ -80,7 +80,7 @@ public class StarVariablesController : Controller
|
||||
}
|
||||
|
||||
[HttpPatch("{starId:int}/variables/{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.update")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.update")]
|
||||
public async Task<StarVariableDetailResponse> Update([FromRoute] int starId, [FromRoute] int id,
|
||||
[FromBody] UpdateStarVariableRequest request)
|
||||
{
|
||||
@@ -96,7 +96,7 @@ public class StarVariablesController : Controller
|
||||
}
|
||||
|
||||
[HttpDelete("{starId:int}/variables/{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.delete")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.delete")]
|
||||
public async Task Delete([FromRoute] int starId, [FromRoute] int id)
|
||||
{
|
||||
await ApplyStar(starId);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MoonCore.Extended.PermFilter;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
using MoonCore.Helpers;
|
||||
@@ -27,21 +27,21 @@ public class StarsController : Controller
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task<IPagedData<StarDetailResponse>> Get([FromQuery] int page, [FromQuery] int pageSize)
|
||||
{
|
||||
return await CrudHelper.Get(page, pageSize);
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.get")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
public async Task<StarDetailResponse> GetSingle([FromRoute] int id)
|
||||
{
|
||||
return await CrudHelper.GetSingle(id);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission("admin.servers.stars.create")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.create")]
|
||||
public async Task<StarDetailResponse> Create([FromBody] CreateStarRequest request)
|
||||
{
|
||||
var star = Mapper.Map<Star>(request);
|
||||
@@ -67,14 +67,14 @@ public class StarsController : Controller
|
||||
}
|
||||
|
||||
[HttpPatch("{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.update")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.update")]
|
||||
public async Task<StarDetailResponse> Update([FromRoute] int id, [FromBody] UpdateStarRequest request)
|
||||
{
|
||||
return await CrudHelper.Update(id, request);
|
||||
}
|
||||
|
||||
[HttpDelete("{id:int}")]
|
||||
[RequirePermission("admin.servers.stars.delete")]
|
||||
[Authorize(Policy = "permissions:admin.servers.stars.delete")]
|
||||
public async Task Delete([FromRoute] int id)
|
||||
{
|
||||
await CrudHelper.Delete(id);
|
||||
|
||||
@@ -22,6 +22,7 @@ public class SidebarImplementation : ISidebarItemProvider
|
||||
Path = "/admin/servers",
|
||||
Icon = "icon-server",
|
||||
Group = "Admin",
|
||||
Policy = "permissions:admin.servers.overview",
|
||||
Priority = 4
|
||||
}
|
||||
]
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
@inject NavigationManager Navigation
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.create")]
|
||||
|
||||
<PageHeader Title="Create Server">
|
||||
<a href="/admin/servers/all" class="btn btn-secondary">
|
||||
<i class="icon-chevron-left mr-1"></i>
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
@inject AlertService AlertService
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.get")]
|
||||
|
||||
<div class="mb-3">
|
||||
<NavTabs Index="1" Names="@UiConstants.AdminNavNames" Links="@UiConstants.AdminNavLinks"/>
|
||||
</div>
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
@inject NavigationManager Navigation
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.update")]
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<PageHeader Title="Update Server">
|
||||
<a href="/admin/servers/all" class="btn btn-secondary">
|
||||
|
||||
@@ -2,5 +2,7 @@
|
||||
|
||||
@using MoonCore.Blazor.Tailwind.Components
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.overview")]
|
||||
|
||||
<NavTabs Index="0" Names="@UiConstants.AdminNavNames" Links="@UiConstants.AdminNavLinks"/>
|
||||
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
@inject NavigationManager Navigation
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.nodes.create")]
|
||||
|
||||
<PageHeader Title="Create Node">
|
||||
<a href="/admin/servers/nodes" class="btn btn-secondary">
|
||||
<i class="icon-chevron-left mr-1"></i>
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
@inject AlertService AlertService
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.nodes.get")]
|
||||
|
||||
<div class="mb-3">
|
||||
<NavTabs Index="2" Names="@UiConstants.AdminNavNames" Links="@UiConstants.AdminNavLinks"/>
|
||||
</div>
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
@inject NavigationManager Navigation
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.nodes.update")]
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<PageHeader Title="Update Node">
|
||||
<a href="/admin/servers/nodes" class="btn btn-secondary">
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
@inject NavigationManager Navigation
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.stars.create")]
|
||||
|
||||
<PageHeader Title="Create Star">
|
||||
<a href="/admin/servers/stars" class="btn btn-secondary">
|
||||
<i class="icon-chevron-left mr-1"></i>
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
@inject ToastService ToastService
|
||||
@inject AlertService AlertService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.stars.get")]
|
||||
|
||||
<div class="mb-3">
|
||||
<NavTabs Index="3" Names="@UiConstants.AdminNavNames" Links="@UiConstants.AdminNavLinks"/>
|
||||
</div>
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
@inject NavigationManager Navigation
|
||||
@inject ToastService ToastService
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.stars.update")]
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<PageHeader Title="Update Star">
|
||||
<a href="/admin/servers/stars" class="btn btn-secondary">
|
||||
|
||||
Reference in New Issue
Block a user