Merge pull request #65 from cmu-sei/next

Synchronize Unity challenge ID with TopoMojo gamespace
cmu-sei · Nov 10, 2022 · 003613e · 003613e
2 parents 082cbc3 + 2b2f23c
commit 003613e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/Gameboard.Api/Features/UnityGames/UnityGameController.cs b/src/Gameboard.Api/Features/UnityGames/UnityGameController.cs
@@ -25,7 +25,6 @@ namespace Gameboard.Api.Controllers;
 [Authorize]
 public class UnityGameController : _Controller
 {
-    private readonly CoreOptions _appSettings;
     private readonly ConsoleActorMap _actorMap;
     private readonly GameService _gameService;
     private readonly IHttpClientFactory _httpClientFactory;
@@ -41,7 +40,6 @@ public UnityGameController(
         UnityGamesValidator validator,
         // other stuff
         ConsoleActorMap actorMap,
-        CoreOptions appSettings,
         GameService gameService,
         IHttpClientFactory httpClientFactory,
         IUnityGameService unityGameService,
@@ -51,7 +49,6 @@ IMapper mapper
     ) : base(logger, cache, validator)
     {
         _actorMap = actorMap;
-        _appSettings = appSettings;
         _gameService = gameService;
         _httpClientFactory = httpClientFactory;
         _hub = hub;
@@ -60,13 +57,6 @@ IMapper mapper
         _unityGameService = unityGameService;
     }
 
-    [HttpGet("/api/unity")]
-    [AllowAnonymous]
-    public IActionResult Hi()
-    {
-        return Ok(_appSettings.GameEngineUrl + "    " + Request.GetTypedHeaders().Referer.ToString());
-    }
-
     [HttpGet("/api/unity/{gid}/{tid}")]
     [Authorize]
     public async Task<IActionResult> GetGamespace([FromRoute] string gid, [FromRoute] string tid)
@@ -146,7 +136,7 @@ public async Task<string> UndeployUnitySpace([FromQuery] string gid, [FromRoute]
 
         var vmData = model.Vms.Select(vm =>
         {
-            var consoleHost = new UriBuilder(Request.Scheme, Request.Host.Host, Request.Host.Port ?? -1, "test/gb/mks");
+            var consoleHost = new UriBuilder(Request.Scheme, Request.Host.Host, Request.Host.Port ?? -1, $"{Request.PathBase}/mks");
             consoleHost.Query = $"f=1&s={result.Id}&v={vm.Name}";
 
             return new UnityGameVm

diff --git a/src/Gameboard.Api/Features/UnityGames/UnityGameService.cs b/src/Gameboard.Api/Features/UnityGames/UnityGameService.cs
@@ -122,7 +122,7 @@ ConsoleActorMap actorMap
 
         var newChallengeEntity = new Data.Challenge
         {
-            Id = Guid.NewGuid().ToString("n"),
+            Id = newChallenge.GamespaceId,
             Name = $"{teamCaptain.ApprovedName} vs. Cubespace",
             GameId = challengeSpec.GameId,
             TeamId = newChallenge.TeamId,