diff --git a/mixyboos-api/Controllers/AccountController.cs b/mixyboos-api/Controllers/AccountController.cs index 292cc2f..9e7f3be 100644 --- a/mixyboos-api/Controllers/AccountController.cs +++ b/mixyboos-api/Controllers/AccountController.cs @@ -41,7 +41,7 @@ public async Task Register([FromBody] RegisterDTO model) { return BadRequest(ModelState); } - var faker = new Faker("en"); + var faker = new Faker(); var user = new MixyBoosUser { UserName = model.UserName, Email = model.UserName, diff --git a/mixyboos-api/Program.cs b/mixyboos-api/Program.cs index eee34d2..8b5f5da 100644 --- a/mixyboos-api/Program.cs +++ b/mixyboos-api/Program.cs @@ -82,8 +82,8 @@ app.UseCors(corsBuilder => corsBuilder .WithOrigins("http://localhost:3000") - .WithOrigins("https://mixyboos.dev.fergl.ie:3000") - .WithOrigins("http://mixyboos.dev.fergl.ie:3000") + .WithOrigins("https://mixyboos.dev.fergl.ie:3002") + .WithOrigins("http://mixyboos.dev.fergl.ie:3002") .WithOrigins("https://www.mixyboos.com") .WithOrigins("https://mixyboos.com") .AllowCredentials() diff --git a/mixyboos-api/Services/Auth/SigningCertificateGenerator.cs b/mixyboos-api/Services/Auth/SigningCertificateGenerator.cs deleted file mode 100644 index 3dfae65..0000000 --- a/mixyboos-api/Services/Auth/SigningCertificateGenerator.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.IO; -using System.Security.Cryptography; -using System.Security.Cryptography.X509Certificates; - -namespace MixyBoos.Api.Services.Auth; - -public static class SigningCertificateGenerator { - public static X509Certificate2 CreateEncryptionCertificate() { - if (File.Exists("encryption-certificate.pfx")) { - return new X509Certificate2("encryption-certificate.pfx"); - } - - using var algorithm = RSA.Create(keySizeInBits: 2048); - - var subject = new X500DistinguishedName("CN=Mixboos Encryption Certificate"); - var request = - new CertificateRequest(subject, algorithm, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); - request.CertificateExtensions.Add(new X509KeyUsageExtension(X509KeyUsageFlags.KeyEncipherment, - critical: true)); - - var certificate = request.CreateSelfSigned(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddYears(2)); - - File.WriteAllBytes("encryption-certificate.pfx", certificate.Export(X509ContentType.Pfx, string.Empty)); - - return new X509Certificate2("encryption-certificate.pfx"); - } - - public static X509Certificate2 CreateSigningCertificate() { - if (File.Exists("signing-certificate.pfx")) { - return new X509Certificate2("signing-certificate.pfx"); - } - - using var algorithm = RSA.Create(keySizeInBits: 2048); - - var subject = new X500DistinguishedName("CN=Mixboos Encryption Certificate"); - var request = - new CertificateRequest(subject, algorithm, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); - request.CertificateExtensions.Add(new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature, - critical: true)); - - var certificate = request.CreateSelfSigned(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddYears(2)); - - File.WriteAllBytes("signing-certificate.pfx", certificate.Export(X509ContentType.Pfx, string.Empty)); - - return new X509Certificate2("signing-certificate.pfx"); - } -} diff --git a/mixyboos-api/mixyboos-api.csproj b/mixyboos-api/mixyboos-api.csproj index 539f91b..a258c94 100644 --- a/mixyboos-api/mixyboos-api.csproj +++ b/mixyboos-api/mixyboos-api.csproj @@ -10,52 +10,52 @@ - - - - - - - - - - + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\SilkierQuartz.deps.json" /> - <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\Quartz.Plugins.RecentHistory\obj\project.assets.json" /> - <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\Quartz.Plugins.RecentHistory\obj\Quartz.Plugins.RecentHistory.csproj.nuget.dgspec.json" /> - <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\SilkierQuartz\obj\project.assets.json" /> - <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\SilkierQuartz\obj\SilkierQuartz.csproj.nuget.dgspec.json" /> + <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\SilkierQuartz.deps.json"/> + <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\Quartz.Plugins.RecentHistory\obj\project.assets.json"/> + <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\Quartz.Plugins.RecentHistory\obj\Quartz.Plugins.RecentHistory.csproj.nuget.dgspec.json"/> + <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\SilkierQuartz\obj\project.assets.json"/> + <_ContentIncludedByDefault Remove="deps\Silkier\net7.0\src\SilkierQuartz\obj\SilkierQuartz.csproj.nuget.dgspec.json"/> - +