Skip to content

Commit d8ea5e3

Browse files
author
Chris Young
committed
Merge branch 'release/4.4.0'
2 parents db42b60 + 77bf3c8 commit d8ea5e3

File tree

5 files changed

+53
-46
lines changed

5 files changed

+53
-46
lines changed

‎src/ArchitectNow.Mongo/MongoModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ public class MongoModule: Module
1313
{
1414
protected override void Load(ContainerBuilder builder)
1515
{
16-
builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces();
16+
builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces().PreserveExistingDefaults();
1717

1818
builder.RegisterType<MongoDataContextService>().As<IDataContextService<MongoDataContext>>()
19-
.InstancePerLifetimeScope();
19+
.InstancePerLifetimeScope().PreserveExistingDefaults();
2020

21-
builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance();
21+
builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance().PreserveExistingDefaults();
2222
}
2323
}
2424
}

‎src/ArchitectNow.Services/ServicesModule.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ public class ServicesModule : Module
88
{
99
protected override void Load(ContainerBuilder builder)
1010
{
11-
builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces();
12-
builder.RegisterType<BaseCacheService<CachingOptions>>().As<ICacheService>().SingleInstance();
11+
builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces().PreserveExistingDefaults();
12+
builder.RegisterType<BaseCacheService<CachingOptions>>().As<ICacheService>().SingleInstance().PreserveExistingDefaults();
1313
}
1414
}
1515
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ public static void ConfigureSwagger(this IApplicationBuilder app, Assembly assem
3737
{
3838
swaggerUiOwinSettings.DocumentProcessors.Add(optionDocumentProcessor);
3939
}
40+
41+
foreach (var operationProcessor in option.OperationProcessors)
42+
{
43+
swaggerUiOwinSettings.OperationProcessors.Add(operationProcessor);
44+
}
4045

4146
action?.Invoke(swaggerUiOwinSettings);
4247
if (option.Controllers?.Any() == true)

‎src/ArchitectNow.Web/Models/SwaggerOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class SwaggerOptions
2222
public Action<SwaggerUiSettings> Configure { get; set; }
2323

2424
public IList<IDocumentProcessor> DocumentProcessors { get; set; } = new List<IDocumentProcessor>();
25-
25+
public IList<IOperationProcessor> OperationProcessors { get; set; } = new List<IOperationProcessor>();
2626
public SwaggerOptions(bool includeAuthorizationHeader = true)
2727
{
2828
if (includeAuthorizationHeader)

‎src/ArchitectNow.Web/WebModule.cs‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,47 @@ public class WebModule : Module
1717
protected override void Load(ContainerBuilder builder)
1818
{
1919
var assembly = ThisAssembly;
20-
builder.RegisterAssemblyTypes(assembly).AsImplementedInterfaces();
21-
22-
builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
23-
builder.RegisterType<RaygunJobFilter>().AsSelf().InstancePerLifetimeScope();
24-
25-
builder.RegisterType<GlobalExceptionFilter>().AsSelf().InstancePerLifetimeScope();
26-
27-
builder.Register(context =>
28-
{
29-
var configurationRoot = context.Resolve<IConfigurationRoot>();
30-
var issuerOptions = configurationRoot.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
31-
32-
var keyString = issuerOptions.Audience;
33-
var keyBytes = Encoding.Unicode.GetBytes(keyString);
34-
var signingKey = new JwtSigningKey(keyBytes);
35-
return signingKey;
36-
})
37-
.AsSelf()
38-
.SingleInstance();
39-
40-
builder.Register(context =>
41-
{
42-
var configurationRoot = context.Resolve<IConfigurationRoot>();
43-
var issuerOptions = configurationRoot.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
44-
45-
var key = context.Resolve<JwtSigningKey>();
46-
47-
issuerOptions.SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256Signature);
48-
49-
return new OptionsWrapper<JwtIssuerOptions>(issuerOptions);
50-
}).As<IOptions<JwtIssuerOptions>>().InstancePerLifetimeScope();
51-
52-
builder.Register(context =>
53-
{
54-
var configurationRoot = context.Resolve<IConfigurationRoot>();
55-
var key = configurationRoot["RaygunSettings:ApiKey"];
56-
var raygunClient = new RaygunClient(key);
57-
return raygunClient;
58-
}).AsSelf();
59-
}
20+
builder.RegisterAssemblyTypes(assembly).AsImplementedInterfaces().PreserveExistingDefaults();
21+
22+
builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
23+
builder.RegisterType<RaygunJobFilter>().AsSelf().InstancePerLifetimeScope().PreserveExistingDefaults();
24+
25+
builder.RegisterType<GlobalExceptionFilter>().AsSelf().InstancePerLifetimeScope()
26+
.PreserveExistingDefaults();
27+
28+
builder.Register(context =>
29+
{
30+
var configurationRoot = context.Resolve<IConfigurationRoot>();
31+
var issuerOptions = configurationRoot.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
32+
33+
var keyString = issuerOptions.Audience;
34+
var keyBytes = Encoding.Unicode.GetBytes(keyString);
35+
var signingKey = new JwtSigningKey(keyBytes);
36+
return signingKey;
37+
})
38+
.AsSelf()
39+
.SingleInstance()
40+
.PreserveExistingDefaults();
41+
42+
builder.Register(context =>
43+
{
44+
var configurationRoot = context.Resolve<IConfigurationRoot>();
45+
var issuerOptions = configurationRoot.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
46+
47+
var key = context.Resolve<JwtSigningKey>();
48+
49+
issuerOptions.SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256Signature);
50+
51+
return new OptionsWrapper<JwtIssuerOptions>(issuerOptions);
52+
}).As<IOptions<JwtIssuerOptions>>().InstancePerLifetimeScope().PreserveExistingDefaults();
53+
54+
builder.Register(context =>
55+
{
56+
var configurationRoot = context.Resolve<IConfigurationRoot>();
57+
var key = configurationRoot["RaygunSettings:ApiKey"];
58+
var raygunClient = new RaygunClient(key);
59+
return raygunClient;
60+
}).AsSelf().PreserveExistingDefaults();
61+
}
6062
}
6163
}

0 commit comments

Comments
 (0)