Skip to content

Commit

Permalink
Fix generated map urls ignoring PathBase (#6)
Browse files Browse the repository at this point in the history
* Fix fetching submodules ignoring update rule set to none
Bump version to 1.1.1

* Replace libgit2sharp (#3)

* Work on ssh support for repositories

* Add git check to preflight checks
Replace libgit2sharp with just running git commands using process

* Implement reverse proxy header and path base configuration options
Bump version number

* Fix generated urls for maps not taking PathBase into account
  • Loading branch information
juliangiebel authored Sep 21, 2023
1 parent 5dd42b8 commit 8e90118
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion SS14.MapServer/Controllers/GitHubWebhookController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ private string GetGridImageUrl(Guid mapGuid, int gridId)
{
//Can't access Url.Action here
return
$"{_serverConfiguration.Host.Scheme}://{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}/api/Image/grid/{mapGuid}/{gridId}";
$"{_serverConfiguration.Host.Scheme}://{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}{_serverConfiguration.PathBase}/api/Image/grid/{mapGuid}/{gridId}";
}
}

Expand Down
2 changes: 1 addition & 1 deletion SS14.MapServer/Controllers/MapController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ private Map SetMapGridUrls(Map map)
"Image",
new { id = map.MapGuid, gridId = grid.GridId },
_serverConfiguration.Host.Scheme,
$"{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}"
$"{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}{_serverConfiguration.PathBase}"
);
}
map.Grids.Sort((grid, grid1) => grid1.Extent.CompareTo(grid.Extent));
Expand Down

0 comments on commit 8e90118

Please sign in to comment.