misc

.github/workflows/buildAndTest.yml

@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/main.yml

@@ -1,7 +0,0 @@
-on: workflow_call
-jobs:
-  my_first_job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run my action
-        uses: ./.github/worklflows/dotnet

.vscode/launch.json

@@ -4,6 +4,32 @@
     // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "C#: sampleWebAsWebApiClient Debug",
+            "type": "dotnet",
+            "request": "launch",
+            "projectPath": "${workspaceFolder}/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj"
+        },
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/bin/Debug/<target-framework>/<project-name.dll>",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
         
         
    /*   {

.vscode/tasks.json

@@ -9,8 +9,12 @@
             "args": [
                 "build",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+                "/consoleloggerparameters:NoSummary;ForceNoAlign",
+
             ],
+			"group": "build",
+			"isBuildCommand": true,
+			"isTestCommand": false,
             "problemMatcher": "$msCompile"
         },
 		{

contrib/yavsc.service

@@ -15,14 +15,13 @@ WorkingDirectory=/srv/www/yavsc/
 ExecStart=/srv/www/yavsc/Yavsc
 Restart=always
 Environment="HOME=/srv/www/yavsc"
-Environment="ASPNETCORE_ENVIRONMENT=lua"
-Environment="ASPNETCORE_ConnectionStrings__DefaultConnection=Server=localhost;Port=5432;Database=lua;Username=lua;Password=f3s-*Vx$;"
+Environment="ASPNETCORE_ENVIRONMENT=Production"
+Environment="ASPNETCORE_ConnectionStrings__DefaultConnection=YOUR Postgresql CONNECTION STRING"
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 StandardOutput=syslog
 StandardError=syslog
-SyslogIdentifier=isnd
+SyslogIdentifier=yavsc
 
 [Install]
 WantedBy=multi-user.target
-

src/Api/Controllers/Blogspot/FileSystemApiController.cs

@@ -111,9 +111,9 @@ namespace Yavsc.ApiControllers
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
-            var info = user.MoveUserFileToDir(query.id, query.to);
+            var info = user.MoveUserFileToDir(query.Id, query.To);
             if (!info.Done) return new BadRequestObjectResult(info);
-            return Ok(new { moved = query.id });
+            return Ok(new { moved = query.Id });
         }
 
         [HttpPost]
@@ -124,21 +124,21 @@ namespace Yavsc.ApiControllers
             if (!ModelState.IsValid) {
                 var idvr = new ValidRemoteUserFilePathAttribute();
 
-                return this.BadRequest(new { id = idvr.IsValid(query.id), to = idvr.IsValid(query.to), errors = ModelState });
+                return this.BadRequest(new { id = idvr.IsValid(query.Id), to = idvr.IsValid(query.To), errors = ModelState });
             }
-            _logger.LogInformation($"Valid move query: {query.id} => {query.to}");
+            _logger.LogInformation($"Valid move query: {query.Id} => {query.To}");
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
             try {
-                if (Config.UserFilesOptions.FileProvider.GetFileInfo(Path.Combine(user.UserName, query.id)).Exists)
+                if (Config.UserFilesOptions.FileProvider.GetFileInfo(Path.Combine(user.UserName, query.Id)).Exists)
                 {
-                    var result = user.MoveUserFile(query.id, query.to);
+                    var result = user.MoveUserFile(query.Id, query.To);
                     if (!result.Done) return new BadRequestObjectResult(result);
                 }
                 else {
-                    var result = user.MoveUserDir(query.id, query.to);
+                    var result = user.MoveUserDir(query.Id, query.To);
                     if (!result.Done) return new BadRequestObjectResult(result);
                 }
             }

src/Api/Controllers/Blogspot/MoveFileQuery.cs

@@ -1,23 +1,16 @@
 using Yavsc.Attributes.Validation;
 namespace Yavsc.Models.FileSystem
 {
-        public class RenameFileQuery {
-            [ValidRemoteUserFilePath]
-            [YaStringLength(1, 512)]
-            public string id { get; set; } 
 
-            [YaStringLength(0, 512)]
-            [ValidRemoteUserFilePath]
-            public string to { get; set; } 
-        }
-        public class MoveFileQuery {
-            [ValidRemoteUserFilePath]
-            [YaStringLength(1, 512)]
-            public string id { get; set; } 
+    public class MoveFileQuery
+    {
+        [ValidRemoteUserFilePath]
+        [YaStringLength(1, 512)]
+        public required string Id { get; set; }
 
-            [YaStringLength(0, 512)]
-            [ValidRemoteUserFilePath]
-            public string to { get; set; } 
-        }
+        [YaStringLength(0, 512)]
+        [ValidRemoteUserFilePath]
+        public required string To { get; set; }
+    }
 
 }

src/Api/Controllers/Blogspot/RenameFileQuery.cs

@@ -0,0 +1,15 @@
+using Yavsc.Attributes.Validation;
+namespace Yavsc.Models.FileSystem
+{
+    public class RenameFileQuery
+    {
+        [ValidRemoteUserFilePath]
+        [YaStringLength(1, 512)]
+        public required string Id { get; set; }
+
+        [YaStringLength(0, 512)]
+        [ValidRemoteUserFilePath]
+        public required string To { get; set; }
+    }
+
+}

src/Api/Controllers/Business/EstimateApiController.cs

@@ -37,7 +37,7 @@ namespace Yavsc.Controllers
         }
         // GET: api/Estimate{?ownerId=User.GetUserId()}
         [HttpGet]
-        public IActionResult GetEstimates(string ownerId = null)
+        public IActionResult GetEstimates(string? ownerId = null)
         {
             if (ownerId == null) ownerId = User.GetUserId();
             else if (!UserIsAdminOrThis(ownerId)) // throw new Exception("Not authorized") ;

src/Api/Controllers/Business/FrontOfficeApiController.cs

@@ -40,7 +40,7 @@ namespace Yavsc.ApiControllers
             return Ok();
         }
 
-        [HttpPost("query/reject")]
+        [HttpPost("query/accept")]
         public IActionResult AcceptQuery(string billingCode, long queryId)
         {
             if (billingCode == null) return BadRequest("billingCode");
@@ -51,7 +51,6 @@ namespace Yavsc.ApiControllers
             billing.Decided = true;
             dbContext.SaveChanges();
             return Ok();
-
         }
     }
 }

src/Api/Controllers/NativeConfidentialController.cs

@@ -32,7 +32,8 @@ public class NativeConfidentialController : Controller
         [FromBody] DeviceDeclaration declaration)
     {
       var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
-
+      if (uid == null)
+        throw new InvalidOperationException("no name identifier from claims");
       if (!ModelState.IsValid)
       {
         _logger.LogError("Invalid model for GCMD");

src/Api/Controllers/accounting/AccountController.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
 using Yavsc.Api.Helpers;
 using Yavsc.Server.Helpers;
+using System.Diagnostics;
 
 namespace Yavsc.WebApi.Controllers
 {
@@ -30,9 +31,9 @@ namespace Yavsc.WebApi.Controllers
                 return new BadRequestObjectResult(
                         new { error = "user not found" });
             var uid = User.GetUserId();
-
+            Debug.Assert(uid != null, "uid is null");
             var userData = await GetUserData(uid);
-
+            Debug.Assert(userData != null, "userData is null");
             var user = new Yavsc.Models.Auth.Me(userData.Id, userData.UserName, userData.Email,
             userData.Avatar,
             userData.PostalAddress, userData.DedicatedGoogleCalendar);
@@ -57,7 +58,7 @@ namespace Yavsc.WebApi.Controllers
         [HttpGet("myhost")]
         public IActionResult MyHost ()
         {
-            return Ok(new { host = Request.ForHost() });
+            return Ok(new { host = Request.ForwardedFor() });
         }
 
       

src/Api/Helpers/RequestHelpers.cs

@@ -13,8 +13,8 @@ namespace Yavsc.Api.Helpers
     public static class RequestHelpers
     {
         // Check for some apache proxy header, if any
-        public static string ForHost(this HttpRequest request) {
-            string host = request.Headers["X-Forwarded-For"];
+        public static string? ForwardedFor(this HttpRequest request) {
+            string? host = request.Headers["X-Forwarded-For"];
             if (string.IsNullOrEmpty(host)) {
                 host = request.Host.Value;
             } else { // Using X-Forwarded-For last address

src/Api/Helpers/UserHelpers.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Api.Helpers
 {
     public static class UserHelpers
     {
-        public static string GetUserId(this ClaimsPrincipal user)
+        public static string? GetUserId(this ClaimsPrincipal user)
         {
             return user.FindFirstValue("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
         }

src/Api/Program.cs

@@ -11,8 +11,6 @@
 */
 
 using IdentityModel;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
@@ -63,7 +61,8 @@ internal class Program
                      options.IncludeErrorDetails = true;
                      options.Authority = "https://localhost:5001";
                      options.TokenValidationParameters =
-                         new() { ValidateAudience = false };
+                         new() { ValidateAudience = false, RoleClaimType = JwtClaimTypes.Role };
+                     options.MapInboundClaims = true;
                  });
 
         services.AddDbContext<ApplicationDbContext>(options =>
@@ -74,9 +73,9 @@ internal class Program
            .AddTransient<ICalendarManager, CalendarManager>();
         services.AddTransient<IFileSystemAuthManager, FileSystemAuthManager>();
         /*
+          services.AddIdentityApiEndpoints<ApplicationUser>();
           services.AddSingleton<IConnexionManager, HubConnectionManager>();
           services.AddSingleton<ILiveProcessor, LiveProcessor>();
-          services.AddIdentityApiEndpoints<ApplicationUser>();
           services.AddSession();
         */
         WorkflowHelpers.ConfigureBillingService();
@@ -101,15 +100,10 @@ internal class Program
             app.MapDefaultControllerRoute();
             app.MapGet("/identity", (HttpContext context) =>
                 new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value }))
-        );
+            );
 
             //     app.UseSession(); 
             await app.RunAsync();
         }
-        ;
-
-
-
-
     }
 }

src/Yavsc.Abstract/Blogspot/IBlog.cs

@@ -1,16 +1,19 @@
 
 
 
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc
 {
     public interface IBlogPostPayLoad
     {      
-        string Content { get; set; }
-        string Photo { get; set; }
+        string? Content { get; set; }
+        string? Photo { get; set; }
 
     }
-    public interface IBlogPost :IBlogPostPayLoad, ITrackedEntity, IIdentified<long>, ITitle
+    public interface IBlogPost : IBlogPostPayLoad, ITrackedEntity, IIdentified<long>, ITitle
     {
         string AuthorId { get; set; }
+        IApplicationUser Author { get; }
     }
 }

src/Yavsc.Abstract/Constants.cs

@@ -5,21 +5,21 @@ namespace Yavsc
 
     public static class Constants
     {
-        public static readonly Scope[] SiteScopes = { 
-            new Scope { Id = "profile", Description = "Your profile informations" },  
-            new Scope { Id = "book" , Description ="Your booking interface"},  
-            new Scope { Id = "blog" , Description ="Your blogging interface"},  
-            new Scope { Id = "estimate" , Description ="Your estimation interface"},  
-            new Scope { Id = "contract" , Description ="Your contract signature access"}, 
-            new Scope { Id = "admin" , Description ="Your administration rights on this site"}, 
-            new Scope { Id = "moderation" , Description ="Your moderator interface"}, 
+        public static readonly Scope[] SiteScopes = {
+            new Scope { Id = "profile", Description = "Your profile informations" },
+            new Scope { Id = "book" , Description ="Your booking interface"},
+            new Scope { Id = "blog" , Description ="Your blogging interface"},
+            new Scope { Id = "estimate" , Description ="Your estimation interface"},
+            new Scope { Id = "contract" , Description ="Your contract signature access"},
+            new Scope { Id = "admin" , Description ="Your administration rights on this site"},
+            new Scope { Id = "moderation" , Description ="Your moderator interface"},
             new Scope { Id = "frontoffice" , Description ="Your front office interface" }
         };
 
         public const string CompanyClaimType = "https://schemas.pschneider.fr/identity/claims/Company";
         public const string UserNameRegExp = @"^[a-zA-Z][a-zA-Z0-9._-]*$";
         public const string UserFileNamePatternRegExp = @"^([a-zA-Z0-9._-]*/)*[a-zA-Z0-9._-]+$";
-      
+
         public const string LoginPath = "/signin";
         public const string LogoutPath = "/signout";
 
@@ -52,9 +52,7 @@ namespace Yavsc
         public const int MaxUserNameLength = 26;
 
         public const string LivePath = "/live/cast";
-        
-        public const string StreamingPath = "/api/stream/put";
 
-        public const string RoleClaimName = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role";
+        public const string StreamingPath = "/api/stream/put";
     }
 }

src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs

@@ -54,7 +54,7 @@ namespace Yavsc.Models.Google.Messaging
 			/// <summary>
 			/// The error.
 			/// </summary>
-			public string error;
+			public string? error;
 		}
 
 		/// <summary>

src/Yavsc.Abstract/Identity/IApplicationUser.cs

@@ -3,10 +3,10 @@
     public interface IApplicationUser
     {
         string Id { get; set; }
-        string UserName { get; set; }
-        string Avatar { get ; set; }
-        IAccountBalance AccountBalance { get; set; }
-        string DedicatedGoogleCalendar { get; set; }
-        ILocation PostalAddress { get; set; }
+        string? UserName { get; set; }
+        string? Avatar { get ; set; }
+        IAccountBalance? AccountBalance { get; }
+        string? DedicatedGoogleCalendar { get; } 
+        ILocation? PostalAddress { get; }
     }
 }

src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs

@@ -3,7 +3,7 @@ namespace Yavsc.Abstract.Identity.Security
     public interface ICircleAuthorized
     {
         long Id { get; set; }
-        string OwnerId { get; }
+        string AuthorId { get; }
         bool AuthorizeCircle(long circleId);
         ICircleAuthorization [] GetACL();
 

src/Yavsc.Server/.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.6",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}

src/Yavsc.Server/Config.cs

@@ -80,12 +80,12 @@ public static class Config
                 PostLogoutRedirectUris = { "https://localhost:5003/signout-callback-oidc",
                  "http://localhost:5002/signout-callback-oidc" },
 
-                AllowedScopes = { 
+                AllowedScopes = {
                     IdentityServerConstants.StandardScopes.OpenId,
                     IdentityServerConstants.StandardScopes.Profile,
                     IdentityServerConstants.StandardScopes.Email,
                     IdentityServerConstants.StandardScopes.OfflineAccess,
-                    "scope2" }
+                    "scope2" },
             },
         };
 

src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs

@@ -0,0 +1,17 @@
+namespace Yavsc.Server.Exceptions;
+
+[Serializable]
+public class AuthorizationFailureException : Exception
+{
+    public AuthorizationFailureException(Microsoft.AspNetCore.Authorization.AuthorizationResult auth) : base(auth?.Failure?.ToString()??auth?.ToString()??"AuthorizationResult failure")
+    {
+    }
+
+    public AuthorizationFailureException(string? message) : base(message)
+    {
+    }
+
+    public AuthorizationFailureException(string? message, Exception? innerException) : base(message, innerException)
+    {
+    }
+}

src/Yavsc.Server/Helpers/UserHelpers.cs

@@ -24,13 +24,14 @@ namespace Yavsc.Helpers
             return user.Identity.IsAuthenticated;
         }
 
-        public static IEnumerable<BlogPost> UserPosts(this ApplicationDbContext dbContext, string posterId, string readerId)
+        public static IEnumerable<BlogPost> UserPosts(this ApplicationDbContext dbContext, string posterId, string? readerId)
         {
             if (readerId == null)
             {
-                var userPosts = dbContext.BlogSpot.Include(
-                b => b.Author
-                ).Where(x => ((x.AuthorId == posterId))).ToArray();
+                var userPosts = dbContext.blogSpotPublications.Include(
+                b => b.BlogPost
+                ).Where(x => x.BlogPost.AuthorId == posterId)
+                .Select(x=>x.BlogPost).ToArray();
                 return userPosts;
             }
             else

src/Yavsc.Server/Hubs/ChatHub.cs

@@ -29,11 +29,13 @@ using Microsoft.Extensions.Localization;
 
 namespace Yavsc
 {
+    using System.Diagnostics;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.EntityFrameworkCore;
     using Models;
     using Models.Chat;
     using Yavsc.Abstract.Chat;
+    using Yavsc.Helpers;
     using Yavsc.Services;
     public partial class ChatHub : Hub, IDisposable
     {
@@ -192,10 +194,11 @@ namespace Yavsc
                 NotifyUserInRoom(NotificationTypes.Error, room, "already registered.");
                 return;
             }
-            string userName = Context.User.Identity.Name;
+            Debug.Assert(Context.User != null);
+            string userName = Context.User.GetUserName();
             var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName);
 
-            var newroom = new ChatRoom { Name = room, OwnerId = user.Id };
+            var newroom = new ChatRoom { Name = room, OwnerId = Context.User.GetUserId() };
             ChatRoomInfo chanInfo;
             if (_cxManager.TryGetChanInfo(room, out chanInfo))
             {
@@ -319,7 +322,7 @@ namespace Yavsc
 
         async Task NotifyUser(string type, string targetId, string message)
         {
-            _logger.LogInformation("notifying user  {type} {targetId} : {message}");
+            _logger.LogInformation($"notifying user  {type} {targetId} : {message}");
             await Clients.Caller.SendAsync("notifyUser", type, targetId, message);
         }
 
@@ -331,6 +334,8 @@ namespace Yavsc
         [Authorize]
         public async Task SendPV(string userName,  string message)
         {
+            // Authorized code
+            Debug.Assert(Context.User != null);
             _logger.LogInformation($"Sending pv to {userName}");
 
             if (!InputValidator.ValidateUserName(userName)) 
@@ -344,19 +349,21 @@ namespace Yavsc
                 return ;
             }
             _logger.LogInformation($"Message form is validated.");
+                    var identityUserName = Context.User.GetUserName();
 
-            if (userName[0] != '?')
+            if (userName[0] != '?' && Context.User!=null)
                 if (!Context.User.IsInRole(Constants.AdminGroupName))
                 {
+
                     var bl = _dbContext.BlackListed
                         .Include(r => r.User)
                         .Include(r => r.Owner)
-                        .Where(r => r.User.UserName == Context.User.Identity.Name && r.Owner.UserName == userName)
+                        .Where(r => r.User.UserName == identityUserName && r.Owner.UserName == userName)
                         .Select(r => r.OwnerId);
 
                     if (bl.Count() > 0)
                     {
-                        _logger.LogError($"Black listed : {Context.User.Identity.Name}");
+                        _logger.LogError($"Black listed : {identityUserName}");
                         await NotifyUser(NotificationTypes.PrivateMessageDenied, userName, "you are black listed.");
                         return;
                     }
@@ -372,7 +379,7 @@ namespace Yavsc
                 _logger.LogInformation($"cx: {connectionId}");
                 var cli = Clients.Client(connectionId);
                 _logger.LogInformation($"cli: {cli.ToString()}");
-                await cli.SendAsync("addPV", Context.User.Identity.Name, message);
+                await cli.SendAsync("addPV", identityUserName, message);
                 _logger.LogInformation($"Sent pv to cx {connectionId}");
             }
         }
@@ -380,6 +387,9 @@ namespace Yavsc
         [Authorize]
         public async Task SendStream(string connectionId, long streamId,  string message)
         {
+            // Authorized code
+            Debug.Assert(Context.User != null);
+            Debug.Assert(Context.User.Identity != null);
             if (!InputValidator.ValidateMessage(message)) return;
             var sender = Context.User.Identity.Name;
             var cli = Clients.Client(connectionId);

src/Yavsc.Server/Migrations/20250613181510_ActivityNulls.cs

@@ -0,0 +1,108 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class ActivityNulls : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UserModified",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UserCreated",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SettingsClassName",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Photo",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ModeratorGroupName",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UserModified",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UserCreated",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SettingsClassName",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Photo",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ModeratorGroupName",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250620185047_BrusherProfileSchedulerId.cs

@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class BrusherProfileSchedulerId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ScheduleOwnerId",
+                table: "BrusherProfile",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile",
+                column: "ScheduleOwnerId",
+                principalTable: "Schedule",
+                principalColumn: "OwnerId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ScheduleOwnerId",
+                table: "BrusherProfile",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile",
+                column: "ScheduleOwnerId",
+                principalTable: "Schedule",
+                principalColumn: "OwnerId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250628150549_blogPostPub.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogPostPub : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "blogspotPublications",
+                columns: table => new
+                {
+                    BlogpostId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_blogspotPublications", x => x.BlogpostId);
+                    table.ForeignKey(
+                        name: "FK_blogspotPublications_BlogSpot_BlogpostId",
+                        column: x => x.BlogpostId,
+                        principalTable: "BlogSpot",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "blogspotPublications");
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250629174955_blogPusb2.cs

@@ -0,0 +1,79 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogPusb2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_blogspotPublications_BlogSpot_BlogpostId",
+                table: "blogspotPublications");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_blogspotPublications",
+                table: "blogspotPublications");
+
+            migrationBuilder.RenameTable(
+                name: "blogspotPublications",
+                newName: "blogSpotPublications");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Publish",
+                table: "BlogSpot",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_blogSpotPublications",
+                table: "blogSpotPublications",
+                column: "BlogpostId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_blogSpotPublications_BlogSpot_BlogpostId",
+                table: "blogSpotPublications",
+                column: "BlogpostId",
+                principalTable: "BlogSpot",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_blogSpotPublications_BlogSpot_BlogpostId",
+                table: "blogSpotPublications");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_blogSpotPublications",
+                table: "blogSpotPublications");
+
+            migrationBuilder.DropColumn(
+                name: "Publish",
+                table: "BlogSpot");
+
+            migrationBuilder.RenameTable(
+                name: "blogSpotPublications",
+                newName: "blogspotPublications");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_blogspotPublications",
+                table: "blogspotPublications",
+                column: "BlogpostId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_blogspotPublications_BlogSpot_BlogpostId",
+                table: "blogspotPublications",
+                column: "BlogpostId",
+                principalTable: "BlogSpot",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250629175034_blogPub2.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogPub2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250705112955_commentAllowed.cs

@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class commentAllowed : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Comment",
+                table: "CircleAuthorizationToBlogPost",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Avatar",
+                table: "AspNetUsers",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                defaultValue: "/images/Users/icon_user.png",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldDefaultValue: "/images/Users/icon_user.png");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Comment",
+                table: "CircleAuthorizationToBlogPost");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Avatar",
+                table: "AspNetUsers",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "/images/Users/icon_user.png",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true,
+                oldDefaultValue: "/images/Users/icon_user.png");
+        }
+    }
+}

src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -303,6 +303,9 @@ namespace Yavsc.Migrations
                     b.Property<long>("BlogPostId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("Comment")
+                        .HasColumnType("boolean");
+
                     b.HasKey("CircleId", "BlogPostId");
 
                     b.HasIndex("BlogPostId");
@@ -338,7 +341,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("boolean");
 
                     b.Property<string>("Avatar")
-                        .IsRequired()
                         .ValueGeneratedOnAdd()
                         .HasMaxLength(512)
                         .HasColumnType("character varying(512)")
@@ -774,6 +776,9 @@ namespace Yavsc.Migrations
                         .HasMaxLength(1024)
                         .HasColumnType("character varying(1024)");
 
+                    b.Property<bool>("Publish")
+                        .HasColumnType("boolean");
+
                     b.Property<string>("Title")
                         .IsRequired()
                         .HasMaxLength(1024)
@@ -857,6 +862,16 @@ namespace Yavsc.Migrations
                     b.ToTable("Comment");
                 });
 
+            modelBuilder.Entity("Yavsc.Models.BlogSpotPublication", b =>
+                {
+                    b.Property<long>("BlogpostId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("BlogpostId");
+
+                    b.ToTable("blogSpotPublications");
+                });
+
             modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b =>
                 {
                     b.Property<string>("OwnerId")
@@ -1123,7 +1138,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("numeric");
 
                     b.Property<string>("ScheduleOwnerId")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<decimal>("ShampooPrice")
@@ -2081,7 +2095,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("boolean");
 
                     b.Property<string>("ModeratorGroupName")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("Name")
@@ -2092,22 +2105,18 @@ namespace Yavsc.Migrations
                         .HasColumnType("text");
 
                     b.Property<string>("Photo")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<int>("Rate")
                         .HasColumnType("integer");
 
                     b.Property<string>("SettingsClassName")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("UserCreated")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("UserModified")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.HasKey("Code");
@@ -2769,6 +2778,17 @@ namespace Yavsc.Migrations
                     b.Navigation("Post");
                 });
 
+            modelBuilder.Entity("Yavsc.Models.BlogSpotPublication", b =>
+                {
+                    b.HasOne("Yavsc.Models.Blog.BlogPost", "BlogPost")
+                        .WithMany()
+                        .HasForeignKey("BlogpostId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("BlogPost");
+                });
+
             modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b =>
                 {
                     b.HasOne("Yavsc.Models.ApplicationUser", "Owner")
@@ -2840,9 +2860,7 @@ namespace Yavsc.Migrations
                 {
                     b.HasOne("Yavsc.Models.Calendar.Schedule", "Schedule")
                         .WithMany()
-                        .HasForeignKey("ScheduleOwnerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("ScheduleOwnerId");
 
                     b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "BaseProfile")
                         .WithMany()
@@ -3377,8 +3395,7 @@ namespace Yavsc.Migrations
 
             modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
                 {
-                    b.Navigation("AccountBalance")
-                        .IsRequired();
+                    b.Navigation("AccountBalance");
 
                     b.Navigation("BankInfo");
 

src/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs

@@ -8,8 +8,8 @@ namespace Yavsc.Models.Access
 
     public class CircleAuthorizationToBlogPost : ICircleAuthorization
     {
-        public long CircleId { get; set; }
-        public long BlogPostId { get; set; }
+        public long CircleId { get; set; }
+        public long BlogPostId { get; set; }
 
         [JsonIgnore]
         [ForeignKey("BlogPostId")]
@@ -17,7 +17,10 @@ namespace Yavsc.Models.Access
 
         [JsonIgnore]
         [ForeignKey("CircleId")]
-        public virtual Circle Allowed { get; set; }
+        public virtual Circle Allowed { get; set; }
+
+        public bool Comment { get; set; }
+        
 
     }
 }

src/Yavsc.Server/Models/ApplicationDbContext.cs

@@ -1,8 +1,4 @@
 
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
 using Yavsc.Models.Haircut;
 using Yavsc.Models.IT.Evolution;
 using Yavsc.Models.IT.Fixing;
@@ -10,7 +6,6 @@ using Yavsc.Server.Models.EMailing;
 using Yavsc.Server.Models.IT.SourceCode;
 using Yavsc.Server.Models.IT;
 using Yavsc.Models.Streaming;
-using Yavsc.Models.Musical;
 
 namespace Yavsc.Models
 {
@@ -32,7 +27,6 @@ namespace Yavsc.Models
     using Attributes;
     using Bank;
     using Payment;
-    using Calendar;
     using Blog;
     using Yavsc.Abstract.Identity;
     using Microsoft.EntityFrameworkCore;
@@ -41,6 +35,7 @@ namespace Yavsc.Models
 
     using Microsoft.EntityFrameworkCore.ChangeTracking;
     using Yavsc.Abstract.Models.Messaging;
+    using Org.BouncyCastle.Asn1.Crmf;
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
@@ -51,7 +46,7 @@ namespace Yavsc.Models
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
         {
 
-        }  
+        }
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
@@ -61,7 +56,7 @@ namespace Yavsc.Models
             builder.Entity<Contact>().HasKey(x => new { x.OwnerId, x.UserId });
             builder.Entity<DeviceDeclaration>().Property(x => x.DeclarationDate).HasDefaultValueSql("LOCALTIMESTAMP");
             builder.Entity<BlogTag>().HasKey(x => new { x.PostId, x.TagId });
-          
+
             builder.Entity<ApplicationUser>().Property(u => u.FullName).IsRequired(false);
             builder.Entity<ApplicationUser>().Property(u => u.DedicatedGoogleCalendar).IsRequired(false);
             builder.Entity<ApplicationUser>().HasMany<ChatConnection>(c => c.Connections);
@@ -81,7 +76,7 @@ namespace Yavsc.Models
             builder.Entity<Models.Cratie.Option>().HasKey(o => new { o.Code, o.CodeScrutin });
             builder.Entity<Notification>().Property(n => n.icon).HasDefaultValue("exclam");
             builder.Entity<ChatRoomAccess>().HasKey(p => new { room = p.ChannelName, user = p.UserId });
-            builder.Entity<InstrumentRating>().HasAlternateKey(i => new { Instrument= i.InstrumentId, owner = i.OwnerId });
+            builder.Entity<InstrumentRating>().HasAlternateKey(i => new { Instrument = i.InstrumentId, owner = i.OwnerId });
 
             foreach (var et in builder.Model.GetEntityTypes())
             {
@@ -89,23 +84,23 @@ namespace Yavsc.Models
                     et.FindProperty("DateCreated").SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
             }
 
-            builder.Entity<Activity>().Property(a=>a.ParentCode).IsRequired(false);
+            builder.Entity<Activity>().Property(a => a.ParentCode).IsRequired(false);
             //builder.Entity<BlogPost>().HasOne(p => p.Author).WithMany(a => a.Posts);
-            
+
         }
 
         // this is not a failback procedure.
-       
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            var appSetup = (string) AppDomain.CurrentDomain.GetData(Constants.YavscConnectionStringEnvName);
-            if (!string.IsNullOrWhiteSpace(appSetup)) 
+            var appSetup = (string)AppDomain.CurrentDomain.GetData(Constants.YavscConnectionStringEnvName);
+            if (!string.IsNullOrWhiteSpace(appSetup))
             {
                 optionsBuilder.UseNpgsql(appSetup);
                 return;
             }
             var envSetup = Environment.GetEnvironmentVariable(Constants.YavscConnectionStringEnvName);
-            if (envSetup!=null) 
+            if (envSetup != null)
                 optionsBuilder.UseNpgsql(envSetup);
             else optionsBuilder.UseNpgsql();
         }
@@ -125,7 +120,7 @@ namespace Yavsc.Models
         /// Users posts
         /// </summary>
         /// <returns></returns>
-        public DbSet<Blog.BlogPost> BlogSpot { get; set; }
+        public DbSet<BlogPost> BlogSpot { get; set; }
 
         /// <summary>
         /// Skills powered by this site
@@ -226,14 +221,14 @@ namespace Yavsc.Models
                 ((ITrackedEntity)entity.Entity).UserModified = userId;
             }
         }
-        
+
         public int SaveChanges(string userId)
         {
             AddTimestamps(userId);
             return base.SaveChanges();
         }
 
-    
+
 
         public async Task<int> SaveChangesAsync(string userId, CancellationToken ctoken = default(CancellationToken))
         {
@@ -282,7 +277,7 @@ namespace Yavsc.Models
         public DbSet<Comment> Comment { get; set; }
 
         public DbSet<Announce> Announce { get; set; }
-        
+
         // TODO remove and opt for for memory only storing,
         // as long as it must be set empty each time the service is restarted,
         // and that chatting should be kept as must as possible independent from db context
@@ -295,7 +290,7 @@ namespace Yavsc.Models
         public DbSet<GitRepositoryReference> GitRepositoryReference { get; set; }
 
         public DbSet<Project> Project { get; set; }
-        
+
         [Obsolete("use signaled flows")]
         public DbSet<LiveFlow> LiveFlow { get; set; }
 
@@ -304,6 +299,8 @@ namespace Yavsc.Models
         public DbSet<InstrumentRating> InstrumentRating { get; set; }
 
         public DbSet<Scope> Scopes { get; set; }
+        
+        public DbSet<BlogSpotPublication> blogSpotPublications{ get; set; }
 
     }
 }

src/Yavsc.Server/Models/ApplicationUser.cs

@@ -7,10 +7,12 @@ using Yavsc.Models.Identity;
 using Yavsc.Models.Chat;
 using Yavsc.Models.Bank;
 using Yavsc.Models.Access;
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc.Models
 {
     [Table("AspNetUsers")]
-    public class ApplicationUser : IdentityUser
+    public class ApplicationUser : IdentityUser, IApplicationUser
     {
         /// <summary> 
         /// Another me, as a byte array.TG7@Eu%80rufzkhbb
@@ -22,10 +24,10 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [MaxLength(512)]
-        public string Avatar { get; set; }
+        public string? Avatar { get; set; }
 
         [MaxLength(512)]
-        public string FullName { get; set; }
+        public string? FullName { get; set; }
 
 
         /// <summary>
@@ -33,32 +35,31 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [Display(Name = "Account balance")]
-        public virtual AccountBalance AccountBalance { get; set; }
+        public virtual AccountBalance? AccountBalance { get; set; }
 
         /// <summary>
         /// User's posts
         /// </summary>
         /// <returns></returns>
         [InverseProperty("Author"), JsonIgnore]
-        public virtual List<Blog.BlogPost> Posts { get; set; }
+        public virtual List<Blog.BlogPost>? Posts { get; set; }
 
         /// <summary>
         /// User's contact list
         /// </summary>
         /// <returns></returns>
         [InverseProperty("Owner"), JsonIgnore]
-        public virtual List<Contact> Book { get; set; }
+        public virtual List<Contact>? Book { get; set; }
 
         /// <summary>
         /// External devices using the API
         /// </summary>
         /// <returns></returns>
         [InverseProperty("DeviceOwner"), JsonIgnore]
-        public virtual List<DeviceDeclaration> DeviceDeclaration { get; set; }
+        public virtual List<DeviceDeclaration>? DeviceDeclaration { get; set; }
 
         [InverseProperty("Owner"), JsonIgnore]
-        public virtual List<ChatConnection> Connections { get; set; }
-
+        public virtual List<ChatConnection>? Connections { get; set; }
 
         /// <summary>
         /// User's circles
@@ -66,7 +67,7 @@ namespace Yavsc.Models
         /// <returns></returns>
         [InverseProperty("Owner"), JsonIgnore]
 
-        public virtual List<Circle> Circles { get; set; }
+        public virtual List<Circle>? Circles { get; set; }
 
         /// <summary>
         /// Billing postal address
@@ -81,14 +82,14 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [MaxLength(512)]
-        public string DedicatedGoogleCalendar { get; set; }
+        public string? DedicatedGoogleCalendar { get; set; }
 
         public override string ToString()
         {
             return this.Id + " " + this.AccountBalance?.Credits.ToString() + this.Email + " " + this.UserName + " $" + this.AccountBalance?.Credits.ToString();
         }
 
-        public virtual List<BankIdentity> BankInfo { get; set; }
+        public virtual List<BankIdentity>? BankInfo { get; set; }
 
         public long DiskQuota { get; set; } = 512 * 1024 * 1024;
         public long DiskUsage { get; set; } = 0;
@@ -97,21 +98,24 @@ namespace Yavsc.Models
 
         [JsonIgnore]
         [InverseProperty("Owner")]
-        public virtual List<BlackListed> BlackList { get; set; }
+        public virtual List<BlackListed>? BlackList { get; set; }
 
         public bool AllowMonthlyEmail { get; set; } = false;
 
         [JsonIgnore]
         [InverseProperty("Owner")]
-        public virtual List<ChatRoom> Rooms { get; set; }
+        public virtual List<ChatRoom>? Rooms { get; set; }
 
         [JsonIgnore]
         [InverseProperty("User")]
-        public virtual List<ChatRoomAccess> RoomAccess { get; set; }
+        public virtual List<ChatRoomAccess>? RoomAccess { get; set; }
 
         [JsonIgnore]
         [InverseProperty("Member")]
-        public virtual List<CircleMember> Membership { get; set; }
+        public virtual List<CircleMember>? Membership { get; set; }
 
+        IAccountBalance? IApplicationUser.AccountBalance => AccountBalance;
+
+        ILocation? IApplicationUser.PostalAddress { get => PostalAddress; }
     }
 }

src/Yavsc.Server/Models/Blog/BlogPost.cs

@@ -5,6 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
+using Yavsc;
+using Yavsc.Abstract.Identity;
 using Yavsc.Abstract.Identity.Security;
 using Yavsc.Attributes.Validation;
 using Yavsc.Interfaces;
@@ -14,7 +16,8 @@ using Yavsc.ViewModels.Blog;
 
 namespace Yavsc.Models.Blog
 {
-    public class BlogPost : BlogPostInputViewModel, IBlogPost, ICircleAuthorized, ITaggable<long>, IIdentified<long>
+    public class BlogPost : BlogPostBase,
+    IBlogPost, ICircleAuthorized, ITaggable<long>
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Display(Name="Identifiant du post")]
@@ -85,7 +88,6 @@ namespace Yavsc.Models.Blog
         [InverseProperty("Post")]
         public  virtual List<Comment> Comments { get; set; }
 
-        [NotMapped]
-        public string OwnerId => AuthorId;
+        IApplicationUser IBlogPost.Author { get => this.Author; }
     }
 }

src/Yavsc.Server/Models/Blog/BlogspotPublication.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Models.Blog;
+
+namespace Yavsc.Models
+{
+    public class BlogSpotPublication
+    {
+        [Key]
+        public long BlogpostId { get; set; }
+        
+        [ForeignKey("BlogpostId")]
+        public virtual BlogPost BlogPost{ get; set; }
+    }
+}

src/Yavsc.Server/Models/HairCut/BrusherProfile.cs

@@ -60,7 +60,7 @@ namespace Yavsc.Models.Haircut
 
         [DisplayFormat(ConvertEmptyStringToNull = true, NullDisplayText = "[Pas d'emploi du temps spécifié]")]
         [Display(Name="Emploi du temps")]
-        public virtual Schedule Schedule { get; set; }
+        public virtual Schedule? Schedule { get; set; }
 
         [Display(Name="Coupe femme cheveux longs"),DisplayFormat(DataFormatString="{0:C}")]
 

src/Yavsc.Server/Models/Workflow/Activity.cs

@@ -28,7 +28,7 @@ namespace Yavsc.Models.Workflow
         [YaStringLength(512)]
         [Display(Name = "Code du parent")]
         [ForeignKey("Parent")]
-        public string ParentCode { get; set; }
+        public string? ParentCode { get; set; }
 
         [Display(Name = "Activité parent"), JsonIgnore]
         public virtual Activity Parent { get; set; }
@@ -41,7 +41,7 @@ namespace Yavsc.Models.Workflow
         public string Description { get; set; }
 
         [Display(Name = "Photo")]
-        public string Photo { get; set; }
+        public string? Photo { get; set; }
 
         [InverseProperty("Context")]
         [DisplayAttribute(Name = "Services liés")]
@@ -52,7 +52,7 @@ namespace Yavsc.Models.Workflow
         /// </summary>
         /// <returns></returns>
         [DisplayAttribute(Name = "Groupe de modération")]
-        public string ModeratorGroupName { get; set; }
+        public string? ModeratorGroupName { get; set; }
 
         /// <summary>
         /// indice de recherche de cette activité
@@ -64,7 +64,7 @@ namespace Yavsc.Models.Workflow
         [DisplayFormatAttribute(DataFormatString="{0}%")]
         public int Rate { get; set; }
         [DisplayAttribute(Name = "Classe de paramétrage")]
-        public string SettingsClassName { get; set; }
+        public string? SettingsClassName { get; set; }
 
         [InverseProperty("Context")]
         [Display(Name="Formulaires de commande")]
@@ -77,7 +77,7 @@ namespace Yavsc.Models.Workflow
         }
 
         [Display(Name="Createur")]
-        public string UserCreated
+        public string? UserCreated
         {
             get; set;
         }
@@ -89,7 +89,7 @@ namespace Yavsc.Models.Workflow
         }
 
         [Display(Name="Utilisateur ayant modifié le dernier")]
-        public string UserModified
+        public string? UserModified
         {
             get; set;
         }

src/Yavsc.Server/Models/societe.com/CompanyInfo.cs

@@ -8,10 +8,10 @@ namespace Yavsc.Models.societe.com
     public class CompanyInfoMessage
     {
         public bool success { get; set; }
-        public string errorType { get; set; }
-        public string errorCode { get; set; }
-        public string errorMessage { get; set; }
-        public CompanyInfo result { get; set; }
+        public string? errorType { get; set; }
+        public string? errorCode { get; set; }
+        public string? errorMessage { get; set; }
+        public CompanyInfo? result { get; set; }
 
     }
 

src/Yavsc.Server/Services/BlogPostEdition.cs

@@ -0,0 +1,13 @@
+using Yavsc.Models.Blog;
+
+public class BlogPostEdition
+{
+    public string Content { get; internal set; }
+    public string Title { get; internal set; }
+    public string Photo { get; internal set; }
+
+    internal static BlogPostEdition From(BlogPost blog)
+    {
+        throw new NotImplementedException();
+    }
+}

src/Yavsc.Server/Services/BlogSpotService.cs

@@ -0,0 +1,193 @@
+
+
+using System.Diagnostics;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+using Yavsc;
+using Yavsc.Helpers;
+using Yavsc.Models;
+using Yavsc.Models.Blog;
+using Yavsc.Server.Exceptions;
+using Yavsc.ViewModels.Auth;
+using Yavsc.ViewModels.Blog;
+
+public class BlogSpotService
+{
+    private readonly ApplicationDbContext _context;
+    private readonly IAuthorizationService _authorizationService;
+
+
+    public BlogSpotService(ApplicationDbContext context,
+    IAuthorizationService authorizationService)
+    {
+        _authorizationService = authorizationService;
+        _context = context;
+    }
+
+    public BlogPost Create(string userId, BlogPostEditViewModel blogInput)
+    {
+        BlogPost post = new BlogPost
+        {
+            Title = blogInput.Title,
+            Content = blogInput.Content,
+            Photo = blogInput.Photo,
+            AuthorId = userId
+        };
+        _context.BlogSpot.Add(post);
+        _context.SaveChanges(userId);
+        return post;
+    }
+    public async Task<BlogPostEditViewModel> GetPostForEdition(ClaimsPrincipal user, long blogPostId)
+    {
+        var blog = await _context.BlogSpot.Include(x => x.Author).Include(x => x.ACL).SingleAsync(m => m.Id == blogPostId);
+        var auth = await _authorizationService.AuthorizeAsync(user, blog, new EditPermission());
+        if (!auth.Succeeded)
+        {
+            throw new AuthorizationFailureException(auth);
+        }
+        return BlogPostEditViewModel.From(blog);
+    }
+
+    public async Task<BlogPost> Details(ClaimsPrincipal user, long blogPostId)
+    {
+
+        BlogPost blog = await _context.BlogSpot
+       .Include(p => p.Author)
+       .Include(p => p.Tags)
+       .Include(p => p.Comments)
+       .Include(p => p.ACL)
+       .SingleAsync(m => m.Id == blogPostId);
+        if (blog == null)
+        {
+            return null;
+        }
+        var auth = await _authorizationService.AuthorizeAsync(user, blog, new ReadPermission());
+        if (!auth.Succeeded)
+        {
+            throw new AuthorizationFailureException(auth);
+        }
+        foreach (var c in blog.Comments)
+        {
+            c.Author = _context.Users.First(u => u.Id == c.AuthorId);
+        }
+        return blog;
+    }
+
+    public async Task Modify(ClaimsPrincipal user, BlogPostEditViewModel blogEdit)
+    {
+        var blog = _context.BlogSpot.SingleOrDefault(b => b.Id == blogEdit.Id);
+        Debug.Assert(blog != null);
+        var auth = await _authorizationService.AuthorizeAsync(user, blog, new EditPermission());
+        if (!auth.Succeeded)
+        {
+            throw new AuthorizationFailureException(auth);
+        }
+        blog.Content = blogEdit.Content;
+        blog.Title = blogEdit.Title;
+        blog.Photo = blogEdit.Photo;
+        blog.ACL = blogEdit.ACL;
+        // saves the change
+        _context.Update(blog);
+        var publication = await _context.blogSpotPublications.SingleOrDefaultAsync
+        (p=>p.BlogpostId==blogEdit.Id);
+        if (publication != null)
+        {
+            if (!blogEdit.Publish)
+            {
+                _context.blogSpotPublications.Remove(publication);
+            }
+        }
+        else
+        {
+            if (blogEdit.Publish)
+            {
+                _context.blogSpotPublications.Add(
+                    new BlogSpotPublication
+                    {
+                        BlogpostId = blogEdit.Id
+                    }
+                );
+            }
+        }
+        _context.SaveChanges(user.GetUserId());
+    }
+
+    public async Task<IEnumerable<IGrouping<string, IBlogPost>>> IndexByTitle(ClaimsPrincipal user, string id, int skip = 0, int take = 25)
+    {
+        IEnumerable<IBlogPost> posts;
+
+        if (user.Identity.IsAuthenticated)
+        {
+            string viewerId = user.GetUserId();
+            long[] userCircles = await _context.Circle.Include(c => c.Members).
+                Where(c => c.Members.Any(m => m.MemberId == viewerId))
+                .Select(c => c.Id).ToArrayAsync();
+
+            posts = _context.BlogSpot
+                .Include(b => b.Author)
+                .Include(p => p.ACL)
+                .Include(p => p.Tags)
+                .Include(p => p.Comments)
+                .Where(p => p.ACL == null
+                || p.ACL.Count == 0
+                || (p.AuthorId == viewerId)
+                || (userCircles != null &&
+                    p.ACL.Any(a => userCircles.Contains(a.CircleId)))
+                );
+        }
+        else
+        {
+            posts = _context.blogSpotPublications
+            .Include(p => p.BlogPost)
+           .Include(b => b.BlogPost.Author)
+           .Include(p => p.BlogPost.ACL)
+           .Include(p => p.BlogPost.Tags)
+           .Include(p => p.BlogPost.Comments)
+           .Where(p => p.BlogPost.ACL == null
+           || p.BlogPost.ACL.Count == 0)
+           .Select(p => p.BlogPost).ToArray();
+        }
+
+        var data = posts.OrderByDescending(p => p.DateCreated);
+        var grouped = data.GroupBy(p => p.Title).Skip(skip).Take(take);
+        return grouped;
+    }
+
+    public async Task Delete(ClaimsPrincipal user, long id)
+    {
+        var uid = user.GetUserId();
+        BlogPost blog = _context.BlogSpot.Single(m => m.Id == id);
+
+        _context.BlogSpot.Remove(blog);
+        _context.SaveChanges(user.GetUserId());
+    }
+
+    public async Task<IEnumerable<BlogPost>> UserPosts(
+        string posterName,
+        string? readerId,
+        int pageLen = 10,
+        int pageNum = 0)
+    {
+        string? posterId = (await _context.Users.SingleOrDefaultAsync(u => u.UserName == posterName))?.Id ?? null;
+        if (posterId == null) return Array.Empty<BlogPost>();
+        return _context.UserPosts(posterId, readerId);
+    }
+
+    public object? ByTitle(string title)
+    {
+        return _context.BlogSpot.Include(
+                 b => b.Author
+             ).Where(x => x.Title == title).OrderByDescending(
+                 x => x.DateCreated
+             ).ToList();
+    }
+
+    public async Task<BlogPost?> GetBlogPostAsync(long value)
+    {
+        return await _context.BlogSpot
+        .Include(b => b.Author)
+        .Include(b => b.ACL)
+        .SingleOrDefaultAsync(x => x.Id == value);
+    }
+}

src/Yavsc.Server/Services/MailSender.cs

@@ -1,13 +1,9 @@
-using System.Text;
-using System;
 using System.Net;
-using System.Threading.Tasks;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MimeKit;
-using Yavsc.Abstract.Manage;
 using Microsoft.AspNetCore.Identity;
 using Yavsc.Interface;
 using Yavsc.Settings;
@@ -27,8 +23,7 @@ namespace Yavsc.Services
         public MailSender(
             IOptions<SiteSettings> sitesOptions, 
             IOptions<SmtpSettings> smtpOptions,
-            ILoggerFactory loggerFactory,
-            IStringLocalizer<Yavsc.YavscLocalization> localizer
+            ILoggerFactory loggerFactory
             )
         {
             this.localizer = localizer;

src/Yavsc.Server/Services/ProfileService.cs

@@ -57,18 +57,18 @@ namespace Yavsc.Services
                 var roles = await this._userManager.GetRolesAsync(user);
                 if (roles.Count()>0)
                 {
-                    claims.AddRange(roles.Select(r => new Claim(Constants.RoleClaimName, r)));
+                    claims.AddRange(roles.Select(r => new Claim(JwtClaimTypes.Role, r)));
                 }
             }
             return claims;
         }
 
-         public async Task GetProfileDataAsync(ProfileDataRequestContext context)
+        public async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             var subjectId = GetSubjectId(context.Subject);
-            if (subjectId==null) return;
+            if (subjectId == null) return;
             var user = await _userManager.FindByIdAsync(subjectId);
-            if (user==null) return ;
+            if (user == null) return;
             context.IssuedClaims = await GetClaimsFromUserAsync(context, user);
         }
 

src/Yavsc.Server/ViewModels/BlogSpot/BlogPostBase.cs

@@ -5,8 +5,8 @@ using Yavsc.Models.Access;
 
 namespace Yavsc.ViewModels.Blog
 {
-    public class BlogPostInputViewModel
-{
+    public class BlogPostBase
+    {
         [StringLength(1024)]
         public string? Photo { get; set; }
 
@@ -18,8 +18,8 @@ namespace Yavsc.ViewModels.Blog
         public string? Content { get; set; }
 
         [InverseProperty("Target")]
-        [Display(Name="Liste de contrôle d'accès")]
-        public virtual List<CircleAuthorizationToBlogPost>? ACL { get; set; }
+        [Display(Name = "Liste de contrôle d'accès")]
+        public virtual List<CircleAuthorizationToBlogPost>? ACL { get; set; }
 
 
     }

src/Yavsc.Server/ViewModels/BlogSpot/BlogPostEdit.cs

@@ -1,11 +1,45 @@
 using System.ComponentModel.DataAnnotations;
+using Yavsc.Models.Blog;
 
 namespace Yavsc.ViewModels.Blog;
 
-public class BlogPostEditViewModel : BlogPostInputViewModel
+public class BlogPostEditViewModel : BlogPostBase
 {
 
     [Required]
 
     public  required long Id { get; set; }
+
+    public bool Publish { get; set; }
+
+    public BlogPostEditViewModel()
+    {
+    
+    }
+
+
+    public static BlogPostEditViewModel From(BlogPost blogInput)
+    {
+        return new BlogPostEditViewModel
+        {
+            Id = blogInput.Id,
+            Title = blogInput.Title,
+            Publish = false,
+            Photo = blogInput.Photo,
+            Content = blogInput.Content,
+            ACL = blogInput.ACL
+        };
+    }
+    public static BlogPostEditViewModel FromViewModel(BlogPostEditViewModel blogInput)
+    {
+        return new BlogPostEditViewModel
+        {
+            Id = blogInput.Id,
+            Title = blogInput.Title,
+            Publish = false,
+            Photo = blogInput.Photo,
+            Content = blogInput.Content,
+            ACL = blogInput.ACL
+        };
+    }
 }

src/Yavsc.Server/Yavsc.Server.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="HigginsSoft.IdentityServer8" Version="8.0.4" />
+    <PackageReference Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
@@ -19,20 +19,14 @@
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
-    <PackageReference Include="Google.Apis.Calendar.v3" Version="1.60.0.2993" />
+    <PackageReference Include="Google.Apis.Calendar.v3" Version="1.69.0.3746" />
     <PackageReference Include="PayPalMerchantSDK" Version="2.16.250" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
     <PackageReference Include="RazorEngine.NetCore" Version="3.1.0" />
-    <PackageReference Include="MailKit" Version="4.12.1" />
-    <PackageReference Include="MimeKit" Version="4.12.0" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="MimeKit" Version="4.13.0" />
     <PackageReference Include="pazof.rules" Version="1.1.3" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
   </ItemGroup>

src/Yavsc/Controllers/Communicating/BlogspotController.cs

@@ -1,22 +1,15 @@
 
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Authorization;
 using Yavsc.Models;
 using Yavsc.ViewModels.Auth;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Yavsc.Models.Blog;
 using Yavsc.Helpers;
-using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.Options;
 using Microsoft.EntityFrameworkCore;
-using System.Diagnostics;
 using Yavsc.ViewModels.Blog;
-using System.Collections;
+using Yavsc.Server.Exceptions;
 
 // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -29,111 +22,70 @@ namespace Yavsc.Controllers
         private readonly IAuthorizationService _authorizationService;
         readonly RequestLocalizationOptions _localisationOptions;
 
+        readonly BlogSpotService blogSpotService;
         public BlogspotController(
             ApplicationDbContext context,
             ILoggerFactory loggerFactory,
             IAuthorizationService authorizationService,
-            IOptions<RequestLocalizationOptions> localisationOptions)
+            IOptions<RequestLocalizationOptions> localisationOptions,
+            BlogSpotService blogSpotService)
         {
             _context = context;
             _logger = loggerFactory.CreateLogger<AccountController>();
             _authorizationService = authorizationService;
             _localisationOptions = localisationOptions.Value;
+            this.blogSpotService = blogSpotService;
         }
 
         // GET: Blog
         [AllowAnonymous]
-        public async Task<IActionResult> Index(string id, int skip=0, int take=25)
+        public async Task<IActionResult> Index(string id, int skip = 0, int take = 25)
         {
-            if (!string.IsNullOrEmpty(id)) {
-                return View("UserPosts", await UserPosts(id));
-            }
-            IEnumerable<BlogPost> posts;
-
-            if (User.Identity.IsAuthenticated)
+            if (!string.IsNullOrEmpty(id))
             {
-                string viewerId = User.GetUserId();
-                long[] usercircles = await _context.Circle.Include(c=>c.Members).
-                    Where(c=>c.Members.Any(m=>m.MemberId == viewerId))
-                    .Select(c=>c.Id).ToArrayAsync();
-                
-                posts = _context.BlogSpot
-                    .Include(b => b.Author)
-                    .Include(p=>p.ACL)
-                    .Include(p=>p.Tags)
-                    .Include(p=>p.Comments)
-                    .Where(p =>(p.ACL.Count == 0) 
-                    || (p.AuthorId == viewerId)
-                    || (usercircles != null && p.ACL.Any(a => usercircles.Contains(a.CircleId)))
-                    );
+                return View("UserPosts",
+                await blogSpotService.UserPosts(id, User.GetUserId(),
+                skip, take));
             }
-            else 
-            {
-                 posts = _context.BlogSpot
-                .Include(b => b.Author)
-                .Include(p=>p.ACL)
-                .Include(p=>p.Tags)
-                .Include(p=>p.Comments)
-                .Where(p => p.ACL.Count == 0 ).ToArray();
-            }
-          
-            var data = posts.OrderByDescending( p=> p.DateCreated);
-            var grouped = data.GroupBy(p=> p.Title).Skip(skip).Take(take);
-
-            return View(grouped);
+            IEnumerable<IGrouping<string,IBlogPost>> byTitle = await this.blogSpotService.IndexByTitle(User, id, skip, take);
+            return View(byTitle);
         }
 
         [Route("~/Title/{id?}")]
         [AllowAnonymous]
         public IActionResult Title(string id)
         {
-            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             ViewData["Title"] = id;
-            return View("Title", _context.BlogSpot.Include(
-                b => b.Author
-            ).Where(x => x.Title == id && (x.AuthorId == uid )).OrderByDescending(
-                x => x.DateCreated
-            ).ToList());
+            return View("Title", blogSpotService.ByTitle(id));
         }
 
-        private async Task<IEnumerable<BlogPost>> UserPosts(string userName, int pageLen=10, int pageNum=0)
+        private async Task<IEnumerable<BlogPost>> UserPosts(string userName, int pageLen = 10, int pageNum = 0)
         {
-            string posterId = (await _context.Users.SingleOrDefaultAsync(u=>u.UserName == userName))?.Id ?? null ;
-            return _context.UserPosts(posterId, User.Identity.Name);
+            return await blogSpotService.UserPosts(userName, User.GetUserId(), pageLen, pageNum);
+
         }
         // GET: Blog/Details/5
         [AllowAnonymous]
         public async Task<IActionResult> Details(long? id)
         {
-            if (id == null)
+            if (id == null) return this.NotFound();
+            try
             {
-                return NotFound();
-            }
+                var blog = await blogSpotService.Details(User, id.Value);
+                ViewData["apicmtctlr"] = "/api/blogcomments";
+                ViewData["moderatoFlag"] = User.IsInRole(Constants.BlogModeratorGroupName);
 
-            BlogPost blog = _context.BlogSpot
-            .Include(p => p.Author)
-            .Include(p => p.Tags)
-            .Include(p => p.Comments)
-            .Include(p => p.ACL)
-            .Single(m => m.Id == id);
-            if (blog == null)
+                return View(blog);
+
+            }
+            catch (AuthorizationFailureException ex)
             {
-                return NotFound();
+                return Challenge();
             }
-            if ( _authorizationService.AuthorizeAsync(User, blog, new ReadPermission()).IsFaulted)
-            {
-                return new ChallengeResult();
-            }
-            foreach (var c in blog.Comments) {
-                c.Author = _context.Users.First(u=>u.Id==c.AuthorId);
-            }
-            ViewData["apicmtctlr"] = "/api/blogcomments";
-            ViewData["moderatoFlag"] = User.IsInRole(Constants.BlogModeratorGroupName);
-            return View(blog);
         }
         void SetLangItems()
         {
-            ViewBag.LangItems = _localisationOptions.SupportedUICultures.Select
+            ViewBag.LangItems = _localisationOptions.SupportedUICultures?.Select
             (
                 sc => new SelectListItem { Value = sc.IetfLanguageTag, Text = sc.NativeName, Selected = System.Globalization.CultureInfo.CurrentUICulture == sc }
             );
@@ -143,33 +95,25 @@ namespace Yavsc.Controllers
         [Authorize()]
         public IActionResult Create(string title)
         {
-            var result = new BlogPostInputViewModel{Title=title
+            var result = new BlogPostBase
+            {
+                Title = title
             };
-            ViewData["PostTarget"]="Create";
             SetLangItems();
             return View(result);
         }
 
         // POST: Blog/Create
         [HttpPost, Authorize, ValidateAntiForgeryToken]
-        public IActionResult Create(BlogPostInputViewModel blogInput)
+        public IActionResult Create(BlogPostEditViewModel blogInput)
         {
             if (ModelState.IsValid)
             {
-                BlogPost post = new BlogPost
-                {
-                    Title = blogInput.Title,
-                    Content = blogInput.Content,
-                    Photo = blogInput.Photo,
-                    AuthorId = User.GetUserId()
-                };
-                _context.BlogSpot.Add(post);
-                _context.SaveChanges(User.GetUserId());
+                BlogPost post = blogSpotService.Create(User.GetUserId(),
+                 BlogPostEditViewModel.FromViewModel(blogInput));
                 return RedirectToAction("Index");
             }
-            ModelState.AddModelError("Unknown","Invalid Blog posted ...");
-            ViewData["PostTarget"]="Create";
-            return View("Edit",blogInput);
+            return View("Edit", blogInput);
         }
 
         [Authorize()]
@@ -180,37 +124,18 @@ namespace Yavsc.Controllers
             {
                 return NotFound();
             }
-
-            ViewData["PostTarget"]="Edit";
-            BlogPost blog = _context.BlogSpot.Include(x => x.Author).Include(x => x.ACL).Single(m => m.Id == id);
-
-            if (blog == null)
+            try
             {
-                return NotFound();
-            }
-            if (!_authorizationService.AuthorizeAsync(User, blog, new EditPermission()).IsFaulted)
-            {
-                ViewBag.ACL = _context.Circle.Where(
-                c=>c.OwnerId == blog.AuthorId)
-                .Select(
-                    c => new SelectListItem
-                    {
-                        Text = c.Name,
-                        Value = c.Id.ToString(),
-                        Selected = blog.AuthorizeCircle(c.Id)
-                    } 
-                );
-                SetLangItems();
-                return View(new BlogPostEditViewModel
+                var blog = await blogSpotService.GetPostForEdition(User, id.Value);
+                if (blog == null)
                 {
-                    Id = blog.Id,
-                    Title = blog.Title,
-                    Content = blog.Content,
-                    ACL = blog.ACL,
-                    Photo = blog.Photo
-            });
+                    return NotFound();
+                }
+                SetLangItems();
+                return View(blog);
+
             }
-            else
+            catch (AuthorizationFailureException)
             {
                 return new ChallengeResult();
             }
@@ -218,65 +143,41 @@ namespace Yavsc.Controllers
 
         // POST: Blog/Edit/5
         [HttpPost]
-        [ValidateAntiForgeryToken,Authorize()]
+        [ValidateAntiForgeryToken, Authorize()]
         public async Task<IActionResult> Edit(BlogPostEditViewModel blogEdit)
         {
             if (ModelState.IsValid)
             {
-                var blog = _context.BlogSpot.SingleOrDefault(b=>b.Id == blogEdit.Id);
-                if (blog == null) {
-                    ModelState.AddModelError("Id", "not found");
-                    return View();
-                }
-                if (!(await _authorizationService.AuthorizeAsync(User, blog, new EditPermission())).Succeeded) {
-                    ViewData["StatusMessage"] = "Accès restreint";
-                    return new ChallengeResult();
-                }
-                blog.Content=blogEdit.Content;
-                blog.Title = blogEdit.Title;
-                blog.Photo = blogEdit.Photo;
-                blog.ACL = blogEdit.ACL;
-                // saves the change
-                _context.Update(blog);
-                _context.SaveChanges(User.GetUserId());
+                await blogSpotService.Modify(User, blogEdit);
                 ViewData["StatusMessage"] = "Post modified";
                 return RedirectToAction("Index");
             }
-            ViewData["PostTarget"]="Edit";
             return View(blogEdit);
         }
 
         // GET: Blog/Delete/5
-        [ActionName("Delete"),Authorize()]
-        public IActionResult Delete(long? id)
+        [ActionName("Delete"), Authorize()]
+        public async Task<IActionResult> Delete(long? id)
         {
             if (id == null)
             {
                 return NotFound();
             }
 
-            BlogPost blog = _context.BlogSpot.Include(
-               b => b.Author
-           ).Single(m => m.Id == id);
+            var blog = await blogSpotService.GetBlogPostAsync(id.Value);
             if (blog == null)
             {
                 return NotFound();
             }
-
             return View(blog);
         }
 
         // POST: Blog/Delete/5
-        [HttpPost, ActionName("Delete"), Authorize("IsTheAuthor")]
+        [HttpPost, ActionName("Delete"), Authorize("TheAuthor")]
         [ValidateAntiForgeryToken]
-        public IActionResult DeleteConfirmed(long id)
+        public async Task<IActionResult> DeleteConfirmed(long id)
         {
-            var uid = User.GetUserId();
-            BlogPost blog = _context.BlogSpot.Single(m => m.Id == id);
-           
-            _context.BlogSpot.Remove(blog);
-            _context.SaveChanges(User.GetUserId());
-           
+            await blogSpotService.Delete(User, id);
             return RedirectToAction("Index");
         }
     }

src/Yavsc/Extensions/HostingExtensions.cs

@@ -33,13 +33,16 @@ using Yavsc.Server.Helpers;
 using System.Security.Cryptography;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.IdentityModel.Protocols.Configuration;
+using IdentityModel;
+using System.Security.Claims;
+using IdentityServer8.Security;
 
 namespace Yavsc.Extensions;
 
 
 public static class HostingExtensions
 {
-    #region files config
+  
     public static IApplicationBuilder ConfigureFileServerApp(this IApplicationBuilder app,
                 bool enableDirectoryBrowsing = false)
     {
@@ -91,16 +94,10 @@ public static class HostingExtensions
         return app;
     }
 
-    #endregion
-
-
     internal static WebApplication ConfigureWebAppServices(this WebApplicationBuilder builder)
     {
         IServiceCollection services = LoadConfiguration(builder);
 
-        //services.AddRazorPages();
-
-      
         services.AddSession();
 
         // TODO .AddServerSideSessionStore<YavscServerSideSessionStore>()
@@ -148,7 +145,8 @@ public static class HostingExtensions
         .AddTransient<IYavscMessageSender, YavscMessageSender>()
         .AddTransient<IBillingService, BillingService>()
         .AddTransient<IDataStore, FileDataStore>((sp) => new FileDataStore("googledatastore", false))
-        .AddTransient<ICalendarManager, CalendarManager>();
+        .AddTransient<ICalendarManager, CalendarManager>()
+        .AddTransient<BlogSpotService>();
 
         // TODO for SMS: services.AddTransient<ISmsSender, AuthMessageSender>();
 
@@ -197,11 +195,13 @@ public static class HostingExtensions
             {
                 policy
                     .RequireAuthenticatedUser()
-                    .RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", "Performer");
+                    .RequireClaim(JwtClaimTypes.Role, "Performer");
             });
             options.AddPolicy("AdministratorOnly", policy =>
             {
-                _ = policy.RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", Constants.AdminGroupName);
+                _ = policy
+                    .RequireAuthenticatedUser()
+                    .RequireClaim(JwtClaimTypes.Role, Constants.AdminGroupName);
             });
 
             options.AddPolicy("FrontOffice", policy => policy.RequireRole(Constants.FrontOfficeGroupName));
@@ -209,7 +209,7 @@ public static class HostingExtensions
             // options.AddPolicy("EmployeeId", policy => policy.RequireClaim("EmployeeId", "123", "456"));
             // options.AddPolicy("BuildingEntry", policy => policy.Requirements.Add(new OfficeEntryRequirement()));
             options.AddPolicy("Authenticated", policy => policy.RequireAuthenticatedUser());
-            options.AddPolicy("IsTheAuthor", policy => policy.Requirements.Add(new EditPermission()));
+            options.AddPolicy("TheAuthor", policy => policy.Requirements.Add(new EditPermission()));
         })
         .AddCors(options =>
         {
@@ -290,12 +290,13 @@ public static class HostingExtensions
 
              // see https://IdentityServer8.readthedocs.io/en/latest/topics/resources.html
              options.EmitStaticAudienceClaim = true;
+             
          })
             .AddInMemoryIdentityResources(Config.IdentityResources)
             .AddInMemoryClients(Config.Clients)
             .AddInMemoryApiScopes(Config.ApiScopes)
-            .AddAspNetIdentity<ApplicationUser>()
             .AddProfileService<ProfileService>()
+            .AddAspNetIdentity<ApplicationUser>()
            ;
         if (builder.Environment.IsDevelopment())
         {
@@ -312,9 +313,9 @@ public static class HostingExtensions
             RSA rsa = RSA.Create();
             rsa.ImportFromPem(File.ReadAllText(certFileInfo.FullName));
             var signingCredentials = new SigningCredentials(new RsaSecurityKey(rsa), SecurityAlgorithms.RsaSha256)
-        {
-          CryptoProviderFactory = new CryptoProviderFactory { CacheSignatureProviders = false }
-        };
+            {
+                CryptoProviderFactory = new CryptoProviderFactory { CacheSignatureProviders = false }
+            };
             identityServerBuilder.AddSigningCredential(signingCredentials);
         }
         return identityServerBuilder;
@@ -355,7 +356,7 @@ public static class HostingExtensions
     }
 
 
-    internal static WebApplication ConfigurePipeline(this WebApplication app)
+    internal async static Task<WebApplication> ConfigurePipeline(this WebApplication app)
     {
 
         if (app.Environment.IsDevelopment())
@@ -365,6 +366,11 @@ public static class HostingExtensions
         else
         {
             app.UseExceptionHandler("/Home/Error");
+             using (var scope = app.Services.CreateScope())
+            {
+                var db = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+                await db.Database.MigrateAsync();
+            }
         }
 
         app.UseStaticFiles();
@@ -373,7 +379,7 @@ public static class HostingExtensions
         app.UseAuthorization();
         app.UseCors("default");
         app.MapDefaultControllerRoute();
-        //pp.MapRazorPages();
+        //app.MapRazorPages();
         app.MapHub<ChatHub>("/chatHub");
        
         WorkflowHelpers.ConfigureBillingService();
@@ -409,3 +415,86 @@ public static class HostingExtensions
         }
     }
 }
+
+public class MyIdentityStore : IUserClaimStore<IdentityUser>
+{
+    public Task AddClaimsAsync(IdentityUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IdentityResult> CreateAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IdentityResult> DeleteAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void Dispose()
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IdentityUser?> FindByIdAsync(string userId, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IdentityUser?> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IList<Claim>> GetClaimsAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<string?> GetNormalizedUserNameAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<string> GetUserIdAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<string?> GetUserNameAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IList<IdentityUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task RemoveClaimsAsync(IdentityUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task ReplaceClaimAsync(IdentityUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task SetNormalizedUserNameAsync(IdentityUser user, string? normalizedName, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task SetUserNameAsync(IdentityUser user, string? userName, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IdentityResult> UpdateAsync(IdentityUser user, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+}

src/Yavsc/Extensions/PermissionHandler.cs

@@ -1,7 +1,9 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
+using RazorEngine.Compilation.ImpromptuInterface.Optimization;
 using Yavsc.Helpers;
+using Yavsc.Migrations;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
 using Yavsc.ViewModels.Auth;
@@ -32,6 +34,10 @@ public class PermissionHandler : IAuthorizationHandler
                 {
                     context.Succeed(requirement);
                 }
+                else if (context.User.IsInRole("Administrator"))
+                {
+                    context.Succeed(requirement);
+                }
             }
             else if (requirement is EditPermission || requirement is DeletePermission)
             {
@@ -49,18 +55,33 @@ public class PermissionHandler : IAuthorizationHandler
     {
         if (resource is BlogPost blogPost)
         {
-            if (blogPost.ACL.Count==0)
-                return true;
+            return
+                applicationDbContext.blogSpotPublications
+                .Any(p=>p.BlogpostId == blogPost.Id);
         }
         return false;
     }
 
-    private static bool IsOwner(ClaimsPrincipal user, object? resource)
+    private  bool IsOwner(ClaimsPrincipal user, object? resource)
     {
         if (resource is BlogPost blogPost)
         {
             return blogPost.AuthorId == user.GetUserId();
         }
+        else
+        if (resource is DefaultHttpContext httpContext)
+        {
+            if (httpContext.Request.Path.StartsWithSegments("/blogpost/Delete", StringComparison.OrdinalIgnoreCase))
+            {
+                string postId = (string)httpContext.GetRouteValue("id");
+                if (long.TryParse(postId, out long id))
+                {
+                BlogPost b = applicationDbContext.BlogSpot.FirstOrDefault(b => b.Id == id && b.AuthorId == user.GetUserId());
+                return b != null;
+
+                }
+            }
+        }
         return false;
     }
 
@@ -70,7 +91,7 @@ public class PermissionHandler : IAuthorizationHandler
         {
             return applicationDbContext.CircleMembers
             .Include(c => c.Circle)
-            .Where(m=>m.MemberId==user.GetUserId() && m.Circle.OwnerId == blogPost.OwnerId)
+            .Where(m=>m.MemberId==user.GetUserId() && m.Circle.OwnerId == blogPost.AuthorId)
             .Any();
         }
         return true;

src/Yavsc/Helpers/AsciiDocTagHelper.cs

@@ -6,9 +6,9 @@ namespace Yavsc.Helpers
 {
     public class AsciidocTagHelper : TagHelper
     {
-        public override async Task ProcessAsync (TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            if (context.AllAttributes.ContainsName ("summary"))
+            if (context.AllAttributes.ContainsName("summary"))
             {
                 var summaryLength = context.AllAttributes["summary"].Value;
             }
@@ -16,12 +16,23 @@ namespace Yavsc.Helpers
             var content = await output.GetChildContentAsync();
             string text = content.GetContent();
             if (string.IsNullOrWhiteSpace(text)) return;
-            Document document = Document.Parse(text);
-            var html = document.ToHtml(2);
-            using var stringWriter = new StringWriter();
-            html.WriteTo(stringWriter, HtmlEncoder.Default);
-            var processedHere = stringWriter.ToString();
-            output.Content.AppendHtml(processedHere);
+            try
+            {
+
+                Document document = Document.Parse(text);
+                var html = document.ToHtml(2);
+                using var stringWriter = new StringWriter();
+                html.WriteTo(stringWriter, HtmlEncoder.Default);
+                var processedHere = stringWriter.ToString();
+                output.Content.AppendHtml(processedHere);
+            }
+            catch (ArgumentException ex)
+            {
+                // silently render the text
+                output.Content.AppendHtml("<pre>" + text + "</pre>\n");
+                // and an error
+                output.Content.AppendHtml("<pre class=\"parsingError\">" + ex.Message + "</pre>\n");
+            }
         }
     }
 }

src/Yavsc/Makefile

@@ -1,6 +1,6 @@
 DESTDIR=/srv/www/yavsc
 CONFIGURATION=Release
-USER=www-data
+USER_AND_GROUP=www-data:www-data
 SERVICE_PROD=yavsc
 DOTNET_FRAMEWORK=net9.0
 
@@ -20,11 +20,11 @@ install_service:
 	sudo systemctl enable yavsc
 
 pushInProd: publish
-	sudo systemctl stop $(SERVICE_PROD) 
-	sudo cp -a bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish/* $(DESTDIR)
-	sudo chown -R $(USER) $(DESTDIR)
-	sudo sync
-	sudo systemctl start $(SERVICE_PROD)
+	@sudo systemctl stop $(SERVICE_PROD) 
+	@sudo cp -a bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish/* $(DESTDIR)
+	@sudo chown -R $(USER_AND_GROUP) $(DESTDIR)
+	@sudo sync
+	@sudo systemctl start $(SERVICE_PROD)
 
 %.min.js: %.js
 	jsmin < $^ > $@

src/Yavsc/Program.cs

@@ -6,7 +6,7 @@ namespace Yavsc
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
             var builder = WebApplication.CreateBuilder(args);
        
@@ -15,7 +15,7 @@ namespace Yavsc
                 .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables()
                 .Build();
-            var app = builder.ConfigureWebAppServices().ConfigurePipeline();
+            var app = await builder.ConfigureWebAppServices().ConfigurePipeline();
             app.UseSession();
             app.Run();
         }

src/Yavsc/Startup.cs

@@ -1,7 +1,5 @@
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
-using Yavsc.Helpers;
 using Yavsc.Server.Helpers;
 using Yavsc.Settings;
 

src/Yavsc/ViewComponents/CirclesControlViewComponent.cs

@@ -22,7 +22,7 @@ namespace Yavsc.ViewComponents
         {
             if (target!=null)
             {
-            var oid = target.OwnerId;
+            var oid = target.AuthorId;
             ViewBag.ACL = dbContext.Circle.Where(
                 c=>c.OwnerId == oid)
                 .Select(

src/Yavsc/Views/Blogspot/Create.cshtml

@@ -1,4 +1,4 @@
-@model Yavsc.ViewModels.Blog.BlogPostInputViewModel
+@model BlogPostEditViewModel
 
 @{
    ViewData["Title"] = "Blog post edition";
@@ -47,6 +47,7 @@
                 </span>
             </div>
         </div>
+
         <div class="form-group mdcoding">
             <label asp-for="Content" class="col-md-2 control-label" ></label>
             <div class="col-md-10">
@@ -56,6 +57,7 @@
                 </span>
             </div>
         </div>
+
         <div class="form-group">
             <label asp-for="ACL" class="col-md-2 control-label"></label>
             <div class="col-md-10">
@@ -63,6 +65,13 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <label asp-for="Publish" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="Publish" class="form-control" />
+            </div>
+        </div>
+
         <div class="form-group">
             <div class="col-md-offset-2 col-md-10">
                 <button  class="btn btn-primary" >Save</button>

src/Yavsc/Views/Blogspot/Edit.cshtml

@@ -39,7 +39,7 @@
      
 }
 
-<h2 > Blog post edition </h2>
+<h2 >Blog post</h2>
                 <label><input type="checkbox" id="vcbtn" />Editer le code source Markdown</label>
 
 <div asp-validation-summary="All" class="text-danger"></div>
@@ -97,6 +97,13 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <label asp-for="Publish" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input type="checkbox" asp-for="Publish" class="form-control" />
+            </div>
+        </div>
+        
         <div class="form-group">
             <div class="col-md-offset-2 col-md-10">
                 <input type="submit" value="Save" class="btn btn-default" />
@@ -111,5 +118,3 @@
 <div>
     <a asp-action="Index">Back to List</a>
 </div>
-
-    using Yavsc.Migrations;

src/Yavsc/Views/Blogspot/Index.cshtml

@@ -1,4 +1,4 @@
-@model IEnumerable<IGrouping<string,BlogPost>>
+@model IEnumerable<IGrouping<string,IBlogPost>>
 @{
     ViewData["Title"] = "Blogs, l'index";
 }
@@ -47,6 +47,7 @@
 <div class="container">
      
 <table class="table">
+    
 @foreach (var group in Model) {
     var title = group.Key ?? "@";
     string secondclass="";
@@ -95,6 +96,6 @@
 }
 </table>
 
-
+@if(Model.Count()==0){<p>Néant</p>}
 
 </div>

src/Yavsc/Views/Shared/DisplayTemplates/ApplicationUser.cshtml

@@ -1,14 +1,10 @@
+@using Yavsc.Abstract.Identity
 @model ApplicationUser
 @{
-    var avuri = "/Avatars/"+Model.UserName+".s.png";
-    var userPosted = Model.Posts!=null && Model.Posts.Count()>=1;
+    var avuri = "/Avatars/" + Model.UserName + ".s.png";
 }
 <div class="userinfo">
-@if (userPosted) { <a asp-controller="Blogspot" asp-action="Index" 
-asp-route-id="@Model.UserName" class="btn btn-primary">
-<img src="@avuri" asp-append-version="true" class="smalltofhol" alt="@Model.UserName" title="@Model.UserName"/>
-</a>
-} else {
-    Html.DisplayFor(m=>m.UserName);
-}
+    <a title="Posts" asp-controller="Blogspot" asp-action="Index" asp-route-id="@Model.UserName" class="btn btn-primary">
+        <img src="@avuri" asp-append-version="true" class="smalltofhol" alt="@Model.UserName" title="@Model.UserName" />
+    </a>
 </div>

src/Yavsc/Views/Shared/DisplayTemplates/IApplicationUser.cshtml

@@ -0,0 +1,10 @@
+@using Yavsc.Abstract.Identity
+@model IApplicationUser
+@{
+    var avuri = "/Avatars/" + Model.UserName + ".s.png";
+}
+<div class="userinfo">
+    <a title="Posts" asp-controller="Blogspot" asp-action="Index" asp-route-id="@Model.UserName" class="btn btn-primary">
+        <img src="@avuri" asp-append-version="true" class="smalltofhol" alt="@Model.UserName" title="@Model.UserName" />
+    </a>
+</div>

src/Yavsc/Views/Shared/_LoginPartial.cshtml

@@ -18,7 +18,6 @@
             <ul class="dropdown-menu" aria-labelledby="dropdown04">
                 <li><a class="dropdown-item" asp-controller="Bug" asp-action="Index">Bugs</a></li>
                 <li><a class="dropdown-item" asp-controller="HyperLink" asp-action="Index">HyperLink</a></li>
-                <li><a class="dropdown-item" asp-controller="LiveFlow" asp-action="Index">LiveFlow</a></li>
                 <li><a class="dropdown-item" asp-controller="Feature" asp-action="Index">Features</a></li>
             </ul>
         </li>

src/Yavsc/Yavsc.csproj

@@ -10,14 +10,15 @@
     <PackageReference Include="popper.js" Version="1.16.1">
      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="bootstrap" Version="5.3.3">
+    <PackageReference Include="bootstrap" Version="5.3.7">
      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="8.0.4" />
+    <PackageReference Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
+    <PackageReference Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="8.0.5-preview-net9" />
   
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.6">
@@ -30,15 +31,15 @@
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.6" />
-    <PackageReference Include="Google.Apis.Compute.v1" Version="1.54.0" />
+    <PackageReference Include="Google.Apis.Compute.v1" Version="1.70.0.3829" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.3.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1" />
     <PackageReference Include="AsciiDocNet" Version="1.0.0-alpha6" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
 
   </ItemGroup>
   <ItemGroup>

src/Yavsc/wwwroot/css/site.css

@@ -35,3 +35,9 @@ img.blogphoto {
   padding: .3em;
   border: solid black 1px;
 }
+
+input[type='checkbox'] {
+  appearance: auto;
+  min-width: 1em;
+  min-height: 1em;
+}

src/Yavsc/wwwroot/lib/bootstrap/scss/_nav.scss

@@ -10,7 +10,6 @@
   @include rfs($nav-link-font-size, --#{$prefix}nav-link-font-size);
   --#{$prefix}nav-link-font-weight: #{$nav-link-font-weight};
   --#{$prefix}nav-link-color: #{$nav-link-color};
-  --#{$prefix}nav-link-background-color: #{$dropdown-dark-bg};
   --#{$prefix}nav-link-hover-color: #{$nav-link-hover-color};
   --#{$prefix}nav-link-disabled-color: #{$nav-link-disabled-color};
   // scss-docs-end nav-css-vars
@@ -28,9 +27,8 @@
   @include font-size(var(--#{$prefix}nav-link-font-size));
   font-weight: var(--#{$prefix}nav-link-font-weight);
   color: var(--#{$prefix}nav-link-color);
-  background-color: var(--#{$prefix}nav-link-background-color);
   text-decoration: if($link-decoration == none, null, none);
-  background-color: var(--#{$prefix}nav-tabs-link-active-bg);
+  background: none;
   border: 0;
   @include transition($nav-link-transition);
 

src/Yavsc/wwwroot/lib/bootstrap/scss/_variables.scss

@@ -1607,6 +1607,7 @@ $list-group-action-active-color:    var(--#{$prefix}body-color) !default;
 $list-group-action-active-bg:       var(--#{$prefix}secondary-bg) !default;
 // scss-docs-end list-group-variables
 
+
 // Image thumbnails
 
 // scss-docs-start thumbnail-variables
@@ -1618,6 +1619,7 @@ $thumbnail-border-radius:           var(--#{$prefix}border-radius) !default;
 $thumbnail-box-shadow:              var(--#{$prefix}box-shadow-sm) !default;
 // scss-docs-end thumbnail-variables
 
+
 // Figures
 
 // scss-docs-start figure-variables
@@ -1745,3 +1747,5 @@ $kbd-bg:                            var(--#{$prefix}body-color) !default;
 $nested-kbd-font-weight:            null !default; // Deprecated in v5.2.0, removing in v6
 
 $pre-color:                         null !default;
+
+@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5.3

src/Yavsc/wwwroot/lib/bootstrap/scss/forms/_form-control.scss

@@ -11,7 +11,6 @@
   font-weight: $input-font-weight;
   line-height: $input-line-height;
   color: $input-color;
-  appearance: none; // Fix appearance for date inputs in Safari
   background-color: $input-bg;
   background-clip: padding-box;
   border: $input-border-width solid $input-border-color;

src/sampleWebAsWebApiClient/wwwroot/lib/bootstrap/dist/css/bootstrap.css

@@ -2120,9 +2120,6 @@ progress {
   font-weight: 400;
   line-height: 1.5;
   color: var(--bs-body-color);
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
   background-color: var(--bs-body-bg);
   background-clip: padding-box;
   border: var(--bs-border-width) solid var(--bs-border-color);
@@ -12040,4 +12037,4 @@ textarea.form-control-lg {
   }
 }
 
-/*# sourceMappingURL=bootstrap.css.map */
+/*# sourceMappingURL=bootstrap.css.map */

src/sampleWebAsWebApiClient/wwwroot/lib/bootstrap/scss/forms/_form-control.scss

@@ -11,7 +11,6 @@
   font-weight: $input-font-weight;
   line-height: $input-line-height;
   color: $input-color;
-  appearance: none; // Fix appearance for date inputs in Safari
   background-color: $input-bg;
   background-clip: padding-box;
   border: $input-border-width solid $input-border-color;

src/sampleWebAsWebApiClient/wwwroot/lib/jquery-validation-unobtrusive/package.json

@@ -29,7 +29,7 @@
     "jquery-validation": ">=1.19"
   },
   "devDependencies": {
-    "gulp": "^5.0.1",
+    "gulp": "^4.0.2",
     "gulp-line-ending-corrector": "^1.0.3",
     "gulp-rename": "~2.0.0",
     "gulp-replace": "~1.1.3",

test/yavscTests/Startup.cs

@@ -127,7 +127,7 @@ namespace yavscTests
             services.AddAuthorizationBuilder()
                 .AddPolicy("AdministratorOnly", policy =>
                 {
-                    policy.RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", Constants.AdminGroupName);
+                    policy.RequireClaim(JwtClaimType.Role, Constants.AdminGroupName);
                 })
                 .AddPolicy("FrontOffice", policy => policy.RequireRole(Constants.FrontOfficeGroupName))
                 .AddPolicy("Bearer", new AuthorizationPolicyBuilder()