fix: middleware crash 302

Author: cedev-1

Jellyfin.Plugin.GetAvatar/Jellyfin.Plugin.GetAvatar.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Jellyfin.Plugin.GetAvatar</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyVersion>1.4.0</AssemblyVersion>
-    <FileVersion>1.4.0</FileVersion>
+    <AssemblyVersion>1.4.1</AssemblyVersion>
+    <FileVersion>1.4.1</FileVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>

Jellyfin.Plugin.GetAvatar/ScriptInjectorMiddleware.cs

@@ -51,6 +51,20 @@ public async Task InvokeAsync(HttpContext context)
 
         await _next(context).ConfigureAwait(false);
 
+        if (context.Response.StatusCode is StatusCodes.Status304NotModified or StatusCodes.Status204NoContent)
+        {
+            context.Response.Body = originalBodyStream;
+            return;
+        }
+
+        if (context.Response.StatusCode < 200 || context.Response.StatusCode >= 300)
+        {
+            memoryStream.Seek(0, SeekOrigin.Begin);
+            context.Response.Body = originalBodyStream;
+            await memoryStream.CopyToAsync(originalBodyStream).ConfigureAwait(false);
+            return;
+        }
+
         memoryStream.Seek(0, SeekOrigin.Begin);
 
         var contentType = context.Response.ContentType ?? string.Empty;

Jellyfin.Plugin.GetAvatar/Services/AvatarService.cs

@@ -278,25 +278,14 @@ public async Task SetUserAvatarAsync(Guid userId, string avatarId, string? authT
 
             try
             {
-                // Delete old profile image file if exists
+                // Remember the old path before making changes
+                string? oldProfileImagePath = null;
                 if (user.ProfileImage != null && !string.IsNullOrEmpty(user.ProfileImage.Path))
                 {
-                    var oldPath = user.ProfileImage.Path;
-                    if (File.Exists(oldPath))
-                    {
-                        try
-                        {
-                            File.Delete(oldPath);
-                            _logger.LogInformation("Deleted old profile image: {Path}", oldPath);
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.LogWarning(ex, "Could not delete old profile image");
-                        }
-                    }
+                    oldProfileImagePath = user.ProfileImage.Path;
                 }
 
-                // Copy the new avatar file
+                // Copy the new avatar file first (before deleting anything)
                 File.Copy(avatarPath, profileImagePath, overwrite: true);
                 _logger.LogInformation("Copied avatar to profile path");
 
@@ -314,6 +303,22 @@ public async Task SetUserAvatarAsync(Guid userId, string avatarId, string? authT
 
                 await _userManager.UpdateUserAsync(user).ConfigureAwait(false);
                 _logger.LogInformation("Saved user changes to database");
+
+                // Delete old profile image file after the database update succeeded
+                if (oldProfileImagePath != null
+                    && oldProfileImagePath != profileImagePath
+                    && File.Exists(oldProfileImagePath))
+                {
+                    try
+                    {
+                        File.Delete(oldProfileImagePath);
+                        _logger.LogInformation("Deleted old profile image: {Path}", oldProfileImagePath);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex, "Could not delete old profile image (orphan file left)");
+                    }
+                }
             }
             catch (Exception ex)
             {