Merged in development (pull request #43)

Development

Gameboard.ShogiUI.Sockets.ServiceModels/Api/Messages/GetGuestToken.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AspShogiSockets.ServiceModels.Api.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
 {
   public class GetGuestToken
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Api/Messages/GetToken.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Websockets.ServiceModels
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
 {
     public class GetTokenResponse
     {

Gameboard.ShogiUI.Sockets.ServiceModels/Api/Messages/PostGameInvitation.cs

@@ -1,9 +1,14 @@
-namespace AspShogiSockets.ServiceModels.Api.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
 {
   public class PostGameInvitation
   {
     public string SessionName { get; set; }
   }
+  public class PostGuestGameInvitation
+  {
+    public string GuestId { get; set; }
+    public string SessionName { get; set; }
+  }
   public class PostGameInvitationResponse
   {
     public string Code { get; }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Interfaces/IRequest.cs

@@ -1,6 +1,6 @@
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets.ServiceModels.Interfaces
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces
 {
     public interface IRequest
     {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Interfaces/IResponse.cs

@@ -1,4 +1,4 @@
-namespace Websockets.ServiceModels.Interfaces
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces
 {
     public interface IResponse
     {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/CreateGame.cs

@@ -1,7 +1,7 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets.ServiceModels.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 {
   public class CreateGameRequest : IRequest
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/ErrorResponse.cs

@@ -1,16 +1,16 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets.ServiceModels.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 {
-    public class ErrorResponse : IResponse
+  public class ErrorResponse : IResponse
-    {
+  {
-        public string Action { get; private set; }
+    public string Action { get; private set; }
-        public string Error { get; set; }
+    public string Error { get; set; }
 
-        public ErrorResponse(ClientAction action)
+    public ErrorResponse(ClientAction action)
-        {
+    {
-            Action = action.ToString();
+      Action = action.ToString();
-        }
     }
+  }
 }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/JoinByCode.cs

@@ -1,7 +1,7 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets.ServiceModels.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 {
   public class JoinByCode : IRequest
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/JoinGame.cs

@@ -1,7 +1,7 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets.ServiceModels.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 {
   public class JoinGameRequest : IRequest
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/ListGames.cs

@@ -1,24 +1,23 @@
-using System.Collections.Generic;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using System.Collections.Generic;
 
-using Websockets.ServiceModels.Interfaces;
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
-using Websockets.ServiceModels.Types;
-
-namespace Websockets.ServiceModels.Messages
 {
-    public class ListGamesRequest : IRequest
+  public class ListGamesRequest : IRequest
-    {
+  {
-        public ClientAction Action { get; set; }
+    public ClientAction Action { get; set; }
-    }
+  }
 
-    public class ListGamesResponse : IResponse
+  public class ListGamesResponse : IResponse
-    {
+  {
-        public string Action { get; private set; }
+    public string Action { get; private set; }
-        public string Error { get; set; }
+    public string Error { get; set; }
-        public IEnumerable<Game> Games { get; set; }
+    public IEnumerable<Game> Games { get; set; }
 
-        public ListGamesResponse(ClientAction action)
+    public ListGamesResponse(ClientAction action)
-        {
+    {
-            Action = action.ToString();
+      Action = action.ToString();
-        }
     }
+  }
 }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/LoadGame.cs

@@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
-using Websockets.ServiceModels.Types;
+using System.Collections.Generic;
 
-namespace Websockets.ServiceModels.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 {
   public class LoadGameRequest : IRequest
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Messages/Move.cs

@@ -1,7 +1,7 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets.ServiceModels.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 {
   public class MoveRequest : IRequest
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Types/ClientActionEnum.cs

@@ -1,4 +1,4 @@
-namespace Websockets.ServiceModels.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
 {
     public enum ClientAction
     {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Types/Coords.cs

@@ -1,4 +1,4 @@
-namespace Websockets.ServiceModels.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
 {
     public class Coords
     {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Types/Game.cs

@@ -1,4 +1,4 @@
-namespace Websockets.ServiceModels.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
 {
     public class Game
     {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Types/Move.cs

@@ -1,4 +1,4 @@
-namespace Websockets.ServiceModels.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
 {
     public class Move
     {

Gameboard.ShogiUI.Sockets/Controllers/GameController.cs

@@ -1,30 +1,61 @@
-using AspShogiSockets.ServiceModels.Api.Messages;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.Repositories.RepositoryManagers;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Linq;
 using System.Threading.Tasks;
-using Websockets.Repositories;
 
-namespace AspShogiSockets.Controllers
+namespace Gameboard.ShogiUI.Sockets.Controllers
 {
   [Authorize]
   [ApiController]
   [Route("[controller]")]
   public class GameController : ControllerBase
   {
-    private readonly IGameboardRepository gameboardRepository;
+    private readonly IGameboardRepositoryManager manager;
+    private readonly IGameboardRepository repository;
 
-    public GameController(IGameboardRepository gameboardRepository)
+    public GameController(
+      IGameboardRepository repository,
+      IGameboardRepositoryManager manager)
     {
-      this.gameboardRepository = gameboardRepository;
+      this.manager = manager;
+      this.repository = repository;
     }
 
     [Route("JoinCode")]
     public async Task<IActionResult> PostGameInvitation([FromBody] PostGameInvitation request)
     {
       var userName = HttpContext.User.Claims.First(c => c.Type == "preferred_username").Value;
-      var code = (await gameboardRepository.PostJoinCode(request.SessionName, userName)).JoinCode;
+      var isPlayer1 = await manager.IsPlayer1(request.SessionName, userName);
-      return new CreatedResult("", new PostGameInvitationResponse(code));
+      if (isPlayer1)
+      {
+        var code = (await repository.PostJoinCode(request.SessionName, userName)).JoinCode;
+        return new CreatedResult("", new PostGameInvitationResponse(code));
+      }
+      else
+      {
+        return new UnauthorizedResult();
+      }
+    }
+
+    [AllowAnonymous]
+    [Route("GuestJoinCode")]
+    public async Task<IActionResult> PostGuestGameInvitation([FromBody] PostGuestGameInvitation request)
+    {
+
+      var isGuest = manager.IsGuest(request.GuestId);
+      var isPlayer1 = manager.IsPlayer1(request.SessionName, request.GuestId);
+      if (isGuest && await isPlayer1)
+      {
+        var code = (await repository.PostJoinCode(request.SessionName, request.GuestId)).JoinCode;
+        return new CreatedResult("", new PostGameInvitationResponse(code));
+      }
+      else
+      {
+        return new UnauthorizedResult();
+      }
     }
   }
 }

Gameboard.ShogiUI.Sockets/Controllers/SocketController.cs

@@ -1,15 +1,13 @@
-using AspShogiSockets.Repositories.RepositoryManagers;
+using Gameboard.ShogiUI.Sockets.Managers;
-using AspShogiSockets.ServiceModels.Api.Messages;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.Repositories.RepositoryManagers;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Websockets.Managers;
-using Websockets.Repositories;
-using Websockets.ServiceModels;
 
-namespace Websockets.Controllers
+namespace Gameboard.ShogiUI.Sockets.Controllers
 {
   [Authorize]
   [Route("[controller]")]

Gameboard.ShogiUI.Sockets/Extensions/WebSocketExtensions.cs

@@ -4,7 +4,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AspShogiSockets.Extensions
+namespace Gameboard.ShogiUI.Sockets.Extensions
 {
   public static class WebSocketExtensions
   {

Gameboard.ShogiUI.Sockets/Gameboard.ShogiUI.Sockets.csproj.user

@@ -4,6 +4,7 @@
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
     <ActiveDebugProfile>AspShogiSockets</ActiveDebugProfile>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/CreateGameHandler.cs

@@ -1,14 +1,14 @@
-using AspShogiSockets.Extensions;
+using Gameboard.Shogi.Api.ServiceModels.Messages;
-using Gameboard.Shogi.Api.ServiceModels.Messages;
+using Gameboard.ShogiUI.Sockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Repositories;
-using Websockets.ServiceModels.Messages;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class CreateGameHandler : IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/IActionHandler.cs

@@ -1,8 +1,8 @@
-using System.Net.WebSockets;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public interface IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/JoinByCodeHandler.cs

@@ -1,14 +1,14 @@
-using AspShogiSockets.Extensions;
+using Gameboard.Shogi.Api.ServiceModels.Messages;
-using Gameboard.Shogi.Api.ServiceModels.Messages;
+using Gameboard.ShogiUI.Sockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Repositories;
-using Websockets.ServiceModels.Messages;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class JoinByCodeHandler : IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/JoinGameHandler.cs

@@ -1,13 +1,13 @@
 using Gameboard.Shogi.Api.ServiceModels.Messages;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Repositories;
-using Websockets.ServiceModels.Messages;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class JoinGameHandler : IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/ListGamesHandler.cs

@@ -1,15 +1,15 @@
-using AspShogiSockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
 using System.Linq;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Repositories;
-using Websockets.ServiceModels.Messages;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class ListGamesHandler : IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs

@@ -1,15 +1,15 @@
-using AspShogiSockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Managers.Utility;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Linq;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Managers.Utility;
-using Websockets.Repositories;
-using Websockets.ServiceModels.Messages;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class LoadGameHandler : IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/MoveHandler.cs

@@ -1,15 +1,15 @@
-using AspShogiSockets.Extensions;
+using Gameboard.Shogi.Api.ServiceModels.Messages;
-using Gameboard.Shogi.Api.ServiceModels.Messages;
+using Gameboard.ShogiUI.Sockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Managers.Utility;
+using Gameboard.ShogiUI.Sockets.Repositories;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Managers.Utility;
-using Websockets.Repositories;
-using Websockets.ServiceModels.Messages;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers.ClientActionHandlers
+namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
 {
   public class MoveHandler : IActionHandler
   {

Gameboard.ShogiUI.Sockets/Managers/SocketCommunicationManager.cs

@@ -1,5 +1,7 @@
-using AspShogiSockets.Extensions;
+using Gameboard.ShogiUI.Sockets.Extensions;
-using AspShogiSockets.Managers.Utility;
+using Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers;
+using Gameboard.ShogiUI.Sockets.Managers.Utility;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
@@ -8,10 +10,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Websockets.Managers.ClientActionHandlers;
-using Websockets.ServiceModels.Types;
 
-namespace Websockets.Managers
+namespace Gameboard.ShogiUI.Sockets.Managers
 {
   public interface ISocketCommunicationManager
   {
@@ -68,6 +68,12 @@ namespace Websockets.Managers
         {
           logger.LogError(ex.Message);
         }
+        catch(WebSocketException ex)
+        {
+          logger.LogInformation($"{nameof(WebSocketException)} in {nameof(SocketCommunicationManager)}.");
+          logger.LogInformation("Probably tried writing to a closed socket.");
+          logger.LogError(ex.Message);
+        }
       }
       UnsubscribeFromBroadcastAndGames(userName);
     }

Gameboard.ShogiUI.Sockets/Managers/SocketConnectionManager.cs

@@ -3,7 +3,7 @@ using System;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace Websockets.Managers
+namespace Gameboard.ShogiUI.Sockets.Managers
 {
   public interface ISocketConnectionManager
   {

Gameboard.ShogiUI.Sockets/Managers/SocketTokenManager.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Websockets.Managers
+namespace Gameboard.ShogiUI.Sockets.Managers
 {
   public interface ISocketTokenManager
   {

Gameboard.ShogiUI.Sockets/Managers/Utility/JsonRequest.cs

@@ -1,15 +1,15 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
 
-namespace Websockets.Managers.Utility
+namespace Gameboard.ShogiUI.Sockets.Managers.Utility
 {
-    public class JsonRequest
+  public class JsonRequest
+  {
+    public IRequest Request { get; private set; }
+    public string Json { get; private set; }
+    public JsonRequest(IRequest request, string json)
     {
-        public IRequest Request { get; private set; }
+      Request = request;
-        public string Json { get; private set; }
+      Json = json;
-        public JsonRequest(IRequest request, string json)
-        {
-            Request = request;
-            Json = json;
-        }
     }
+  }
 }

Gameboard.ShogiUI.Sockets/Managers/Utility/Mapper.cs

@@ -1,67 +1,67 @@
-using Microsoft.FSharp.Core;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
-using Websockets.ServiceModels.Types;
+using Microsoft.FSharp.Core;
 using GameboardTypes = Gameboard.Shogi.Api.ServiceModels.Types;
 
-namespace Websockets.Managers.Utility
+namespace Gameboard.ShogiUI.Sockets.Managers.Utility
 {
-    public static class Mapper
+  public static class Mapper
+  {
+    public static GameboardTypes.Move Map(Move source)
     {
-        public static GameboardTypes.Move Map(Move source)
+      var from = source.From;
-        {
+      var to = source.To;
-            var from = source.From;
+      FSharpOption<GameboardTypes.PieceName> pieceFromCaptured = source.PieceFromCaptured switch
-            var to = source.To;
+      {
-            FSharpOption<GameboardTypes.PieceName> pieceFromCaptured = source.PieceFromCaptured switch
+        "B" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Bishop),
-            {
+        "G" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.GoldenGeneral),
-                "B" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Bishop),
+        "K" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.King),
-                "G" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.GoldenGeneral),
+        "k" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Knight),
-                "K" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.King),
+        "L" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Lance),
-                "k" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Knight),
+        "P" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Pawn),
-                "L" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Lance),
+        "R" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Rook),
-                "P" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Pawn),
+        "S" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.SilverGeneral),
-                "R" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.Rook),
+        _ => null
-                "S" => new FSharpOption<GameboardTypes.PieceName>(GameboardTypes.PieceName.SilverGeneral),
+      };
-                _ => null
+      var target = new GameboardTypes.Move
-            };
+      {
-            var target = new GameboardTypes.Move
+        Origin = new GameboardTypes.BoardLocation { X = from.X, Y = from.Y },
-            {
+        Destination = new GameboardTypes.BoardLocation { X = to.X, Y = to.Y },
-                Origin = new GameboardTypes.BoardLocation { X = from.X, Y = from.Y },
+        IsPromotion = source.IsPromotion,
-                Destination = new GameboardTypes.BoardLocation { X = to.X, Y = to.Y },
+        PieceFromCaptured = pieceFromCaptured
-                IsPromotion = source.IsPromotion,
+      };
-                PieceFromCaptured = pieceFromCaptured
+      return target;
-            };
-            return target;
-        }
-
-        public static Move Map(GameboardTypes.Move source)
-        {
-            var origin = source.Origin;
-            var destination = source.Destination;
-            string pieceFromCaptured = null;
-            if (source.PieceFromCaptured != null)
-            {
-                pieceFromCaptured = source.PieceFromCaptured.Value switch
-                {
-                    GameboardTypes.PieceName.Bishop => "B",
-                    GameboardTypes.PieceName.GoldenGeneral => "G",
-                    GameboardTypes.PieceName.King => "K",
-                    GameboardTypes.PieceName.Knight => "k",
-                    GameboardTypes.PieceName.Lance => "L",
-                    GameboardTypes.PieceName.Pawn => "P",
-                    GameboardTypes.PieceName.Rook => "R",
-                    GameboardTypes.PieceName.SilverGeneral => "S",
-                    _ => ""
-                };
-            }
-
-            var target = new Move
-            {
-                From = new Coords { X = origin.X, Y = origin.Y },
-                To = new Coords { X = destination.X, Y = destination.Y },
-                IsPromotion = source.IsPromotion,
-                PieceFromCaptured = pieceFromCaptured
-            };
-
-            return target;
-        }
     }
+
+    public static Move Map(GameboardTypes.Move source)
+    {
+      var origin = source.Origin;
+      var destination = source.Destination;
+      string pieceFromCaptured = null;
+      if (source.PieceFromCaptured != null)
+      {
+        pieceFromCaptured = source.PieceFromCaptured.Value switch
+        {
+          GameboardTypes.PieceName.Bishop => "B",
+          GameboardTypes.PieceName.GoldenGeneral => "G",
+          GameboardTypes.PieceName.King => "K",
+          GameboardTypes.PieceName.Knight => "k",
+          GameboardTypes.PieceName.Lance => "L",
+          GameboardTypes.PieceName.Pawn => "P",
+          GameboardTypes.PieceName.Rook => "R",
+          GameboardTypes.PieceName.SilverGeneral => "S",
+          _ => ""
+        };
+      }
+
+      var target = new Move
+      {
+        From = new Coords { X = origin.X, Y = origin.Y },
+        To = new Coords { X = destination.X, Y = destination.Y },
+        IsPromotion = source.IsPromotion,
+        PieceFromCaptured = pieceFromCaptured
+      };
+
+      return target;
+    }
+  }
 }

Gameboard.ShogiUI.Sockets/Managers/Utility/Request.cs

@@ -1,11 +1,11 @@
-using Websockets.ServiceModels.Interfaces;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace AspShogiSockets.Managers.Utility
+namespace Gameboard.ShogiUI.Sockets.Managers.Utility
 {
-    public class Request : IRequest
+  public class Request : IRequest
-    {
+  {
-        public ClientAction Action { get; set; }
+    public ClientAction Action { get; set; }
-        public string PlayerName { get; set; }
+    public string PlayerName { get; set; }
-    }
+  }
 }

Gameboard.ShogiUI.Sockets/Program.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace Websockets
+namespace Gameboard.ShogiUI.Sockets
 {
   public class Program
   {

Gameboard.ShogiUI.Sockets/Repositories/GameboardRepository.cs

@@ -4,9 +4,9 @@ using System;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Websockets.Repositories.Utility;
+using Gameboard.ShogiUI.Sockets.Repositories.Utility;
 
-namespace Websockets.Repositories
+namespace Gameboard.ShogiUI.Sockets.Repositories
 {
   public interface IGameboardRepository
   {

Gameboard.ShogiUI.Sockets/Repositories/RepositoryManagers/GameboardRepositoryManager.cs

@@ -1,19 +1,21 @@
 using Gameboard.Shogi.Api.ServiceModels.Messages;
 using System;
 using System.Threading.Tasks;
-using Websockets.Repositories;
 
-namespace AspShogiSockets.Repositories.RepositoryManagers
+namespace Gameboard.ShogiUI.Sockets.Repositories.RepositoryManagers
 {
   public interface IGameboardRepositoryManager
   {
     Task<string> CreateGuestUser();
+    Task<bool> IsPlayer1(string sessionName, string playerName);
+    bool IsGuest(string playerName);
   }
 
   public class GameboardRepositoryManager : IGameboardRepositoryManager
   {
-    private readonly IGameboardRepository repository;
     private const int MaxTries = 3;
+    private const string GuestPrefix = "Guest-";
+    private readonly IGameboardRepository repository;
 
     public GameboardRepositoryManager(IGameboardRepository repository)
     {
@@ -39,5 +41,23 @@ namespace AspShogiSockets.Repositories.RepositoryManagers
       }
       throw new OperationCanceledException($"Failed to create guest user after {MaxTries} tries.");
     }
+
+    public async Task<bool> IsPlayer1(string sessionName, string playerName)
+    {
+      var session = await repository.GetGame(sessionName);
+      return session?.Session.Player1 == playerName;
+    }
+
+    public async Task<string> CreateJoinCode(string sessionName, string playerName)
+    {
+      var getGameResponse = await repository.GetGame(sessionName);
+      if (playerName == getGameResponse?.Session.Player1)
+      {
+        return (await repository.PostJoinCode(sessionName, playerName)).JoinCode;
+      }
+      return null;
+    }
+
+    public bool IsGuest(string playerName) => playerName.StartsWith(GuestPrefix);
   }
 }

Gameboard.ShogiUI.Sockets/Repositories/Utility/AuthenticatedHttpClient.cs

@@ -6,7 +6,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace Websockets.Repositories.Utility
+namespace Gameboard.ShogiUI.Sockets.Repositories.Utility
 {
   public interface IAuthenticatedHttpClient
   {

Gameboard.ShogiUI.Sockets/Startup.cs

@@ -1,4 +1,4 @@
-using AspShogiSockets.Repositories.RepositoryManagers;
+using Gameboard.ShogiUI.Sockets.Repositories.RepositoryManagers;
 using Gameboard.ShogiUI.Sockets.Extensions;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
@@ -12,13 +12,13 @@ using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Websockets.Managers;
+using Gameboard.ShogiUI.Sockets.Managers;
-using Websockets.Managers.ClientActionHandlers;
+using Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers;
-using Websockets.Repositories;
+using Gameboard.ShogiUI.Sockets.Repositories;
-using Websockets.Repositories.Utility;
+using Gameboard.ShogiUI.Sockets.Repositories.Utility;
-using Websockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
 
-namespace Websockets
+namespace Gameboard.ShogiUI.Sockets
 {
   public class Startup
   {