Browse Source

Fix base URLs.

pull/866/head
Sebastian 4 years ago
parent
commit
d92bc8418b
  1. 11
      backend/src/Squidex.Web/Resources.cs
  2. 3
      backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs

11
backend/src/Squidex.Web/Resources.cs

@ -185,7 +185,16 @@ namespace Squidex.Web
public string Url<T>(Func<T?, string> action, object? values = null) where T : ApiController public string Url<T>(Func<T?, string> action, object? values = null) where T : ApiController
{ {
return Controller.Url(action, values); var url = Controller.Url(action, values);
var basePath = Controller.HttpContext.Request.PathBase;
if (url.StartsWith(Controller.HttpContext.Request.PathBase, StringComparison.OrdinalIgnoreCase))
{
url = url[basePath.Value!.Length..];
}
return url;
} }
public bool IsUser(string userId) public bool IsUser(string userId)

3
backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs

@ -190,7 +190,10 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models
if (resources.CanUpdateAsset) if (resources.CanUpdateAsset)
{ {
AddPutLink("update", resources.Url<AssetsController>(x => nameof(x.PutAsset), values)); AddPutLink("update", resources.Url<AssetsController>(x => nameof(x.PutAsset), values));
}
if (resources.CanUpdateAsset)
{
AddPutLink("move", resources.Url<AssetsController>(x => nameof(x.PutAssetParent), values)); AddPutLink("move", resources.Url<AssetsController>(x => nameof(x.PutAssetParent), values));
} }

Loading…
Cancel
Save