mirror of
https://github.com/RaidMax/IW4M-Admin.git
synced 2025-06-07 21:58:06 -05:00
Add /api/client/{clientId} Endpoint
This endpoint returns general information about the client ID provided.
This commit is contained in:
parent
0a8bbf2997
commit
5c9cfbd2c2
17
SharedLibraryCore/Dtos/ClientInfoResult.cs
Normal file
17
SharedLibraryCore/Dtos/ClientInfoResult.cs
Normal file
@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using Data.Models.Client;
|
||||
|
||||
namespace SharedLibraryCore.Dtos;
|
||||
|
||||
public class ClientInfoResult
|
||||
{
|
||||
public int ClientId { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Level { get; set; }
|
||||
public long NetworkId { get; set; }
|
||||
public string? Tag { get; set; }
|
||||
public DateTime FirstConnection { get; set; }
|
||||
public DateTime LastConnection { get; set; }
|
||||
public int TotalConnectionTime { get; set; }
|
||||
public int Connections { get; set; }
|
||||
}
|
@ -3,10 +3,12 @@ using Microsoft.AspNetCore.Mvc;
|
||||
using SharedLibraryCore.Dtos;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Security.Claims;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.Extensions.Logging;
|
||||
@ -24,20 +26,15 @@ namespace WebfrontCore.Controllers.API
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[Route("api/[controller]")]
|
||||
public class ClientController : BaseController
|
||||
public class ClientController(
|
||||
ILogger<ClientController> logger,
|
||||
IResourceQueryHelper<FindClientRequest, FindClientResult> clientQueryHelper,
|
||||
ClientService clientService,
|
||||
IManager manager,
|
||||
IMetaServiceV2 metaService)
|
||||
: BaseController(manager)
|
||||
{
|
||||
private readonly IResourceQueryHelper<FindClientRequest, FindClientResult> _clientQueryHelper;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ClientService _clientService;
|
||||
|
||||
public ClientController(ILogger<ClientController> logger,
|
||||
IResourceQueryHelper<FindClientRequest, FindClientResult> clientQueryHelper,
|
||||
ClientService clientService, IManager manager) : base(manager)
|
||||
{
|
||||
_logger = logger;
|
||||
_clientQueryHelper = clientQueryHelper;
|
||||
_clientService = clientService;
|
||||
}
|
||||
private readonly ILogger _logger = logger;
|
||||
|
||||
[HttpGet("find")]
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
@ -47,16 +44,16 @@ namespace WebfrontCore.Controllers.API
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
return BadRequest(new ErrorResponse()
|
||||
return BadRequest(new ErrorResponse
|
||||
{
|
||||
Messages = ModelState.Values
|
||||
.SelectMany(_value => _value.Errors.Select(_error => _error.ErrorMessage)).ToArray()
|
||||
.SelectMany(value => value.Errors.Select(error => error.ErrorMessage)).ToArray()
|
||||
});
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var results = await _clientQueryHelper.QueryResource(request);
|
||||
var results = await clientQueryHelper.QueryResource(request);
|
||||
|
||||
return Ok(new FindClientResponse
|
||||
{
|
||||
@ -64,28 +61,57 @@ namespace WebfrontCore.Controllers.API
|
||||
Clients = results.Results
|
||||
});
|
||||
}
|
||||
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.LogWarning(e, "Failed to retrieve clients with query - {@request}", request);
|
||||
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, new ErrorResponse()
|
||||
{
|
||||
Messages = new[] {e.Message}
|
||||
});
|
||||
_logger.LogWarning(e, "Failed to retrieve clients with query - {@Request}", request);
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, new ErrorResponse { Messages = [e.Message] });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("{clientId:int}")]
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||
public async Task<IActionResult> GetPlayerInfoAsync([FromRoute] int clientId)
|
||||
{
|
||||
try
|
||||
{
|
||||
var clientInfo = await clientService.Get(clientId);
|
||||
if (clientInfo is null)
|
||||
{
|
||||
return BadRequest("Could not find client");
|
||||
}
|
||||
|
||||
var metaResult = await metaService
|
||||
.GetPersistentMetaByLookup(EFMeta.ClientTagV2, EFMeta.ClientTagNameV2, clientInfo.ClientId);
|
||||
|
||||
return Ok(new ClientInfoResult
|
||||
{
|
||||
ClientId = clientInfo.ClientId,
|
||||
Name = clientInfo.CleanedName,
|
||||
Level = clientInfo.Level.ToLocalizedLevelName(),
|
||||
NetworkId = clientInfo.NetworkId,
|
||||
Tag = metaResult?.Value,
|
||||
FirstConnection = clientInfo.FirstConnection,
|
||||
LastConnection = clientInfo.LastConnection,
|
||||
TotalConnectionTime = clientInfo.TotalConnectionTime,
|
||||
Connections = clientInfo.Connections,
|
||||
});
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.LogWarning(e, "Failed to retrieve information for Client - {ClientId}", clientId);
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, new ErrorResponse { Messages = [e.Message] });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("{clientId:int}/login")]
|
||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||
public async Task<IActionResult> Login([FromRoute] int clientId,
|
||||
[FromBody, Required] PasswordRequest request)
|
||||
public async Task<IActionResult> Login([FromRoute] int clientId, [FromBody, Required] PasswordRequest request)
|
||||
{
|
||||
if (clientId == 0)
|
||||
if (clientId is 0)
|
||||
{
|
||||
return Unauthorized();
|
||||
}
|
||||
@ -97,7 +123,7 @@ namespace WebfrontCore.Controllers.API
|
||||
|
||||
try
|
||||
{
|
||||
var privilegedClient = await _clientService.GetClientForLogin(clientId);
|
||||
var privilegedClient = await clientService.GetClientForLogin(clientId);
|
||||
var loginSuccess = false;
|
||||
|
||||
if (!Authorized)
|
||||
@ -108,21 +134,20 @@ namespace WebfrontCore.Controllers.API
|
||||
Token = request.Password
|
||||
};
|
||||
|
||||
loginSuccess =
|
||||
Manager.TokenAuthenticator.AuthorizeToken(tokenData) ||
|
||||
(await Task.FromResult(Hashing.Hash(request.Password,
|
||||
privilegedClient.PasswordSalt)))[0] == privilegedClient.Password;
|
||||
loginSuccess = Manager.TokenAuthenticator.AuthorizeToken(tokenData) ||
|
||||
(await Task.FromResult(Hashing.Hash(request.Password, privilegedClient.PasswordSalt)))[0] ==
|
||||
privilegedClient.Password;
|
||||
}
|
||||
|
||||
if (loginSuccess)
|
||||
{
|
||||
var claims = new[]
|
||||
{
|
||||
List<Claim> claims =
|
||||
[
|
||||
new Claim(ClaimTypes.NameIdentifier, privilegedClient.Name),
|
||||
new Claim(ClaimTypes.Role, privilegedClient.Level.ToString()),
|
||||
new Claim(ClaimTypes.Sid, privilegedClient.ClientId.ToString()),
|
||||
new Claim(ClaimTypes.PrimarySid, privilegedClient.NetworkId.ToString("X"))
|
||||
};
|
||||
];
|
||||
|
||||
var claimsIdentity = new ClaimsIdentity(claims, "login");
|
||||
var claimsPrinciple = new ClaimsPrincipal(claimsIdentity);
|
||||
@ -133,9 +158,9 @@ namespace WebfrontCore.Controllers.API
|
||||
Origin = privilegedClient,
|
||||
Type = GameEvent.EventType.Login,
|
||||
Owner = Manager.GetServers().First(),
|
||||
Data = HttpContext.Request.Headers.ContainsKey("X-Forwarded-For")
|
||||
? HttpContext.Request.Headers["X-Forwarded-For"].ToString()
|
||||
: HttpContext.Connection.RemoteIpAddress.ToString()
|
||||
Data = HttpContext.Request.Headers.TryGetValue("X-Forwarded-For", out var gameStringValues)
|
||||
? gameStringValues.ToString()
|
||||
: HttpContext.Connection.RemoteIpAddress?.ToString()
|
||||
});
|
||||
|
||||
Manager.QueueEvent(new LoginEvent
|
||||
@ -143,15 +168,14 @@ namespace WebfrontCore.Controllers.API
|
||||
Source = this,
|
||||
LoginSource = LoginEvent.LoginSourceType.Webfront,
|
||||
EntityId = Client.ClientId.ToString(),
|
||||
Identifier = HttpContext.Request.Headers.ContainsKey("X-Forwarded-For")
|
||||
? HttpContext.Request.Headers["X-Forwarded-For"].ToString()
|
||||
Identifier = HttpContext.Request.Headers.TryGetValue("X-Forwarded-For", out var loginStringValues)
|
||||
? loginStringValues.ToString()
|
||||
: HttpContext.Connection.RemoteIpAddress?.ToString()
|
||||
});
|
||||
|
||||
return Ok();
|
||||
}
|
||||
}
|
||||
|
||||
catch (Exception)
|
||||
{
|
||||
return Unauthorized();
|
||||
@ -172,9 +196,9 @@ namespace WebfrontCore.Controllers.API
|
||||
Origin = Client,
|
||||
Type = GameEvent.EventType.Logout,
|
||||
Owner = Manager.GetServers().First(),
|
||||
Data = HttpContext.Request.Headers.ContainsKey("X-Forwarded-For")
|
||||
? HttpContext.Request.Headers["X-Forwarded-For"].ToString()
|
||||
: HttpContext.Connection.RemoteIpAddress.ToString()
|
||||
Data = HttpContext.Request.Headers.TryGetValue("X-Forwarded-For", out var gameStringValues)
|
||||
? gameStringValues.ToString()
|
||||
: HttpContext.Connection.RemoteIpAddress?.ToString()
|
||||
});
|
||||
|
||||
Manager.QueueEvent(new LogoutEvent
|
||||
@ -182,14 +206,13 @@ namespace WebfrontCore.Controllers.API
|
||||
Source = this,
|
||||
LoginSource = LoginEvent.LoginSourceType.Webfront,
|
||||
EntityId = Client.ClientId.ToString(),
|
||||
Identifier = HttpContext.Request.Headers.ContainsKey("X-Forwarded-For")
|
||||
? HttpContext.Request.Headers["X-Forwarded-For"].ToString()
|
||||
Identifier = HttpContext.Request.Headers.TryGetValue("X-Forwarded-For", out var logoutStringValues)
|
||||
? logoutStringValues.ToString()
|
||||
: HttpContext.Connection.RemoteIpAddress?.ToString()
|
||||
});
|
||||
}
|
||||
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
|
||||
return Ok();
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user