cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement a proper fucking GetId for Instances already

Browse Source
This commit is contained in:
Cyberboss
2018-08-28 11:27:43 -04:00
parent 28decc45f9
commit b8a02bf81a
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Client/InstanceManagerClient.cs
+2 -1
View File
@@ -43,7 +43,8 @@ namespace Tgstation.Server.Client
/// <inheritdoc />
public Task<Instance> Update(Instance instance, CancellationToken cancellationToken) => apiClient.Update<Instance, Instance>(Routes.InstanceManager, instance, cancellationToken);
public Task<Instance> GetId(Instance instance, CancellationToken cancellationToken) => apiClient.Read<Instance>(Routes.InstanceManager, instance.Id, cancellationToken);
/// <inheritdoc />
public Task<Instance> GetId(Instance instance, CancellationToken cancellationToken) => apiClient.Read<Instance>(Routes.SetID(Routes.InstanceManager, instance.Id), cancellationToken);
/// <inheritdoc />
public IInstanceClient CreateClient(Instance instance)
src/Tgstation.Server.Host/Controllers/InstanceController.cs
+18 -6
View File
@@ -348,7 +348,7 @@ namespace Tgstation.Server.Host.Controllers
}
/// <inheritdoc />
[TgsAuthorize]
[TgsAuthorize(InstanceManagerRights.List | InstanceManagerRights.Read)]
public override async Task<IActionResult> List(CancellationToken cancellationToken)
{
IQueryable<Models.Instance> query = DatabaseContext.Instances;
@@ -359,12 +359,24 @@ namespace Tgstation.Server.Host.Controllers
}
/// <inheritdoc />
[TgsAuthorize]
public override Task<IActionResult> Read(CancellationToken cancellationToken)
[TgsAuthorize(InstanceManagerRights.List | InstanceManagerRights.Read)]
public override async Task<IActionResult> GetId(long id, CancellationToken cancellationToken)
{
if (Instance == null)
return Task.FromResult<IActionResult>(BadRequest(new ErrorMessage { Message = "No instance specified" }));
return Task.FromResult<IActionResult>(Json(Instance.ToApi()));
var query = DatabaseContext.Instances.Where(x => x.Id == id);
var cantList = !AuthenticationContext.User.InstanceManagerRights.Value.HasFlag(InstanceManagerRights.List);
if (cantList)
query = query.Include(x => x.InstanceUsers);
var instance = await query.FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
if (instance == null)
return StatusCode((int)HttpStatusCode.Gone);
if (cantList && !instance.InstanceUsers.Any(x => x.UserId == AuthenticationContext.User.Id && x.AnyRights))
return Forbid();
return Json(instance.ToApi());
}
}
}