Skip to content

Commit b75dd1c

Browse files
ysmoradiysmoradi
authored
feat: update to bitplatform 8.8.0 #49 (#50)
1 parent a7b3311 commit b75dd1c

File tree

87 files changed

+1886
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1886
-463
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"hostRequirements": {
44
"cpus": 4
55
},
6-
"onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/85bcc525-4e9c-471e-9c1d-96259aa1a315/930833ef34f66fe9ee2643b0ba21621a/dotnet-sdk-8.0.201-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && dotnet dev-certs https --trust && sudo dotnet workload install wasm-tools wasm-experimental && dotnet tool install --global dotnet-ef --version 8.0.1 && dotnet ef database update --project src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj && dotnet build src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
6+
"onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/656a3402-6889-400f-927f-7f956856e58b/93750973d6eedd17c6d963658e7ec214/dotnet-sdk-8.0.203-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && dotnet dev-certs https --trust && sudo dotnet workload install wasm-tools wasm-experimental && dotnet tool install --global dotnet-ef --version 8.0.3 && dotnet ef database update --project src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj && dotnet build src/Client/Bit.TemplatePlayground.Client.Core/Bit.TemplatePlayground.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
77
"waitFor": "onCreateCommand",
88
"customizations": {
99
"codespaces": {

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
node-version: 18
2929

3030
- name: Build
31-
run: dotnet build Bit.TemplatePlayground.sln -c Release -p:EnableWindowsTargeting=true
31+
run: dotnet build Bit.TemplatePlayground.sln -c Release

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.201",
4-
"rollForward": "disable"
3+
"version": "8.0.203",
4+
"rollForward": "disable"
55
}
66
}

‎src/Bit.TemplatePlayground.Iac/Bit.TemplatePlayground.Iac.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Pulumi.AzureNative" Version="2.29.0" />
9+
<PackageReference Include="Pulumi.AzureNative" Version="2.34.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Bit.TemplatePlayground.Server/.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "8.0.2",
6+
"version": "8.0.3",
77
"commands": [
88
"dotnet-ef"
99
]

‎src/Bit.TemplatePlayground.Server/Bit.TemplatePlayground.Server.csproj

+15-28
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<UserSecretsId>66B6DE78-12F7-4F5B-A1EC-180DBDEC4183</UserSecretsId>
56
</PropertyGroup>
67

78
<ItemGroup>
8-
<PackageReference Include="Bit.CodeAnalyzers" Version="8.7.6">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
<PackageReference Include="Bit.SourceGenerators" Version="8.7.6">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
9+
<PackageReference Include="Bit.CodeAnalyzers" Version="8.8.0" PrivateAssets="all" />
10+
<PackageReference Include="Bit.SourceGenerators" Version="8.8.0" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
1712
</ItemGroup>
1813

1914
<ItemGroup>
@@ -25,23 +20,16 @@
2520
<ItemGroup>
2621
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.6.0" />
2722
<PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
28-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
29-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.2" />
30-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.2" />
31-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.4" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
33-
<PrivateAssets>all</PrivateAssets>
34-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35-
</PackageReference>
36-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
37-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
38-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
39-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
40-
<PrivateAssets>all</PrivateAssets>
41-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42-
</PackageReference>
43-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.2" />
44-
<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
24+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.3" />
25+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.3" />
26+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.5" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3" PrivateAssets="all" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3" PrivateAssets="all" />
32+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.3" />
4533
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
4634
<PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.0" />
4735
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.0" />
@@ -87,8 +75,7 @@
8775
<!-- https://learn.microsoft.com/en-us/dotnet/core/docker/publish-as-container -->
8876
<PropertyGroup>
8977
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
90-
<EnableSdkContainerDebugging>True</EnableSdkContainerDebugging>
91-
<UserSecretsId>44373297-7155-4EFA-9BEB-BB3FA5F85FE9</UserSecretsId>
78+
<EnableSdkContainerDebugging Condition="'$(Configuration)' == 'Debug'">True</EnableSdkContainerDebugging>
9279
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
9380
<DockerfileContext>..\..</DockerfileContext>
9481
</PropertyGroup>

‎src/Bit.TemplatePlayground.Server/Components/App.razor

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
{
3737
<LoadingComponent />
3838
}
39+
3940
<Routes @rendermode=renderMode />
4041

4142
@if (HttpContext.Request.IsCrawlerClient() is false)

‎src/Bit.TemplatePlayground.Server/Components/EmailConfirmationTemplate.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta http-equiv="Content-TypeEntity" content="text/html; charset=UTF-8" />
1515
<title>@EmailLocalizer[nameof(EmailStrings.ConfirmationEmailSubject)]</title>
1616
</head>
17-
<body style="width:100%; height:100%; margin:0; padding:0; background-color:#FCFCFC; font-family:Arial,sans-serif;">
17+
<body dir="@(CultureInfo.CurrentCulture.TextInfo.IsRightToLeft ? "rtl" : null)" style="width:100%; height:100%; margin:0; padding:0; background-color:#FCFCFC; font-family:Arial,sans-serif;">
1818
<main style="padding: 6% 4%;">
1919
<table class="content-table" border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
2020
style="border:1px solid #EDEBE9; border-radius:2px; padding:50px; text-align:center;">

‎src/Bit.TemplatePlayground.Server/Components/ResetPasswordTemplate.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta http-equiv="Content-TypeEntity" content="text/html; charset=UTF-8" />
1515
<title>@EmailLocalizer[nameof(EmailStrings.ResetPasswordEmailSubject)]</title>
1616
</head>
17-
<body style="width:100%; height:100%; margin:0; padding:0; background-color:#FCFCFC; font-family:Arial,sans-serif;">
17+
<body dir="@(CultureInfo.CurrentCulture.TextInfo.IsRightToLeft ? "rtl" : null)" style="width:100%; height:100%; margin:0; padding:0; background-color:#FCFCFC; font-family:Arial,sans-serif;">
1818
<main style="padding: 6% 4%;">
1919
<table class="content-table" border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
2020
style="border:1px solid #EDEBE9; border-radius:2px; padding:50px; text-align:center;">

‎src/Bit.TemplatePlayground.Server/Controllers/AttachmentController.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Bit.TemplatePlayground.Server.Models.Identity;
22
using ImageMagick;
3-
using MimeTypes;
3+
using Microsoft.AspNetCore.StaticFiles;
44
using SystemFile = System.IO.File;
55

66
namespace Bit.TemplatePlayground.Server.Controllers;
@@ -13,6 +13,8 @@ public partial class AttachmentController : AppControllerBase
1313

1414
[AutoInject] private IWebHostEnvironment webHostEnvironment = default!;
1515

16+
[AutoInject] private IContentTypeProvider contentTypeProvider = default!;
17+
1618
[HttpPost]
1719
[RequestSizeLimit(11 * 1024 * 1024 /*11MB*/)]
1820
public async Task UploadProfileImage(IFormFile? file, CancellationToken cancellationToken)
@@ -134,7 +136,12 @@ public async Task<IActionResult> GetProfileImage()
134136
if (SystemFile.Exists(filePath) is false)
135137
return new EmptyResult();
136138

139+
if (contentTypeProvider.TryGetContentType(filePath, out var contentType) is false)
140+
{
141+
throw new InvalidOperationException();
142+
}
143+
137144
return PhysicalFile(Path.Combine(webHostEnvironment.ContentRootPath, filePath),
138-
MimeTypeMap.GetMimeType(Path.GetExtension(filePath)), enableRangeProcessing: true);
145+
contentType, enableRangeProcessing: true);
139146
}
140147
}

‎src/Bit.TemplatePlayground.Server/Controllers/Identity/IdentityController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private async Task SendConfirmationEmail(SendConfirmationEmailRequestDto sendCon
9393

9494
var controller = RouteData.Values["controller"]!.ToString();
9595

96-
var confirmationLink = new Uri(HttpContext.Request.GetBaseUrl(), $"email-confirmation?email={HttpUtility.UrlEncode(user.Email)}&token={HttpUtility.UrlEncode(token)}");
96+
var confirmationLink = new Uri(HttpContext.Request.GetBaseUrl(), $"email-confirmation?email={Uri.EscapeDataString(user.Email!)}&token={Uri.EscapeDataString(token)}");
9797

9898
var body = await htmlRenderer.Dispatcher.InvokeAsync(async () =>
9999
{
@@ -205,7 +205,7 @@ public async Task SendResetPasswordEmail(SendResetPasswordEmailRequestDto sendRe
205205

206206
var token = await userManager.GeneratePasswordResetTokenAsync(user);
207207

208-
var resetPasswordLink = new Uri(HttpContext.Request.GetBaseUrl(), $"reset-password?email={HttpUtility.UrlEncode(user.Email)}&token={HttpUtility.UrlEncode(token)}");
208+
var resetPasswordLink = new Uri(HttpContext.Request.GetBaseUrl(), $"reset-password?email={Uri.EscapeDataString(user.Email!)}&token={Uri.EscapeDataString(token)}");
209209

210210
var body = await htmlRenderer.Dispatcher.InvokeAsync(async () =>
211211
{

‎src/Bit.TemplatePlayground.Server/Program.Services.cs

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.AspNetCore.OData;
1313
using Microsoft.IdentityModel.Tokens;
1414
using Microsoft.OpenApi.Models;
15+
using Microsoft.AspNetCore.StaticFiles;
1516

1617
namespace Bit.TemplatePlayground.Server;
1718

@@ -64,11 +65,14 @@ private static void ConfigureServices(this WebApplicationBuilder builder)
6465
};
6566
});
6667

67-
services.AddDbContext<AppDbContext>(options =>
68+
services.AddDbContextPool<AppDbContext>(options =>
6869
{
70+
options.EnableSensitiveDataLogging(env.IsDevelopment())
71+
.EnableDetailedErrors(env.IsDevelopment());
72+
6973
options.UseSqlite(configuration.GetConnectionString("SqliteConnectionString"), dbOptions =>
7074
{
71-
dbOptions.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
75+
7276
});
7377
});
7478

@@ -85,6 +89,7 @@ private static void ConfigureServices(this WebApplicationBuilder builder)
8589
AddHealthChecks(builder);
8690

8791
services.TryAddTransient<HtmlRenderer>();
92+
services.TryAddTransient<IContentTypeProvider, FileExtensionContentTypeProvider>();
8893

8994
var fluentEmailServiceBuilder = services.AddFluentEmail(appSettings.EmailSettings.DefaultFromEmail, appSettings.EmailSettings.DefaultFromName);
9095

@@ -136,7 +141,7 @@ private static void AddBlazor(WebApplicationBuilder builder)
136141
apiServerAddress = new Uri(sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl(), apiServerAddress);
137142
}
138143

139-
return new HttpClient(sp.GetRequiredKeyedService<HttpMessageHandler>("DefaultMessageHandler"))
144+
return new HttpClient(sp.GetRequiredKeyedService<DelegatingHandler>("DefaultMessageHandler"))
140145
{
141146
BaseAddress = apiServerAddress
142147
};

0 commit comments

Comments
 (0)