squash a bunch of commits
This commit is contained in:
217
Shogi.Sockets/Controllers/SessionController.cs
Normal file
217
Shogi.Sockets/Controllers/SessionController.cs
Normal file
@@ -0,0 +1,217 @@
|
||||
using Shogi.Api.Managers;
|
||||
using Shogi.Api.Repositories;
|
||||
using Shogi.Contracts.Api;
|
||||
using Shogi.Contracts.Socket;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System.Data.SqlClient;
|
||||
using Shogi.Contracts.Types;
|
||||
using Shogi.Api.Extensions;
|
||||
|
||||
namespace Shogi.Api.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[Route("[controller]")]
|
||||
[Authorize]
|
||||
public class SessionController : ControllerBase
|
||||
{
|
||||
private readonly ISocketConnectionManager communicationManager;
|
||||
private readonly IModelMapper mapper;
|
||||
private readonly ISessionRepository sessionRepository;
|
||||
private readonly IQueryRespository queryRespository;
|
||||
|
||||
public SessionController(
|
||||
ISocketConnectionManager communicationManager,
|
||||
IModelMapper mapper,
|
||||
ISessionRepository sessionRepository,
|
||||
IQueryRespository queryRespository)
|
||||
{
|
||||
this.communicationManager = communicationManager;
|
||||
this.mapper = mapper;
|
||||
this.sessionRepository = sessionRepository;
|
||||
this.queryRespository = queryRespository;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> CreateSession([FromBody] CreateSessionCommand request)
|
||||
{
|
||||
var userId = User.GetShogiUserId();
|
||||
if (string.IsNullOrWhiteSpace(userId)) return this.Unauthorized();
|
||||
var session = new Domain.Session(request.Name, Domain.BoardState.StandardStarting, userId);
|
||||
try
|
||||
{
|
||||
await sessionRepository.CreateSession(session);
|
||||
}
|
||||
catch (SqlException)
|
||||
{
|
||||
return this.Conflict();
|
||||
}
|
||||
|
||||
await communicationManager.BroadcastToAll(new SessionCreatedSocketMessage());
|
||||
return CreatedAtAction(nameof(CreateSession), new { sessionName = request.Name }, null);
|
||||
}
|
||||
|
||||
//[HttpPost("{sessionName}/Move")]
|
||||
//public async Task<IActionResult> MovePiece([FromRoute] string sessionName, [FromBody] MovePieceCommand request)
|
||||
//{
|
||||
|
||||
// var user = await gameboardManager.ReadUser(User);
|
||||
// var session = await gameboardRepository.ReadSession(sessionName);
|
||||
// if (session == null)
|
||||
// {
|
||||
// return NotFound();
|
||||
// }
|
||||
// if (user == null || (session.Player1 != user.Id && session.Player2 != user.Id))
|
||||
// {
|
||||
// return Forbid("User is not seated at this game.");
|
||||
// }
|
||||
|
||||
// try
|
||||
// {
|
||||
// var move = request.Move;
|
||||
// if (move.PieceFromCaptured.HasValue)
|
||||
// session.Move(mapper.Map(move.PieceFromCaptured.Value), move.To);
|
||||
// else if (!string.IsNullOrWhiteSpace(move.From))
|
||||
// session.Move(move.From, move.To, move.IsPromotion);
|
||||
|
||||
// await gameboardRepository.CreateBoardState(session);
|
||||
// await communicationManager.BroadcastToPlayers(
|
||||
// new MoveResponse
|
||||
// {
|
||||
// SessionName = session.Name,
|
||||
// PlayerName = user.Id
|
||||
// },
|
||||
// session.Player1,
|
||||
// session.Player2);
|
||||
|
||||
// return Ok();
|
||||
// }
|
||||
// catch (InvalidOperationException ex)
|
||||
// {
|
||||
// return Conflict(ex.Message);
|
||||
// }
|
||||
//}
|
||||
|
||||
// TODO: Use JWT tokens for guests so they can authenticate and use API routes, too.
|
||||
//[Route("")]
|
||||
//public async Task<IActionResult> PostSession([FromBody] PostSession request)
|
||||
//{
|
||||
// var model = new Models.Session(request.Name, request.IsPrivate, request.Player1, request.Player2);
|
||||
// var success = await repository.CreateSession(model);
|
||||
// if (success)
|
||||
// {
|
||||
// var message = new ServiceModels.Socket.Messages.CreateGameResponse(ServiceModels.Types.SocketAction.CreateGame)
|
||||
// {
|
||||
// Game = model.ToServiceModel(),
|
||||
// PlayerName =
|
||||
// }
|
||||
// var task = request.IsPrivate
|
||||
// ? communicationManager.BroadcastToPlayers(response, userName)
|
||||
// : communicationManager.BroadcastToAll(response);
|
||||
// return new CreatedResult("", null);
|
||||
// }
|
||||
// return new ConflictResult();
|
||||
//}
|
||||
|
||||
|
||||
|
||||
//[HttpGet("{sessionName}")]
|
||||
//[AllowAnonymous]
|
||||
//public async Task<IActionResult> GetSession([FromRoute] string sessionName)
|
||||
//{
|
||||
// var user = await ReadUserOrThrow();
|
||||
// var session = await gameboardRepository.ReadSession(sessionName);
|
||||
// if (session == null)
|
||||
// {
|
||||
// return NotFound();
|
||||
// }
|
||||
|
||||
// var playerPerspective = session.Player2 == user.Id
|
||||
// ? WhichPlayer.Player2
|
||||
// : WhichPlayer.Player1;
|
||||
|
||||
// var response = new ReadSessionResponse
|
||||
// {
|
||||
// Session = new Session
|
||||
// {
|
||||
// BoardState = new BoardState
|
||||
// {
|
||||
// Board = mapper.Map(session.BoardState.State),
|
||||
// Player1Hand = session.BoardState.Player1Hand.Select(mapper.Map).ToList(),
|
||||
// Player2Hand = session.BoardState.Player2Hand.Select(mapper.Map).ToList(),
|
||||
// PlayerInCheck = mapper.Map(session.BoardState.InCheck)
|
||||
// },
|
||||
// SessionName = session.Name,
|
||||
// Player1 = session.Player1,
|
||||
// Player2 = session.Player2
|
||||
// }
|
||||
// };
|
||||
// return Ok(response);
|
||||
//}
|
||||
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<ActionResult<ReadAllSessionsResponse>> GetSessions()
|
||||
{
|
||||
var sessions = await this.queryRespository.ReadAllSessionsMetadata();
|
||||
|
||||
return Ok(new ReadAllSessionsResponse
|
||||
{
|
||||
PlayerHasJoinedSessions = Array.Empty<SessionMetadata>(),
|
||||
AllOtherSessions = sessions.ToList()
|
||||
});
|
||||
}
|
||||
|
||||
//[HttpPut("{sessionName}")]
|
||||
//public async Task<IActionResult> PutJoinSession([FromRoute] string sessionName)
|
||||
//{
|
||||
// var user = await ReadUserOrThrow();
|
||||
// var session = await gameboardRepository.ReadSessionMetaData(sessionName);
|
||||
// if (session == null)
|
||||
// {
|
||||
// return NotFound();
|
||||
// }
|
||||
// if (session.Player2 != null)
|
||||
// {
|
||||
// return this.Conflict("This session already has two seated players and is full.");
|
||||
// }
|
||||
|
||||
// session.SetPlayer2(user.Id);
|
||||
// await gameboardRepository.UpdateSession(session);
|
||||
|
||||
// var opponentName = user.Id == session.Player1
|
||||
// ? session.Player2!
|
||||
// : session.Player1;
|
||||
// await communicationManager.BroadcastToPlayers(new JoinSessionResponse
|
||||
// {
|
||||
// SessionName = session.Name,
|
||||
// PlayerName = user.Id
|
||||
// }, opponentName);
|
||||
// return Ok();
|
||||
//}
|
||||
|
||||
//[Authorize(Roles = "Admin")]
|
||||
//[HttpDelete("{sessionName}")]
|
||||
//public async Task<IActionResult> DeleteSession([FromRoute] string sessionName)
|
||||
//{
|
||||
// var user = await ReadUserOrThrow();
|
||||
// if (user.IsAdmin)
|
||||
// {
|
||||
// return Ok();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return Unauthorized();
|
||||
// }
|
||||
//}
|
||||
|
||||
//private async Task<Models.User> ReadUserOrThrow()
|
||||
//{
|
||||
// var user = await gameboardManager.ReadUser(User);
|
||||
// if (user == null)
|
||||
// {
|
||||
// throw new UnauthorizedAccessException("Unknown user claims.");
|
||||
// }
|
||||
// return user;
|
||||
//}
|
||||
}
|
||||
108
Shogi.Sockets/Controllers/UserController.cs
Normal file
108
Shogi.Sockets/Controllers/UserController.cs
Normal file
@@ -0,0 +1,108 @@
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Shogi.Contracts.Api;
|
||||
using Shogi.Api.Extensions;
|
||||
using Shogi.Api.Managers;
|
||||
using Shogi.Api.Models;
|
||||
using Shogi.Api.Repositories;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Shogi.Api.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[Route("[controller]")]
|
||||
[Authorize]
|
||||
public class UserController : ControllerBase
|
||||
{
|
||||
private readonly ISocketTokenCache tokenCache;
|
||||
private readonly ISocketConnectionManager connectionManager;
|
||||
private readonly IUserRepository userRepository;
|
||||
private readonly IShogiUserClaimsTransformer claimsTransformation;
|
||||
private readonly AuthenticationProperties authenticationProps;
|
||||
|
||||
public UserController(
|
||||
ILogger<UserController> logger,
|
||||
ISocketTokenCache tokenCache,
|
||||
ISocketConnectionManager connectionManager,
|
||||
IUserRepository userRepository,
|
||||
IShogiUserClaimsTransformer claimsTransformation)
|
||||
{
|
||||
this.tokenCache = tokenCache;
|
||||
this.connectionManager = connectionManager;
|
||||
this.userRepository = userRepository;
|
||||
this.claimsTransformation = claimsTransformation;
|
||||
authenticationProps = new AuthenticationProperties
|
||||
{
|
||||
AllowRefresh = true,
|
||||
IsPersistent = true
|
||||
};
|
||||
}
|
||||
|
||||
[HttpPut("GuestLogout")]
|
||||
public async Task<IActionResult> GuestLogout()
|
||||
{
|
||||
var signoutTask = HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
|
||||
var userId = User?.GetGuestUserId();
|
||||
if (!string.IsNullOrEmpty(userId))
|
||||
{
|
||||
connectionManager.Unsubscribe(userId);
|
||||
}
|
||||
|
||||
await signoutTask;
|
||||
return Ok();
|
||||
}
|
||||
|
||||
//[HttpGet("Token")]
|
||||
//public async Task<IActionResult> GetToken()
|
||||
//{
|
||||
// var user = await gameboardManager.ReadUser(User);
|
||||
// if (user == null)
|
||||
// {
|
||||
// await gameboardManager.CreateUser(User);
|
||||
// user = await gameboardManager.ReadUser(User);
|
||||
// }
|
||||
|
||||
// if (user == null)
|
||||
// {
|
||||
// return Unauthorized();
|
||||
// }
|
||||
|
||||
// var token = tokenCache.GenerateToken(user.Id);
|
||||
// return new JsonResult(new CreateTokenResponse(token));
|
||||
//}
|
||||
|
||||
[AllowAnonymous]
|
||||
[HttpGet("LoginAsGuest")]
|
||||
public async Task<IActionResult> GuestLogin()
|
||||
{
|
||||
var principal = await this.claimsTransformation.CreateClaimsFromGuestPrincipal(User);
|
||||
if (principal != null)
|
||||
{
|
||||
await HttpContext.SignInAsync(
|
||||
CookieAuthenticationDefaults.AuthenticationScheme,
|
||||
principal,
|
||||
authenticationProps
|
||||
);
|
||||
}
|
||||
return Ok();
|
||||
|
||||
|
||||
}
|
||||
[HttpGet("GuestToken")]
|
||||
public IActionResult GetGuestToken()
|
||||
{
|
||||
var id = User.GetGuestUserId();
|
||||
var displayName = User.DisplayName();
|
||||
if (!string.IsNullOrWhiteSpace(id) && !string.IsNullOrWhiteSpace(displayName))
|
||||
{
|
||||
var token = tokenCache.GenerateToken(User.GetGuestUserId()!);
|
||||
return this.Ok(new CreateGuestTokenResponse(id, displayName, token));
|
||||
}
|
||||
|
||||
return this.Unauthorized();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user