sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://home.git.sebastienandre.com/sandre/SkydiveLogs

Browse Source
This commit is contained in:
sandre
2023-04-14 12:53:06 +02:00
parent 4f42243f20 c9e368c95f
commit d704841237
8 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -41,4 +41,5 @@ Back/skydiveLogs-api/Data/JumpsDb.db
Back/skydiveLogs-api/Data/JumpsDb-log.db Back/skydiveLogs-api/Data/JumpsDb-log.db
/Back/skydiveLogs-api.Domain/bin/Release/net5.0/skydiveLogs-api.Domain.deps.json /Back/skydiveLogs-api.Domain/bin/Release/net5.0/skydiveLogs-api.Domain.deps.json
/Back/skydiveLogs-api.Domain/bin/Debug/net6.0 /Back/skydiveLogs-api.Domain/bin/Debug/net6.0
/Back/skydiveLogs-api.Domain/bin/Debug/net7.0
Back/skydiveLogs-api/Data/JumpsDb.db Back/skydiveLogs-api/Data/JumpsDb.db

2
Back/skydiveLogs-api.Domain/skydiveLogs-api.Domain.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>skydiveLogs_api.Domain</RootNamespace> <RootNamespace>skydiveLogs_api.Domain</RootNamespace>
</PropertyGroup> </PropertyGroup>

4
Back/skydiveLogs-api.DomainBusiness/UserService.cs
View File

@@ -68,7 +68,9 @@ namespace skydiveLogs_api.DomainBusiness
using (Aes encryptor = Aes.Create()) using (Aes encryptor = Aes.Create())
{ {
Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(encryptionKey, Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(encryptionKey,
new byte[] { 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 }); new byte[] { 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 },
3,
HashAlgorithmName.SHA256);
encryptor.Key = pdb.GetBytes(32); encryptor.Key = pdb.GetBytes(32);
encryptor.IV = pdb.GetBytes(16); encryptor.IV = pdb.GetBytes(16);
using (MemoryStream ms = new MemoryStream()) using (MemoryStream ms = new MemoryStream())

4
Back/skydiveLogs-api.DomainBusiness/skydiveLogs-api.DomainBusiness.csproj
View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>skydiveLogs_api.DomainBusiness</RootNamespace> <RootNamespace>skydiveLogs_api.DomainBusiness</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" /> <PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>skydiveLogs_api.DomainService</RootNamespace> <RootNamespace>skydiveLogs_api.DomainService</RootNamespace>
</PropertyGroup> </PropertyGroup>

4
Back/skydiveLogs-api.Infrastructure/skydiveLogs-api.Infrastructure.csproj
View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>skydiveLogs_api.Infrastructure</RootNamespace> <RootNamespace>skydiveLogs_api.Infrastructure</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LiteDB" Version="5.0.12" /> <PackageReference Include="LiteDB" Version="5.0.16" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj
View File

@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>skydiveLogs_api.Ioc</RootNamespace> <RootNamespace>skydiveLogs_api.Ioc</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

12
Back/skydiveLogs-api/skydiveLogs-api.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<RootNamespace>skydiveLogs_api</RootNamespace> <RootNamespace>skydiveLogs_api</RootNamespace>
<UserSecretsId>9d7d268e-ee4d-43a2-a9b7-5b00b516f6f8</UserSecretsId> <UserSecretsId>9d7d268e-ee4d-43a2-a9b7-5b00b516f6f8</UserSecretsId>
@@ -18,11 +18,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.0" /> <PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" /> <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.6" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.28.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>