From 7105aa4b646713c342a13f38cd32b31cb0e9d5a6 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Tue, 3 Nov 2020 23:17:17 +0100
Subject: [PATCH] Fix asset context issue.

---
 .../Controllers/Assets/AssetContentController.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
index 879e42ee1..213a8bfd0 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
@@ -80,7 +80,12 @@ namespace Squidex.Areas.Api.Controllers.Assets
                 asset = await assetRepository.FindAssetBySlugAsync(AppId, idOrSlug);
             }
 
-            return await DeliverAssetAsync(asset, queries);
+            if (asset != null && queries.Version > EtagVersion.Any && asset.Version != queries.Version)
+            {
+                asset = await assetLoader.GetAsync(App.Id, asset.Id, queries.Version);
+            }
+
+            return DeliverAsset(asset, queries);
         }
 
         /// <summary>
@@ -103,10 +108,10 @@ namespace Squidex.Areas.Api.Controllers.Assets
         {
             var asset = await assetRepository.FindAssetAsync(id);
 
-            return await DeliverAssetAsync(asset, queries);
+            return DeliverAsset(asset, queries);
         }
 
-        private async Task<IActionResult> DeliverAssetAsync(IAssetEntity? asset, AssetContentQueryDto queries)
+        private IActionResult DeliverAsset(IAssetEntity? asset, AssetContentQueryDto queries)
         {
             queries ??= new AssetContentQueryDto();
 
@@ -122,11 +127,6 @@ namespace Squidex.Areas.Api.Controllers.Assets
                 return StatusCode(403);
             }
 
-            if (queries.Version > EtagVersion.Any && asset.Version != queries.Version)
-            {
-                asset = await assetLoader.GetAsync(App.Id, asset.Id, queries.Version);
-            }
-
             var resizeOptions = queries.ToResizeOptions(asset);
 
             FileCallback callback;