checkpoint

Gameboard.ShogiUI.Sockets/Controllers/SocketController.cs

@@ -15,89 +15,101 @@ using System.Threading.Tasks;
 
 namespace Gameboard.ShogiUI.Sockets.Controllers
 {
-  [ApiController]
-  [Route("[controller]")]
-  [Authorize(Roles = "Shogi")]
-  public class SocketController : ControllerBase
-  {
-    private readonly ILogger<SocketController> logger;
-    private readonly ISocketTokenCache tokenCache;
-    private readonly IGameboardManager gameboardManager;
-    private readonly IGameboardRepository gameboardRepository;
-    private readonly AuthenticationProperties authenticationProps;
+	[ApiController]
+	[Route("[controller]")]
+	[Authorize(Roles = "Shogi")]
+	public class SocketController : ControllerBase
+	{
+		private readonly ILogger<SocketController> logger;
+		private readonly ISocketTokenCache tokenCache;
+		private readonly IGameboardManager gameboardManager;
+		private readonly IGameboardRepository gameboardRepository;
+		private readonly ISocketConnectionManager connectionManager;
+		private readonly AuthenticationProperties authenticationProps;
 
-    public SocketController(
-      ILogger<SocketController> logger,
-      ISocketTokenCache tokenCache,
-      IGameboardManager gameboardManager,
-      IGameboardRepository gameboardRepository)
-    {
-      this.logger = logger;
-      this.tokenCache = tokenCache;
-      this.gameboardManager = gameboardManager;
-      this.gameboardRepository = gameboardRepository;
-      authenticationProps = new AuthenticationProperties
-      {
-        AllowRefresh = true,
-        IsPersistent = true
-      };
-    }
+		public SocketController(
+			ILogger<SocketController> logger,
+			ISocketTokenCache tokenCache,
+			IGameboardManager gameboardManager,
+			IGameboardRepository gameboardRepository,
+			ISocketConnectionManager connectionManager)
+		{
+			this.logger = logger;
+			this.tokenCache = tokenCache;
+			this.gameboardManager = gameboardManager;
+			this.gameboardRepository = gameboardRepository;
+			this.connectionManager = connectionManager;
 
-    [HttpGet("GuestLogout")]
-    [AllowAnonymous]
-    public async Task<IActionResult> GuestLogout()
-    {
-      await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-      return Ok();
-    }
+			authenticationProps = new AuthenticationProperties
+			{
+				AllowRefresh = true,
+				IsPersistent = true
+			};
+		}
 
-    [HttpGet("Token")]
-    public async Task<IActionResult> GetToken()
-    {
-      var user = await gameboardManager.ReadUser(User);
-      if (user == null)
-      {
-        if (await gameboardManager.CreateUser(User))
-        {
-          user = await gameboardManager.ReadUser(User);
-        }
-      }
+		[HttpGet("GuestLogout")]
+		[AllowAnonymous]
+		public async Task<IActionResult> GuestLogout()
+		{
+			var signoutTask = HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+			
+			var userId = User?.UserId();
+			if (!string.IsNullOrEmpty(userId))
+			{
+				connectionManager.UnsubscribeFromBroadcastAndGames(userId);
+			}
+			
+			await signoutTask;
+			return Ok();
+		}
 
-      if (user == null)
-      {
-        return Unauthorized();
-      }
+		[HttpGet("Token")]
+		public async Task<IActionResult> GetToken()
+		{
+			var user = await gameboardManager.ReadUser(User);
+			if (user == null)
+			{
+				if (await gameboardManager.CreateUser(User))
+				{
+					user = await gameboardManager.ReadUser(User);
+				}
+			}
 
-      var token = tokenCache.GenerateToken(user.Id);
-      return new JsonResult(new GetTokenResponse(token));
-    }
+			if (user == null)
+			{
+				return Unauthorized();
+			}
 
-    [HttpGet("GuestToken")]
-    [AllowAnonymous]
-    public async Task<IActionResult> GetGuestToken()
-    {
-      var user = await gameboardManager.ReadUser(User);
-      if (user == null)
-      {
-        // Create a guest user.
-        var newUser = Models.User.CreateGuestUser(Guid.NewGuid().ToString());
-        var success = await gameboardRepository.CreateUser(newUser);
-        if (!success)
-        {
-          return Conflict();
-        }
+			var token = tokenCache.GenerateToken(user.Id);
+			return new JsonResult(new GetTokenResponse(token));
+		}
 
-        var identity = newUser.CreateClaimsIdentity();
-        await HttpContext.SignInAsync(
-          CookieAuthenticationDefaults.AuthenticationScheme,
-          new ClaimsPrincipal(identity),
-          authenticationProps
-        );
-        user = newUser;
-      }
+		[HttpGet("GuestToken")]
+		[AllowAnonymous]
+		public async Task<IActionResult> GetGuestToken()
+		{
+			var user = await gameboardManager.ReadUser(User);
+			if (user == null)
+			{
+				// Create a guest user.
+				var newUser = Models.User.CreateGuestUser(Guid.NewGuid().ToString());
+				var success = await gameboardRepository.CreateUser(newUser);
+				if (!success)
+				{
+					return Conflict();
+				}
 
-      var token = tokenCache.GenerateToken(user.Id.ToString());
-      return this.Ok(new GetGuestTokenResponse(user.Id, user.DisplayName, token));
-    }
-  }
+				var identity = newUser.CreateClaimsIdentity();
+				await HttpContext.SignInAsync(
+					CookieAuthenticationDefaults.AuthenticationScheme,
+					new ClaimsPrincipal(identity),
+					authenticationProps
+				);
+				user = newUser;
+			}
+
+			var token = tokenCache.GenerateToken(user.Id.ToString());
+			return this.Ok(new GetGuestTokenResponse(user.Id, user.DisplayName, token));
+		}
+	}
 }