Skip to content

Commit 23647fd

Browse files
i4004i4004
committed
Merge branch 'release/4.0'
2 parents 62e1045 + 5aeb99e commit 23647fd

File tree

91 files changed

+1744
-763
lines changed

Some content is hidden

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

91 files changed

+1744
-763
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,7 @@ src/SampleApps/SampleApp.SelfHosted/Styles/*.css
121121
**/wwwroot/dist/
122122

123123
# Node modules
124-
node_modules/
124+
node_modules/
125+
126+
# Coverage files ignore
127+
*lcov.info

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"dotnet-test-explorer.testProjectPath": "src/**/*Tests.csproj"
2+
"dotnet-test-explorer.testProjectPath": "src/**/*Tests.csproj",
3+
"dotnet-test-explorer.testArguments": "/p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info"
34
}

‎src/SampleApps/SampleApp.Angular/Responses/Json.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Text.Json;
2+
using System.Threading.Tasks;
23
using Simplify.Web;
34

45
namespace SampleApp.Angular.Responses
@@ -34,12 +35,12 @@ public Json(object objectToConvert, int statusCode = 200)
3435
/// Processes this response
3536
/// </summary>
3637
/// <returns></returns>
37-
public override ControllerResponseResult Process()
38+
public override async Task<ControllerResponseResult> Process()
3839
{
3940
Context.Response.ContentType = "application/json";
4041
Context.Response.StatusCode = _statusCode;
4142

42-
ResponseWriter.Write(JsonConvert.SerializeObject(_objectToConvert), Context.Response);
43+
await ResponseWriter.WriteAsync(JsonSerializer.Serialize(_objectToConvert), Context.Response);
4344

4445
return ControllerResponseResult.RawOutput;
4546
}

‎src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.0</TargetFramework>
3+
<TargetFramework>netcoreapp3.1</TargetFramework>
44
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
55
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
66
<SpaRoot>ClientApp/</SpaRoot>
77
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.0.0" />
11-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
10+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.0" />
11+
<PackageReference Include="System.Text.Json" Version="4.7.0" />
1212
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1313
</ItemGroup>
1414
<ItemGroup>

‎src/SampleApps/SampleApp.Classic.Tests/Controllers/Shared/NavbarControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void Invoke_InlineTplNavbarDataDataReturned()
1616

1717
var c = new Mock<NavbarController> { CallBase = true };
1818

19-
c.Setup(x => x.TemplateFactory.Load(It.Is<string>(name => name == "Navbar"))).Returns(Template.FromString("Inline Data"));
19+
c.Setup(x => x.TemplateFactory.Load(It.Is<string>(name => name == "Navbar"))).Returns(TemplateBuilder.FromString("Inline Data").Build);
2020

2121
// Act
2222
var result = c.Object.Invoke() as InlineTpl;

‎src/SampleApps/SampleApp.Classic.Tests/SampleApp.Classic.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
13+
<PackageReference Include="coverlet.msbuild" Version="2.7.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1415
<PackageReference Include="NUnit" Version="3.12.0" />
1516
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
16-
<PackageReference Include="Moq" Version="4.13.0" />
17+
<PackageReference Include="Moq" Version="4.13.1" />
1718
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1819
<ProjectReference Include="..\SampleApp.Classic\SampleApp.Classic.csproj" />
1920
</ItemGroup>

‎src/SampleApps/SampleApp.Classic/Controllers/Accounts/LoginController.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Security.Claims;
3+
using System.Threading.Tasks;
34
using Microsoft.AspNetCore.Authentication;
45
using Microsoft.AspNetCore.Authentication.Cookies;
56
using SampleApp.Classic.Models.Accounts;
@@ -13,10 +14,12 @@
1314
namespace SampleApp.Classic.Controllers.Accounts
1415
{
1516
[Post("login")]
16-
public class LoginController : Controller<LoginViewModel>
17+
public class LoginController : AsyncController<LoginViewModel>
1718
{
18-
public override ControllerResponse Invoke()
19+
public override async Task<ControllerResponse> Invoke()
1920
{
21+
await ReadModelAsync();
22+
2023
if (Model.Password == "1" && Model.UserName == "Foo")
2124
{
2225
var claims = new List<Claim>
@@ -26,7 +29,7 @@ public override ControllerResponse Invoke()
2629

2730
var id = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
2831

29-
Context.Context.SignInAsync(new ClaimsPrincipal(id));
32+
await Context.Context.SignInAsync(new ClaimsPrincipal(id));
3033

3134
return new Redirect(RedirectionType.LoginReturnUrl);
3235
}

‎src/SampleApps/SampleApp.Classic/Controllers/Accounts/LogoutController.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
using Microsoft.AspNetCore.Authentication;
1+
using System.Threading.Tasks;
2+
using Microsoft.AspNetCore.Authentication;
23
using Simplify.Web;
34
using Simplify.Web.Attributes;
45
using Simplify.Web.Responses;
56

67
namespace SampleApp.Classic.Controllers.Accounts
78
{
89
[Get("logout")]
9-
public class LogoutController : Controller
10+
public class LogoutController : AsyncController
1011
{
11-
public override ControllerResponse Invoke()
12+
public override async Task<ControllerResponse> Invoke()
1213
{
13-
Context.Context.SignOutAsync().Wait();
14+
await Context.Context.SignOutAsync();
1415

1516
return new Redirect();
1617
}

‎src/SampleApps/SampleApp.Classic/Controllers/Shared/LoginPanelController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class LoginPanelController : AsyncController
1111
{
1212
public override async Task<ControllerResponse> Invoke()
1313
{
14-
return Context.Context.User == null || !Context.Context.User.Identity.IsAuthenticated
14+
return !Context.IsAuthenticated
1515
? new InlineTpl("LoginPanel", await TemplateFactory.LoadAsync("Shared/LoginPanel/GuestPanel"))
1616
: new InlineTpl("LoginPanel", await GetView<LoggedUserPanelView>().Get(Context.Context.User.Identity.Name));
1717
}

‎src/SampleApps/SampleApp.Classic/Controllers/Shared/NavbarController.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using Simplify.Web;
2+
using Simplify.Web.Attributes;
23
using Simplify.Web.Responses;
34

45
namespace SampleApp.Classic.Controllers.Shared
56
{
7+
[Priority(-2)]
68
public class NavbarController : Controller
79
{
810
public override ControllerResponse Invoke()

0 commit comments

Comments
 (0)