Skip to content

Commit 01f2f94

Browse files
author
Chris Young
committed
Fixed mvc
1 parent ea0296f commit 01f2f94

17 files changed

+126
-61
lines changed

‎src/ArchitectNow.Web.Mongo/ArchitectNow.Web.Mongo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
5858
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
5959
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
60-
</ItemGroup>
60+
</ItemGroup>
6161
<ItemGroup>
6262
<ProjectReference Include="..\ArchitectNow.Mongo\ArchitectNow.Mongo.csproj" />
6363
<ProjectReference Include="..\ArchitectNow.Web\ArchitectNow.Web.csproj" />

‎src/ArchitectNow.Web.Mongo/Startup.cs‎ renamed to ‎src/ArchitectNow.Web.Mongo/StartupSample.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
namespace ArchitectNow.Web.Mongo
2323
{
24-
public sealed class Startup
24+
public sealed class StartupSample
2525
{
26-
private readonly ILogger<Startup> _logger;
26+
private readonly ILogger<StartupSample> _logger;
2727
private readonly IConfiguration _configuration;
2828
private IContainer _applicationContainer;
2929

30-
public Startup(ILogger<Startup> logger, IConfiguration configuration)
30+
public StartupSample(ILogger<StartupSample> logger, IConfiguration configuration)
3131
{
3232
_logger = logger;
3333
_configuration = configuration;
@@ -55,7 +55,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
5555
services.AddTransient<IStartupFilter, AssetStartupFilter>();
5656
services.AddTransient<IStartupFilter, SwaggerStartupFilter>(serviceProvider =>
5757
{
58-
return new SwaggerStartupFilter(new SwaggerOptions
58+
return new SwaggerStartupFilter( serviceProvider.GetService<ILogger<SwaggerStartupFilter>>(),
59+
new SwaggerOptions
5960
{
6061
Version = "1.0",
6162
Title = "API",
@@ -82,7 +83,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
8283
services.ConfigureHangfire( _configuration["mongo:connectionString"], _configuration["mongo:connectionString"], configuration => { });
8384

8485
//last
85-
_applicationContainer = services.CreateAutofacContainer(builder =>
86+
_applicationContainer = services.CreateAutofacContainer((builder, serviceCollection) =>
8687
{
8788
builder.RegisterModule<WebModule>();
8889
builder.RegisterModule<ServicesModule>();

‎src/ArchitectNow.Web.Redis/ArchitectNow.Web.Redis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
5959
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
6060
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
61-
</ItemGroup>
61+
</ItemGroup>
6262
<ItemGroup>
6363
<ProjectReference Include="..\ArchitectNow.Services\ArchitectNow.Services.csproj" />
6464
<ProjectReference Include="..\ArchitectNow.Web\ArchitectNow.Web.csproj" />

‎src/ArchitectNow.Web.Redis/Startup.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
namespace ArchitectNow.Web.Redis
2222
{
23-
public sealed class Startup
23+
public sealed class StartupSample
2424
{
25-
private readonly ILogger<Startup> _logger;
25+
private readonly ILogger<StartupSample> _logger;
2626
private readonly IConfiguration _configuration;
2727
private IContainer _applicationContainer;
2828

29-
public Startup(ILogger<Startup> logger, IConfiguration configuration)
29+
public StartupSample(ILogger<StartupSample> logger, IConfiguration configuration)
3030
{
3131
_logger = logger;
3232
_configuration = configuration;
@@ -54,7 +54,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
5454
services.AddTransient<IStartupFilter, AssetStartupFilter>();
5555
services.AddTransient<IStartupFilter, SwaggerStartupFilter>(serviceProvider =>
5656
{
57-
return new SwaggerStartupFilter(new SwaggerOptions
57+
return new SwaggerStartupFilter( serviceProvider.GetService<ILogger<SwaggerStartupFilter>>(),
58+
new SwaggerOptions
5859
{
5960
Version = "1.0",
6061
Title = "API",
@@ -81,7 +82,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
8182
services.ConfigureHangfire( _configuration["redis:connectionString"], options => { }, configuration => { });
8283

8384
//last
84-
_applicationContainer = services.CreateAutofacContainer(builder =>
85+
_applicationContainer = services.CreateAutofacContainer((builder, serviceCollection) =>
8586
{
8687
builder.RegisterModule<WebModule>();
8788
builder.RegisterModule<ServicesModule>();

‎src/ArchitectNow.Web.Sql/ArchitectNow.Web.Sql.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
22-
<ItemGroup>
22+
<ItemGroup>
2323
<PackageReference Include="Autofac" Version="4.8.0" />
2424
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
2525
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.19" />

‎src/ArchitectNow.Web.Sql/Startup.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
namespace ArchitectNow.Web.Sql
2222
{
23-
public sealed class Startup
23+
public sealed class StartupSample
2424
{
25-
private readonly ILogger<Startup> _logger;
25+
private readonly ILogger<StartupSample> _logger;
2626
private readonly IConfiguration _configuration;
2727
private IContainer _applicationContainer;
2828

29-
public Startup(ILogger<Startup> logger, IConfiguration configuration)
29+
public StartupSample(ILogger<StartupSample> logger, IConfiguration configuration)
3030
{
3131
_logger = logger;
3232
_configuration = configuration;
@@ -54,7 +54,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
5454
services.AddTransient<IStartupFilter, AssetStartupFilter>();
5555
services.AddTransient<IStartupFilter, SwaggerStartupFilter>(serviceProvider =>
5656
{
57-
return new SwaggerStartupFilter(new SwaggerOptions
57+
return new SwaggerStartupFilter( serviceProvider.GetService<ILogger<SwaggerStartupFilter>>(),
58+
new SwaggerOptions
5859
{
5960
Version = "1.0",
6061
Title = "API",
@@ -81,7 +82,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
8182
services.ConfigureHangfire( _configuration["redis:connectionString"], configuration => { });
8283

8384
//last
84-
_applicationContainer = services.CreateAutofacContainer(builder =>
85+
_applicationContainer = services.CreateAutofacContainer((builder, serviceCollection) =>
8586
{
8687
builder.RegisterModule<WebModule>();
8788
builder.RegisterModule<ServicesModule>();

‎src/ArchitectNow.Web/Configuration/AntiForgeryStartupFilter.cs‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,41 @@
44
using Microsoft.AspNetCore.Hosting;
55
using Microsoft.AspNetCore.Http;
66
using Microsoft.Extensions.DependencyInjection;
7+
using Microsoft.Extensions.Logging;
78

89
namespace ArchitectNow.Web.Configuration
910
{
10-
public class AntiForgeryStartupFilter: IStartupFilter
11-
{
12-
public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
13-
{
14-
return builder =>
15-
{
16-
var antiforgery = builder.ApplicationServices.GetService<IAntiforgery>();
17-
builder.Use(n => context =>
18-
{
19-
if (string.Equals(context.Request.Path.Value, "/", StringComparison.OrdinalIgnoreCase) ||
20-
string.Equals(context.Request.Path.Value, "/index.html", StringComparison.OrdinalIgnoreCase))
21-
{
22-
var tokens = antiforgery.GetAndStoreTokens(context);
23-
context.Response.Cookies.Append("X-XSRF-TOKEN", tokens.RequestToken,
24-
new CookieOptions { HttpOnly = false });
25-
}
11+
public class AntiForgeryStartupFilter : IStartupFilter
12+
{
13+
private readonly ILogger<AntiForgeryStartupFilter> _logger;
2614

27-
return n(context);
28-
});
29-
next(builder);
30-
};
31-
}
32-
}
15+
public AntiForgeryStartupFilter(ILogger<AntiForgeryStartupFilter> logger)
16+
{
17+
_logger = logger;
18+
}
19+
20+
public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
21+
{
22+
return builder =>
23+
{
24+
_logger.LogInformation($"Configure Start: {nameof(AntiForgeryStartupFilter)}");
25+
26+
var antiforgery = builder.ApplicationServices.GetService<IAntiforgery>();
27+
builder.Use(n => context =>
28+
{
29+
if (string.Equals(context.Request.Path.Value, "/", StringComparison.OrdinalIgnoreCase) ||
30+
string.Equals(context.Request.Path.Value, "/index.html", StringComparison.OrdinalIgnoreCase))
31+
{
32+
var tokens = antiforgery.GetAndStoreTokens(context);
33+
context.Response.Cookies.Append("X-XSRF-TOKEN", tokens.RequestToken,
34+
new CookieOptions {HttpOnly = false});
35+
}
36+
37+
return n(context);
38+
});
39+
next(builder);
40+
_logger.LogInformation($"Configure End: {nameof(AntiForgeryStartupFilter)}");
41+
};
42+
}
43+
}
3344
}

‎src/ArchitectNow.Web/Configuration/AssetStartupFilter.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@
44
using Microsoft.AspNetCore.Hosting;
55
using Microsoft.Extensions.Configuration;
66
using Microsoft.Extensions.DependencyInjection;
7+
using Microsoft.Extensions.Logging;
78

89
namespace ArchitectNow.Web.Configuration
910
{
1011
public class AssetStartupFilter : IStartupFilter
1112
{
13+
private readonly ILogger<AssetStartupFilter> _logger;
14+
15+
public AssetStartupFilter(ILogger<AssetStartupFilter> logger)
16+
{
17+
_logger = logger;
18+
}
1219
public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
1320
{
1421
return builder =>
15-
{
22+
{
23+
_logger.LogInformation($"Configure End: {nameof(AssetStartupFilter)}");
24+
1625
var configuration = builder.ApplicationServices.GetService<IConfiguration>();
1726
builder.UseFileServer();
1827

@@ -25,6 +34,7 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
2534
builder.UseStaticFiles();
2635

2736
next(builder);
37+
_logger.LogInformation($"Configure End: {nameof(AssetStartupFilter)}");
2838
};
2939
}
3040
}

‎src/ArchitectNow.Web/Configuration/AutofacExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ArchitectNow.Web.Configuration
77
{
88
public static class AutofacExtensions
99
{
10-
public static IContainer CreateAutofacContainer(this IServiceCollection services, Action<ContainerBuilder> additionalAction, params Module[] modules)
10+
public static IContainer CreateAutofacContainer(this IServiceCollection services, Action<ContainerBuilder, IServiceCollection> additionalAction, params Module[] modules)
1111
{
1212
var builder = new ContainerBuilder();
1313

@@ -17,7 +17,7 @@ public static IContainer CreateAutofacContainer(this IServiceCollection services
1717
builder.RegisterModule(module);
1818
}
1919

20-
additionalAction?.Invoke(builder);
20+
additionalAction?.Invoke(builder, services);
2121

2222
builder.Populate(services);
2323

‎src/ArchitectNow.Web/Configuration/CompressionStartupFilter.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
using System;
22
using Microsoft.AspNetCore.Builder;
33
using Microsoft.AspNetCore.Hosting;
4+
using Microsoft.Extensions.Logging;
45

56
namespace ArchitectNow.Web.Configuration
67
{
78
public class CompressionStartupFilter : IStartupFilter
89
{
10+
private readonly ILogger<CompressionStartupFilter> _logger;
11+
12+
public CompressionStartupFilter(ILogger<CompressionStartupFilter> logger)
13+
{
14+
_logger = logger;
15+
}
916
public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
1017
{
1118
return builder => {
19+
_logger.LogInformation($"Configure End: {nameof(CompressionStartupFilter)}");
20+
1221
builder.UseResponseCompression();
1322
next(builder);
23+
_logger.LogInformation($"Configure End: {nameof(CompressionStartupFilter)}");
1424
};
1525
}
1626
}

0 commit comments

Comments
 (0)