refacto site settings

src/Yavsc.Blogs.Tests/BlogApiTests.cs

@@ -11,6 +11,7 @@ using Yavsc.Server.Helpers;
 using Yavsc.Tests.Shared;
 using Yavsc.Blogs.Tests.Fixtures;
 using BlogPostDto = Yavsc.Blogspot.BlogPostDto;
+using NuGet.Protocol;
 
 namespace Yavsc.Blogs.Tests;
 
@@ -338,9 +339,9 @@ public sealed class BlogApiTests : IClassFixture<BlogsWebServerFixture>
         ResetAndSeedDefaultUser();
         using var http = NewClient(subject: "tester");
 
-        var previousRoot = "blog";
-        var tempRoot = Path.Combine(Path.GetTempPath(), "yavsc-blogs-tests-files-" + Guid.NewGuid().ToString("N"));
-        Directory.CreateDirectory(tempRoot);
+        // AttachFiles writes under the fixture-configured
+        // SiteSettings.Blog (BlogFilesRoot), not a local temp dir.
+        var filesRoot = _fixture.BlogFilesRoot;
 
         try
         {
@@ -373,8 +374,10 @@ public sealed class BlogApiTests : IClassFixture<BlogsWebServerFixture>
                 DateModified = DateTime.UtcNow
             };
 
-            var form = new MultipartFormDataContent();
-            form.Add(new StringContent(JsonSerializer.Serialize(update)), "blog");
+            var form = new MultipartFormDataContent
+            {
+                { new StringContent(JsonSerializer.Serialize(update)), "blog" }
+            };
 
             var fileBytes = System.Text.Encoding.UTF8.GetBytes("payload test");
             var fileContent = new ByteArrayContent(fileBytes);
@@ -404,7 +407,9 @@ public sealed class BlogApiTests : IClassFixture<BlogsWebServerFixture>
         }
         finally
         {
-            try { Directory.Delete(tempRoot, recursive: true); } catch { }
+            // BlogFilesRoot is the fixture-shared temp root (one per
+            // test run); leave it in place for the other multipart
+            // tests. The OS reclaims it.
         }
     }
 
@@ -478,9 +483,9 @@ public sealed class BlogApiTests : IClassFixture<BlogsWebServerFixture>
         ResetAndSeedDefaultUser();
         using var http = NewClient(subject: "tester");
 
-        var previousRoot = "blog";
-        var tempRoot = Path.Combine(Path.GetTempPath(), "yavsc-blogs-tests-files-" + Guid.NewGuid().ToString("N"));
-        Directory.CreateDirectory(tempRoot);
+        // AttachFiles writes under the fixture-configured
+        // SiteSettings.Blog (BlogFilesRoot), not a local temp dir.
+        var filesRoot = _fixture.BlogFilesRoot;
 
         try
         {
@@ -566,16 +571,18 @@ public sealed class BlogApiTests : IClassFixture<BlogsWebServerFixture>
             // markdown link points:
             // {UserFilesDirName}/{user}/blogs/{postId}/{fileName}.
             var expectedFile = Path.Combine(
-                tempRoot, "tester", "blogs", created.Id.ToString(), "note.txt");
-            var written = Directory.Exists(tempRoot)
-                ? string.Join(", ", Directory.EnumerateFiles(tempRoot, "*", SearchOption.AllDirectories))
+                filesRoot, "tester", "blogs", created.Id.ToString(), "note.txt");
+            var written = Directory.Exists(filesRoot)
+                ? string.Join(", ", Directory.EnumerateFiles(filesRoot, "*", SearchOption.AllDirectories))
                 : "<none>";
             Assert.True(File.Exists(expectedFile),
                 $"Expected uploaded file at {expectedFile}. Actually written: {written}");
         }
         finally
         {
-            try { Directory.Delete(tempRoot, recursive: true); } catch { }
+            // BlogFilesRoot is the fixture-shared temp root (one per
+            // test run); leave it in place for the other multipart
+            // tests. The OS reclaims it.
         }
     }
 

src/Yavsc.Blogs.Tests/Fixtures/BlogsWebServerFixture.cs

@@ -63,6 +63,16 @@ public sealed class BlogsWebServerFixture : WebHostFixture
     public long PostId { get; private set; }
     public string DefaultUserLogin { get => "alice"; }
 
+    /// <summary>Root directory under which
+    /// <c>BlogSpotService.AttachFiles</c> writes uploaded files
+    /// during tests (the configured <c>SiteSettings.Blog</c>).
+    /// Attachments land at
+    /// <c>{BlogFilesRoot}/{userName}/blogs/{postId}/{fileName}</c>.
+    /// A fresh per-run temp directory, so tests can assert on the
+    /// physical file without touching the developer's real
+    /// user-files tree.</summary>
+    public string BlogFilesRoot { get; private set; } = string.Empty;
+
     // A single SqliteConnection held open at the static level,
     // mirroring how Yavsc.Org.Tests.WebServerFixture hoists its
     // shared configuration into static slots. Closing the
@@ -112,6 +122,18 @@ public sealed class BlogsWebServerFixture : WebHostFixture
         builder.Services.AddSingleton<IFileSystemAuthManager>(
             new NoopFileSystemAuthManager());
 
+        // BlogSpotService.AttachFiles writes uploaded files under
+        // siteSettings.Blog. Without a configured SiteSettings the
+        // IOptions<SiteSettings> value has Blog == null and
+        // Path.Combine(null, …) throws inside AttachFiles' catch-all,
+        // silently persisting no attachment. Point Blog at a
+        // per-run temp directory so the multipart tests can assert
+        // on real files.
+        builder.Services.Configure<SiteSettings>(s =>
+        {
+            s.Blog = BlogFilesRoot;
+        });
+
         // Real BlogSpotService — same instance the production host
         // builds (ApplicationDbContext, IAuthorizationService,
         // IFileSystemAuthManager). With PermissionHandler registered

src/Yavsc.Blogs/Controllers/BlogApiController.cs

@@ -57,12 +57,31 @@ namespace Yavsc.Blogs.Controllers
         [HttpPut("{id}")]
         public async Task<IActionResult> PutBlog(long id)
         {
-            var blog = await ReadPutBlogRequestAsync();
+            var blog = await ReadBlogRequestAsync();
             if (blog is null)
             {
                 return BadRequest(ModelState);
             }
 
+            // Without [FromBody], the data-annotations attributes
+            // ([Required] on Title, etc.) are no longer evaluated by
+            // the model binder — the body is read manually. Run
+            // validation explicitly so an empty Title still yields
+            // 400 (and not a 500 from the DB NOT NULL constraint).
+            var validationContext = new System.ComponentModel.DataAnnotations.ValidationContext(blog);
+            var validationResults = new List<System.ComponentModel.DataAnnotations.ValidationResult>();
+            if (!System.ComponentModel.DataAnnotations.Validator.TryValidateObject(
+                    blog, validationContext, validationResults, validateAllProperties: true))
+            {
+                foreach (var result in validationResults)
+                {
+                    ModelState.AddModelError(
+                        result.MemberNames.FirstOrDefault() ?? string.Empty,
+                        result.ErrorMessage ?? "Invalid value.");
+                }
+                return BadRequest(ModelState);
+            }
+
             // These properties are server-managed or optional graph members and
             // should not block JSON payloads coming from API clients.
             ModelState.Remove(nameof(Models.Blog.BlogPost.Author));
@@ -93,7 +112,8 @@ namespace Yavsc.Blogs.Controllers
 
             try
             {
-                await blogSpotService.Modify(User, blog, files);
+                await blogSpotService.Modify(User, blog);
+                blogSpotService.AttachFiles(files, User.GetUserId(), id);
             }
             catch (AuthorizationFailureException)
             {
@@ -105,8 +125,14 @@ namespace Yavsc.Blogs.Controllers
 
         // POST: api/v1/blogspot
         [HttpPost]
-        public IActionResult PostBlog([FromBody] Models.Blog.BlogPost blog)
+        public async Task<IActionResult> PostBlog()
         {
+            var blog = await ReadBlogRequestAsync();
+            if (blog is null)
+            {
+                return BadRequest(ModelState);
+            }
+
             // These properties are server-managed or optional graph members and
             // should not block JSON payloads coming from API clients.
             ModelState.Remove(nameof(Models.Blog.BlogPost.Author));
@@ -115,35 +141,46 @@ namespace Yavsc.Blogs.Controllers
             ModelState.Remove(nameof(Models.Blog.BlogPost.UserCreated));
             ModelState.Remove(nameof(Models.Blog.BlogPost.UserModified));
 
+            // Without [FromBody], the data-annotations attributes
+            // ([Required] on Title, etc.) are no longer evaluated by
+            // the model binder — the body is read manually. Run
+            // validation explicitly so an empty Title still yields
+            // 400 (and not a 500 from the DB NOT NULL constraint).
+            var validationContext = new System.ComponentModel.DataAnnotations.ValidationContext(blog);
+            var validationResults = new List<System.ComponentModel.DataAnnotations.ValidationResult>();
+            if (!System.ComponentModel.DataAnnotations.Validator.TryValidateObject(
+                    blog, validationContext, validationResults, validateAllProperties: true))
+            {
+                foreach (var result in validationResults)
+                {
+                    ModelState.AddModelError(
+                        result.MemberNames.FirstOrDefault() ?? string.Empty,
+                        result.ErrorMessage ?? "Invalid value.");
+                }
+                return BadRequest(ModelState);
+            }
+
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
             }
 
-            // The BlogSpotService.Create() signature requires an
-            // IFormFileCollection for file uploads. Reading
-            // Request.Form.Files when the request is a plain JSON
-            // body (e.g. from PostIt) throws
-            // "This request does not have a Content-Type header.
-            //  Forms are available from requests with bodies like
-            //  POSTs and a form Content-Type of either
-            //  application/x-www-form-urlencoded or
-            //  multipart/form-data."
-            //
             // Two valid use cases for this endpoint:
             //   1. JSON body only (no files) — PostIt path.
             //   2. multipart/form-data with a 'blog' field + 0..N
-            //      files — future browser / server-rendered path.
+            //      files — PostIt "create with attachments" path.
             //
             // Branch on HasFormContentType: pass the form files when
-            // present, pass an empty collection otherwise. The
-            // FileSystem branch in BlogSpotService.Create then
-            // short-circuits to "no files to handle".
+            // present, pass an empty collection otherwise. Reading
+            // Request.Form.Files on a plain JSON request throws
+            // "This request does not have a Content-Type header…",
+            // and AttachFiles short-circuits on an empty collection.
             var files = Request.HasFormContentType
                 ? Request.Form.Files
                 : (IFormFileCollection)new FormFileCollection();
             var uid = User.GetUserId();
-            var post = blogSpotService.Create(uid, blog, files);
+            var post = blogSpotService.Create(uid, blog);
+            blogSpotService.AttachFiles(files, uid, post.Id);
             return CreatedAtRoute("GetBlog", new { id = post.Id },
             post.GetPayload());
         }
@@ -210,7 +247,17 @@ namespace Yavsc.Blogs.Controllers
             base.Dispose(disposing);
         }
 
-        private async Task<Models.Blog.BlogPost?> ReadPutBlogRequestAsync()
+        /// <summary>
+        /// Read a <see cref="Models.Blog.BlogPost"/> from either a
+        /// JSON body or a multipart/form-data request carrying the
+        /// payload in a <c>blog</c> form field. Shared by
+        /// <see cref="PostBlog"/> and <see cref="PutBlog"/>: both
+        /// accept the two shapes so PostIt can attach files on
+        /// create as well as on update. Returns <c>null</c> (with
+        /// the reason recorded in <c>ModelState</c>) when the
+        /// multipart form has no usable <c>blog</c> field.
+        /// </summary>
+        private async Task<Models.Blog.BlogPost?> ReadBlogRequestAsync()
         {
             if (!Request.HasFormContentType)
             {

src/Yavsc.Org.Tests/appsettings.json

@@ -9,6 +9,10 @@
         "FavIcon": "/favicon.ico",
         "Icon": "/images/yavsc.png",
         "GitRepository": "testingrepo",
+        "Blog": "blog",
+        "Bills": "bills",
+        "TempDir": "temp", 
+        "Avatars": "avatars",
         "Owner": {
             "Name": "Site Owner Name",
             "EMail": "your@email",

src/Yavsc.Org/Controllers/Communicating/BlogspotController.cs

@@ -109,8 +109,9 @@ namespace Yavsc.Org.Controllers
         {
             if (ModelState.IsValid)
             {
-                Models.Blog.BlogPost post = blogSpotService.Create(User.GetUserId(),
-                 blogInput, Request.Form.Files);
+                var uid = User.GetUserId();
+                Models.Blog.BlogPost post = blogSpotService.Create(uid, blogInput);
+                blogSpotService.AttachFiles(Request.Form.Files, uid, post.Id);
                 return RedirectToAction("Index");
             }
             return View("Edit", blogInput);

src/Yavsc.Org/Extensions/HostingExtensions.cs

@@ -1241,6 +1241,26 @@ ADD COLUMN IF NOT EXISTS ""Moderated"" boolean NOT NULL DEFAULT FALSE;");
                SiteSettings settings,
                 bool enableDirectoryBrowsing = false)
     {
+        if (settings.GitRepository == null)
+        {
+            throw new InvalidOperationException("GitRepository path is not configured in SiteSettings.");
+        }
+        if (settings.Blog == null)
+        {
+            throw new InvalidOperationException("Blog path is not configured in SiteSettings.");
+        }
+        if (settings.Avatars == null)
+        {
+            throw new InvalidOperationException("Avatars path is not configured in SiteSettings.");
+        }
+        if (settings.Bills == null)
+        {
+            throw new InvalidOperationException("Bills path is not configured in SiteSettings.");
+        }
+        if (settings.TempDir == null)
+        {
+            throw new InvalidOperationException("TempDir path is not configured in SiteSettings.");
+        }
 
         var userFilesDirInfo = new DirectoryInfo(settings.Blog);
 

src/Yavsc.Org/appsettings-org.json

@@ -33,7 +33,8 @@
     "Bills": "bills",
     "Blog": "blog",
     "TempDir": "temp",
-    "DataDir": "data"
+    "DataDir": "data",
+    "GitRepository": "git"
   },
   "Smtp": {
     "Host": "[YOURSMTPHOST]",

src/Yavsc.Server/Services/BlogSpotService.cs

@@ -35,14 +35,8 @@ public class BlogSpotService
         this.siteSettings = siteSettings.Value;
     }
 
-    public BlogPost Create(string userId, BlogPost post, IFormFileCollection files)
+    public void AttachFiles(IFormFileCollection files, string userId, long postId)
     {
-        // Sauvegarder le post d'abord pour obtenir son ID
-        // Le createur vient de l'authentification, donc on ne le prend pas du post
-        post.AuthorId = userId;
-        _context.BlogSpot.Add(post);
-        _context.SaveChanges(userId);
-
         // Traiter les fichiers attaches s'il y en a
         if (files != null && files.Count > 0)
         {
@@ -52,7 +46,7 @@ public class BlogSpotService
 
             try
             {
-                string blogFilesSubdir = $"blogs/{post.Id}";
+                string blogFilesSubdir = $"blogs/{postId}";
                 string destDir = Path.Combine(
                     siteSettings.Blog,
                     user.UserName,
@@ -76,7 +70,7 @@ public class BlogSpotService
 
                         var attachment = new BlogAttachedFile
                         {
-                            PostId = post.Id,
+                            PostId = postId,
                             FileId = uploadedFile.Id
                         };
                         _context.BlogAttachedFiles.Add(attachment);
@@ -89,7 +83,15 @@ public class BlogSpotService
                 Debug.WriteLine($"Erreur lors du traitement des fichiers : {ex.Message}");
             }
         }
+    }
 
+    public BlogPost Create(string userId, BlogPost post )
+    {
+        // Sauvegarder le post d'abord pour obtenir son ID
+        // Le createur vient de l'authentification, donc on ne le prend pas du post
+        post.AuthorId = userId;
+        _context.BlogSpot.Add(post);
+        _context.SaveChanges(userId);
         return post;
     }
 
@@ -191,58 +193,6 @@ public class BlogSpotService
         _context.SaveChanges(user.GetUserId());
     }
 
-    public async Task Modify(ClaimsPrincipal user, BlogPost blog, IFormFileCollection files)
-    {
-        await Modify(user, blog);
-
-        if (files == null || files.Count == 0)
-            return;
-
-        var userId = user.GetUserId();
-        var userEntity = _context.Users.FirstOrDefault(u => u.Id == userId);
-        if (userEntity == null)
-            return;
-
-        try
-        {
-            string blogFilesSubdir = $"blogs/{blog.Id}";
-            string destDir = Path.Combine(
-                siteSettings.Blog,
-                userEntity.UserName,
-                blogFilesSubdir);
-            var di = new DirectoryInfo(destDir);
-            if (!di.Exists) di.Create();
-
-            foreach (var formFile in files)
-            {
-                var fileInfo = userEntity.ReceiveUserFile(destDir, formFile);
-                if (fileInfo != null && !fileInfo.QuotaOffense)
-                {
-                    var uploadedFile = new UploadedFile
-                    {
-                        Path = fileInfo.FileName,
-                        ContentType = formFile.ContentType,
-                        Length = formFile.Length
-                    };
-                    _context.UploadedFiles.Add(uploadedFile);
-                    _context.SaveChanges(userId);
-
-                    var attachment = new BlogAttachedFile
-                    {
-                        PostId = blog.Id,
-                        FileId = uploadedFile.Id
-                    };
-                    _context.BlogAttachedFiles.Add(attachment);
-                }
-            }
-
-            _context.SaveChanges(userId);
-        }
-        catch (Exception ex)
-        {
-            Debug.WriteLine($"Erreur lors du traitement des fichiers : {ex.Message}");
-        }
-    }
 
     public async Task<IEnumerable<IBlogPost>> Index(ClaimsPrincipal user, string id, int skip = 0, int take = 25)
     {