Merge branch 'develop'

PyroFetes/Endpoints/Settings/GetSettingEndpoint.cs

@@ -2,11 +2,10 @@
 using PyroFetes.DTO.SettingDTO.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
-using PyroFetes.Services;
 
 namespace PyroFetes.Endpoints.Settings;
 
-public class GetSettingEndpoint(SettingsRepository settingsRepository, StorageService storageService) : EndpointWithoutRequest<GetSettingDto>
+public class GetSettingEndpoint(SettingsRepository settingsRepository, AutoMapper.IMapper mapper) : EndpointWithoutRequest<GetSettingDto>
 {
     public override void Configure()
     {
@@ -23,14 +22,7 @@ public class GetSettingEndpoint(SettingsRepository settingsRepository, StorageSe
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        GetSettingDto settingDto = new()
-        {
-            Id = setting.Id,
-            ElectronicSignature = storageService.GetUrl(setting.ElectronicSignature!),
-            Logo = storageService.GetUrl(setting.Logo!)
-        };
 
-        await Send.OkAsync(settingDto, ct);
+        await Send.OkAsync(mapper.Map<GetSettingDto>(setting), ct);
     }
 }

PyroFetes/Endpoints/Settings/PatchSettingElectronicSignatureEndpoint.cs

@@ -2,11 +2,10 @@
 using PyroFetes.DTO.SettingDTO.Request;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
-using PyroFetes.Services;
 
 namespace PyroFetes.Endpoints.Settings;
 
-public class PatchSettingElectronicSignatureEndpoint(SettingsRepository settingsRepository, StorageService storageService) : Endpoint<PatchSettingElectronicSignatureDto>
+public class PatchSettingElectronicSignatureEndpoint(SettingsRepository settingsRepository) : Endpoint<PatchSettingElectronicSignatureDto>
 {
     public override void Configure()
     {
@@ -25,10 +24,14 @@ public class PatchSettingElectronicSignatureEndpoint(SettingsRepository settings
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
-        string key = await storageService.UploadFile(req.ElectronicSignature!, "electronicSignature", ct);
+        // Encodage en base64
-        setting.ElectronicSignature = key;
+        using MemoryStream memoryStream = new();
-        
+        if (req.ElectronicSignature != null) await req.ElectronicSignature.CopyToAsync(memoryStream, ct);
+        byte[] signatureBytes = memoryStream.ToArray();
+
+        setting.ElectronicSignature = Convert.ToBase64String(signatureBytes);
+
         await settingsRepository.SaveChangesAsync(ct);
         await Send.NoContentAsync(ct);
     }

PyroFetes/Endpoints/Settings/PatchSettingLogoEndpoint.cs

@@ -2,11 +2,10 @@
 using PyroFetes.DTO.SettingDTO.Request;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
-using PyroFetes.Services;
 
 namespace PyroFetes.Endpoints.Settings;
 
-public class PatchSettingLogoEndpoint(SettingsRepository settingsRepository, StorageService storageService) : Endpoint<PatchSettingLogoDto>
+public class PatchSettingLogoEndpoint(SettingsRepository settingsRepository) : Endpoint<PatchSettingLogoDto>
 {
     public override void Configure()
     {
@@ -25,9 +24,12 @@ public class PatchSettingLogoEndpoint(SettingsRepository settingsRepository, Sto
             return;
         }
 
-        string key = await storageService.UploadFile(req.Logo!, "logo", ct);
+        // Encodage en base64
+        using MemoryStream memoryStream = new();
+        if (req.Logo != null) await req.Logo.CopyToAsync(memoryStream, ct);
+        byte[] logoBytes = memoryStream.ToArray();
 
-        setting.Logo = key;
+        setting.Logo = Convert.ToBase64String(logoBytes);
 
         await settingsRepository.SaveChangesAsync(ct);
         await Send.NoContentAsync(ct);

PyroFetes/Program.cs

@@ -1,5 +1,3 @@
-using Amazon.S3;
-using Amazon.S3.Model;
 using AutoMapper;
 using AutoMapper.EquivalencyExpression;
 using PyroFetes;
@@ -9,7 +7,6 @@ using FastEndpoints.Security;
 using Microsoft.Net.Http.Headers;
 using PyroFetes.MappingProfiles;
 using PyroFetes.Repositories;
-using PyroFetes.Services;
 using PyroFetes.Services.Pdf;
 using QuestPDF.Infrastructure;
 
@@ -59,7 +56,6 @@ builder.Services.AddScoped<CustomersRepository>();
 builder.Services.AddScoped<IDeliveryNotePdfService, DeliveryNotePdfService>();
 builder.Services.AddScoped<IPurchaseOrderPdfService, PurchaseOrderPdfService>();
 builder.Services.AddScoped<IQuotationPdfService, QuotationPdfService>();
-builder.Services.AddScoped<StorageService>();
 
 MapperConfiguration mappingConfig = new(mc =>
 {
@@ -72,31 +68,6 @@ MapperConfiguration mappingConfig = new(mc =>
 AutoMapper.IMapper mapper = mappingConfig.CreateMapper();
 builder.Services.AddSingleton(mapper);
 
-// RUSTFS
-IConfigurationSection config = builder.Configuration.GetSection("RustFS");
-
-AmazonS3Client s3Client = new(
-    config["AccessKey"],
-    config["SecretKey"],
-    new AmazonS3Config
-    {
-        ServiceURL = config["ServiceUrl"],
-        ForcePathStyle = true
-    }
-);
-
-ListBucketsResponse? buckets = await s3Client.ListBucketsAsync();
-bool exist = buckets?.Buckets?.Any(x => x.BucketName == config["BucketName"]) == true;
-if (!exist)
-{
-    await s3Client.PutBucketAsync(new PutBucketRequest
-    {
-        BucketName = config["BucketName"]
-    });
-}
-
-builder.Services.AddSingleton<IAmazonS3>(s3Client);
-
 // On construit l'application en lui donnant vie
 WebApplication app = builder.Build();
 app.UseAuthentication()

PyroFetes/PyroFetes.csproj

@@ -10,7 +10,6 @@
         <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="9.3.1" />
         <PackageReference Include="AutoMapper" Version="15.0.1" />
         <PackageReference Include="AutoMapper.Collection" Version="11.0.0" />
-        <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
         <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
         <PackageReference Include="FastEndpoints" Version="7.0.1" />
         <PackageReference Include="FastEndpoints.Security" Version="7.0.1" />

PyroFetes/Services/StorageService.cs

@@ -1,37 +0,0 @@
-using Amazon.S3;
-using Amazon.S3.Model;
-
-namespace PyroFetes.Services;
-
-public class StorageService(IAmazonS3 amazonS3, IConfiguration config)
-{
-    private readonly string _bucket = config["RustFs:BucketName"]!;
-    private readonly string _url = config["RustFs:ServiceUrl"]!;
-    
-    public async Task<string> UploadFile(IFormFile file, string type, CancellationToken ct)
-    {
-        if (file.Length == 0) throw new Exception("Fichier vide");
-        
-        string key = $"settings/{type}";
-
-        using MemoryStream memoryStream = new();
-        await file.CopyToAsync(memoryStream, ct);
-        memoryStream.Position = 0;
-
-        PutObjectRequest uploadRequest = new()
-        {
-            BucketName = _bucket,
-            ContentType = file.ContentType,
-            InputStream = memoryStream,
-            Key = key,
-        };
-        
-        await amazonS3.PutObjectAsync(uploadRequest, ct);
-        return key;
-    }
-
-    public string? GetUrl(string key)
-    {
-        return string.IsNullOrEmpty(key) ? null : $"{_url}/{_bucket}/{key}";
-    }
-}

PyroFetes/appsettings.Development.json

@@ -4,11 +4,5 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
-  },
-  "RustFS": {
-    "ServiceUrl": "https://stockage.sanchezvende.fr",
-    "AccessKey": "Admin_Beready_Exam2026",
-    "SecretKey": "4dm1n-Pr0j_2026-B3r34d7",
-    "BucketName": "images"
   }
 }