From d92bc8418b943d5da0111e7daecb3a57940844b3 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Sun, 10 Apr 2022 13:51:30 +0200
Subject: [PATCH] Fix base URLs.

---
 backend/src/Squidex.Web/Resources.cs                  | 11 ++++++++++-
 .../Areas/Api/Controllers/Assets/Models/AssetDto.cs   |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/Squidex.Web/Resources.cs b/backend/src/Squidex.Web/Resources.cs
index 6ca705f9d..78cd1edc2 100644
--- a/backend/src/Squidex.Web/Resources.cs
+++ b/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
         {
-            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)
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs
index fc4f43876..9cfee697e 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs
@@ -190,7 +190,10 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models
             if (resources.CanUpdateAsset)
             {
                 AddPutLink("update", resources.Url<AssetsController>(x => nameof(x.PutAsset), values));
+            }
 
+            if (resources.CanUpdateAsset)
+            {
                 AddPutLink("move", resources.Url<AssetsController>(x => nameof(x.PutAssetParent), values));
             }