Bump braces and gulp

Bumps [braces](https://github.com/micromatch/braces) to 3.0.3 and updates ancestor dependency [gulp](https://github.com/gulpjs/gulp). These dependencies need to be updated together.


Updates `braces` from 2.3.2 to 3.0.3
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/commits/3.0.3)

Updates `gulp` from 4.0.2 to 5.0.1
- [Release notes](https://github.com/gulpjs/gulp/releases)
- [Changelog](https://github.com/gulpjs/gulp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/gulp/compare/v4.0.2...v5.0.1)

---
updated-dependencies:
- dependency-name: braces
  dependency-version: 3.0.3
  dependency-type: indirect
- dependency-name: gulp
  dependency-version: 5.0.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/dotnet.yml

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

.github/workflows/main.yml

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

.vscode/launch.json

@@ -4,32 +4,6 @@
     // 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"
-            }
-        },
         
         
    /*   {
@@ -109,11 +83,6 @@
              "serverReadyAction": {
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "presentation": {
-                "hidden": false,
-                "group": "run",
-                "order": 1
             }
         },
         {

.vscode/settings.json

@@ -1,9 +1,20 @@
 {
-    "dotnet-test-explorer.testProjectPath": "test/**/*Tests.csproj",
-   
+    "dotnet-test-explorer.testProjectPath": "**/*Tests.@(csproj|vbproj|fsproj)",
+    "sqltools.connections": [
+        {
+            "previewLimit": 50,
+            "server": "localhost",
+            "port": 5432,
+            "driver": "PostgreSQL",
+            "name": "yavscdev",
+            "group": "yavsc",
+            "database": "YavscDev",
+            "username": "yavscdev",
+            "password": "admin"
+        }
+    ],
     "cSpell.words": [
         "appsettings",
-        "Cratie",
         "Newtonsoft",
         "Npgsql",
         "Yavsc"

.vscode/tasks.json

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

Directory.Packages.props

@@ -1,50 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageVersion Include="AsciiDocNet" Version="1.0.0" />
-    <PackageVersion Include="bootstrap" Version="5.3.7" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3746" />
-    <PackageVersion Include="Google.Apis.Compute.v1" Version="1.70.0.3829" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="8.0.5-preview-net9" />
-    <PackageVersion Include="IdentityModel.AspNetCore" Version="4.3.0" />
-    <PackageVersion Include="MailKit" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Antiforgery" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="Microsoft.Playwright" Version="1.53.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
-    <PackageVersion Include="MimeKit" Version="4.13.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageVersion Include="PayPalMerchantSDK" Version="2.16.250" />
-    <PackageVersion Include="pazof.rules" Version="1.1.3" />
-    <PackageVersion Include="popper.js" Version="1.16.1" />
-    <PackageVersion Include="RazorEngine.NetCore" Version="3.1.0" />
-    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.10" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.3" />
-    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
-  </ItemGroup>
-</Project>

contrib/yavsc.service

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

src/Api/Api.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>1c73094f-959f-4211-b1a1-6a69b236c283</UserSecretsId>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
     <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
-  </ItemGroup>
-</Project>
+ </ItemGroup>
+</Project>

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

src/Api/Controllers/Blogspot/RenameFileQuery.cs

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

src/Api/Controllers/NativeConfidentialController.cs

@@ -32,8 +32,7 @@ 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,7 +6,6 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
 using Yavsc.Api.Helpers;
 using Yavsc.Server.Helpers;
-using System.Diagnostics;
 
 namespace Yavsc.WebApi.Controllers
 {
@@ -31,9 +30,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);
@@ -58,7 +57,7 @@ namespace Yavsc.WebApi.Controllers
         [HttpGet("myhost")]
         public IActionResult MyHost ()
         {
-            return Ok(new { host = Request.ForwardedFor() });
+            return Ok(new { host = Request.ForHost() });
         }
 
       

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? ForwardedFor(this HttpRequest request) {
-            string? host = request.Headers["X-Forwarded-For"];
+        public static string ForHost(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,6 +11,8 @@
 */
 
 using IdentityModel;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
@@ -61,8 +63,7 @@ internal class Program
                      options.IncludeErrorDetails = true;
                      options.Authority = "https://localhost:5001";
                      options.TokenValidationParameters =
-                         new() { ValidateAudience = false, RoleClaimType = JwtClaimTypes.Role };
-                     options.MapInboundClaims = true;
+                         new() { ValidateAudience = false };
                  });
 
         services.AddDbContext<ApplicationDbContext>(options =>
@@ -72,7 +73,12 @@ internal class Program
            .AddTransient<IBillingService, BillingService>()
            .AddTransient<ICalendarManager, CalendarManager>();
         services.AddTransient<IFileSystemAuthManager, FileSystemAuthManager>();
-        
+        /*
+          services.AddSingleton<IConnexionManager, HubConnectionManager>();
+          services.AddSingleton<ILiveProcessor, LiveProcessor>();
+          services.AddIdentityApiEndpoints<ApplicationUser>();
+          services.AddSession();
+        */
         WorkflowHelpers.ConfigureBillingService();
         using (var app = builder.Build())
         {
@@ -95,10 +101,15 @@ 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/Directory.Build.props

@@ -1,5 +1,5 @@
-<Project>
+<Project >
   <PropertyGroup>
     <Version>1.0.8</Version>
   </PropertyGroup>
-</Project>
+</Project>

src/Yavsc.Abstract/Blogspot/IBlog.cs

@@ -1,19 +1,16 @@
 
 
 
-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";
 
@@ -37,7 +37,7 @@ namespace Yavsc
         public const string FrontOfficeGroupName = "FrontOffice";
         public const string DefaultAvatar = "/images/Users/icon_user.png";
         public const string AnonAvatar = "/images/Users/icon_anon_user.png";
-        public const string YavscConnectionStringEnvName = "YAVSC_CONNECTION_STRING";
+        public const string YavscConnectionStringEnvName = "DEFAULTCONNECTION_CONNECTIONSTRING";
 
         // at the end, let 4*4 bytes in peace
         public const int WebSocketsMaxBufLen = 4096;
@@ -52,7 +52,9 @@ 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";
     }
 }

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; }
-        string? DedicatedGoogleCalendar { get; } 
-        ILocation? PostalAddress { get; }
+        string UserName { get; set; }
+        string Avatar { get ; set; }
+        IAccountBalance AccountBalance { get; set; }
+        string DedicatedGoogleCalendar { get; set; }
+        ILocation PostalAddress { get; set; }
     }
 }

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

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

src/Yavsc.Abstract/Yavsc.Abstract.csproj

@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Description> A shared model for a little client/server app, dealing about establishing some contract, between some human client and provider.
     </Description>
+    
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-</Project>
+
+</Project>

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

@@ -1,5 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {}
-}

src/Yavsc.Server/Config.cs

@@ -31,34 +31,38 @@ public static class Config
 
         /// <summary>
         /// Lists Available user profile classes,
-        /// populated at startup, using reflection.
+        /// populated at startup, using reflexion.
         /// </summary>
         public static List<Type> ProfileTypes = new List<Type>();
 
 
     public static IEnumerable<IdentityResource> IdentityResources =>
-        [
+        new IdentityResource[]
+        {
             new IdentityResources.OpenId(),
             new IdentityResources.Profile(),
             new IdentityResources.Email()
-        ];
+        };
 
-    public static IEnumerable<ApiScope> TestingApiScopes =>
-        [
+    public static IEnumerable<ApiScope> ApiScopes =>
+        new ApiScope[]
+        {
             new ApiScope("scope1",new string[] {"scope1"}),
             new ApiScope("scope2",new string[] {"scope2"}),
-        ];
+        };
 
-    public static IEnumerable<Client> TestingClients =>
-        [
+    public static IEnumerable<Client> Clients =>
+        new Client[]
+        {
             // m2m client credentials flow client
             new Client
             {
                 ClientId = "m2m.client",
                 ClientName = "Client Credentials Client",
-                ClientSecrets = { new Secret("511536EF-F270-4058-80CA-1C89C192F69A".Sha256()) },
 
                 AllowedGrantTypes = GrantTypes.ClientCredentials,
+                ClientSecrets = { new Secret("511536EF-F270-4058-80CA-1C89C192F69A".Sha256()) },
+
                 AllowedScopes = { "scope1" }
             },
 
@@ -76,14 +80,14 @@ 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" }
             },
-        ];
+        };
 
     public static PayPalSettings? PayPalSettings { get; set; }
 }

src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs

@@ -1,17 +0,0 @@
-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

@@ -1,6 +1,11 @@
 using System.Security.Claims;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Yavsc.Models;
+using Yavsc.Models.Blog;
 
-namespace Yavsc.Server.Helpers
+namespace Yavsc.Helpers
 {
     public static class UserHelpers
     {
@@ -11,7 +16,7 @@ namespace Yavsc.Server.Helpers
 
         public static string GetUserName(this ClaimsPrincipal user)
         {
-            return user.FindFirstValue("name");
+            return user.FindFirstValue(ClaimTypes.Name);
         }
 
         public static bool IsSignedIn(this ClaimsPrincipal user)
@@ -19,5 +24,29 @@ namespace Yavsc.Server.Helpers
             return user.Identity.IsAuthenticated;
         }
 
+        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();
+                return userPosts;
+            }
+            else
+            {
+                long[] readerCirclesMemberships =
+                dbContext.Circle.Include(c => c.Members)
+                .Where(c => c.Members.Any(m => m.MemberId == readerId))
+                .Select(c => c.Id).ToArray();
+                return dbContext.BlogSpot.Include(
+                              b => b.Author
+                              ).Include(p => p.ACL).Where(x => x.Author.Id == posterId &&
+                              (x.ACL.Count == 0 || x.ACL.Any(a => readerCirclesMemberships.Contains(a.CircleId))));
+
+
+            }
+
+        }
     }
 }

src/Yavsc.Server/Helpers/WorkflowHelpers.cs

@@ -0,0 +1,90 @@
+
+
+namespace Yavsc.Helpers
+{
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.EntityFrameworkCore;
+    using Yavsc.Abstract.Workflow;
+    using Yavsc.Billing;
+    using Yavsc.Models;
+    using Yavsc.Models.Billing;
+    using Yavsc.Models.Haircut;
+    using Yavsc.Models.Workflow;
+    using Yavsc.Services;
+    using Yavsc.ViewModels.FrontOffice;
+
+    public static class WorkflowHelpers
+    {
+        public static async Task<List<PerformerProfileViewModel>> 
+        ListPerformersAsync(this ApplicationDbContext context, 
+        IBillingService billing,
+        string actCode)
+        {
+           
+            var actors = context.Performers
+           .Include(p=>p.Activity)
+           .Include(p=>p.Performer)
+           .Where(p => p.Active && p.Activity.Any(u=>u.DoesCode==actCode)).OrderBy( x => x.Rate )
+           .ToArray();
+
+            List<PerformerProfileViewModel> result = new ();
+            foreach (var a in actors)
+            {
+                var settings = await billing.GetPerformersSettingsAsync(actCode, a.PerformerId);
+                result.Add(new PerformerProfileViewModel(a, actCode,settings));
+            }
+
+            return result;
+        }
+
+    public static void RegisterBilling<T>(string code, Func<ApplicationDbContext, long, 
+    IDecidableQuery> getter) where T : IBillable
+    {
+        BillingService.Billing.Add(code, getter);
+        BillingService.GlobalBillingMap.Add(typeof(T).Name, code);
+    }
+
+    public static void ConfigureBillingService()
+    {
+        foreach (var a in System.AppDomain.CurrentDomain.GetAssemblies())
+        {
+            foreach (var c in a.GetTypes())
+            {
+                if (c.IsClass && !c.IsAbstract &&
+                    c.GetInterface("ISpecializationSettings") != null)
+                {
+                    Config.ProfileTypes.Add(c);
+                }
+            }
+        }
+
+        foreach (var propertyInfo in typeof(ApplicationDbContext).GetProperties())
+        {
+            foreach (var attr in propertyInfo.CustomAttributes)
+            {
+                // something like a DbSet?
+                if (typeof(Yavsc.Attributes.ActivitySettingsAttribute).IsAssignableFrom(attr.AttributeType))
+                {
+                    BillingService.UserSettings.Add(propertyInfo);
+                }
+            }
+        }
+
+        RegisterBilling<HairCutQuery>(BillingCodes.Brush, new Func<ApplicationDbContext, long, IDecidableQuery>
+        ((db, id) =>
+        {
+            var query = db.HairCutQueries.Include(q => q.Prestation).Include(q => q.Regularisation).Single(q => q.Id == id);
+            query.SelectedProfile = db.BrusherProfile.Single(b => b.UserId == query.PerformerId);
+            return query;
+        }));
+
+        RegisterBilling<HairMultiCutQuery>(BillingCodes.MBrush, new Func<ApplicationDbContext, long, IDecidableQuery>
+        ((db, id) => db.HairMultiCutQueries.Include(q => q.Regularisation).Single(q => q.Id == id)));
+
+        RegisterBilling<RdvQuery>(BillingCodes.Rdv, new Func<ApplicationDbContext, long, IDecidableQuery>
+        ((db, id) => db.RdvQueries.Include(q => q.Regularisation).Single(q => q.Id == id)));
+    }
+
+    }
+}

src/Yavsc.Server/Hubs/ChatHub.cs

@@ -29,14 +29,11 @@ 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.Server.Helpers;
     using Yavsc.Services;
     public partial class ChatHub : Hub, IDisposable
     {
@@ -195,11 +192,10 @@ namespace Yavsc
                 NotifyUserInRoom(NotificationTypes.Error, room, "already registered.");
                 return;
             }
-            Debug.Assert(Context.User != null);
-            string userName = Context.User.GetUserName();
+            string userName = Context.User.Identity.Name;
             var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName);
 
-            var newroom = new ChatRoom { Name = room, OwnerId = Context.User.GetUserId() };
+            var newroom = new ChatRoom { Name = room, OwnerId = user.Id };
             ChatRoomInfo chanInfo;
             if (_cxManager.TryGetChanInfo(room, out chanInfo))
             {
@@ -323,7 +319,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);
         }
 
@@ -335,8 +331,6 @@ 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)) 
@@ -350,21 +344,19 @@ namespace Yavsc
                 return ;
             }
             _logger.LogInformation($"Message form is validated.");
-                    var identityUserName = Context.User.GetUserName();
 
-            if (userName[0] != '?' && Context.User!=null)
+            if (userName[0] != '?')
                 if (!Context.User.IsInRole(Constants.AdminGroupName))
                 {
-
                     var bl = _dbContext.BlackListed
                         .Include(r => r.User)
                         .Include(r => r.Owner)
-                        .Where(r => r.User.UserName == identityUserName && r.Owner.UserName == userName)
+                        .Where(r => r.User.UserName == Context.User.Identity.Name && r.Owner.UserName == userName)
                         .Select(r => r.OwnerId);
 
                     if (bl.Count() > 0)
                     {
-                        _logger.LogError($"Black listed : {identityUserName}");
+                        _logger.LogError($"Black listed : {Context.User.Identity.Name}");
                         await NotifyUser(NotificationTypes.PrivateMessageDenied, userName, "you are black listed.");
                         return;
                     }
@@ -380,7 +372,7 @@ namespace Yavsc
                 _logger.LogInformation($"cx: {connectionId}");
                 var cli = Clients.Client(connectionId);
                 _logger.LogInformation($"cli: {cli.ToString()}");
-                await cli.SendAsync("addPV", identityUserName, message);
+                await cli.SendAsync("addPV", Context.User.Identity.Name, message);
                 _logger.LogInformation($"Sent pv to cx {connectionId}");
             }
         }
@@ -388,9 +380,6 @@ 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/Makefile

@@ -1,5 +1,26 @@
-SOURCE_DIR=..
-SOLUTION_DIR=../..
+SOURCE_DIR=../..
+MAKEFILE_DIR=$(SOURCE_DIR)/scripts/make
+BASERESX=Resources/Yavsc.Models.Relationship.HyperLink.resx \
+  Resources/Yavsc.Models.Streaming.LiveFlow.resx
+BASERESXGEN=$(BASERESX:.resx=.Designer.cs)
 
+include $(MAKEFILE_DIR)/dnx.mk
+include $(MAKEFILE_DIR)/versioning.mk
 
+default: all
 
+$(BINTARGETPATH): ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll \
+  ../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll prepare_code
+
+../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll:
+	make -C ../OAuth.AspNet.AuthServer 
+
+../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll:
+	make -C ../Yavsc.Abstract
+
+%.Designer.cs: %.resx
+	strongresbuildercli -l -p -t -r "Yavsc.Server.Resources." $^
+
+prepare_code: $(BASERESXGEN)
+
+all: $(BINTARGETPATH)