Browse Source

Handle null configs.

pull/748/head
Sebastian 4 years ago
parent
commit
9217ea1e19
  1. 2
      backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaPlugin.cs
  2. 2
      backend/extensions/Squidex.Extensions/Assets/Azure/AzureMetadataSourcePlugin.cs
  3. 2
      backend/src/Squidex/Config/Authentication/AuthenticationServices.cs
  4. 2
      backend/src/Squidex/Config/Domain/AssetServices.cs
  5. 6
      backend/src/Squidex/Config/Domain/NotificationsServices.cs

2
backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaPlugin.cs

@ -16,7 +16,7 @@ namespace Squidex.Extensions.Actions.Kafka
{ {
public void ConfigureServices(IServiceCollection services, IConfiguration config) public void ConfigureServices(IServiceCollection services, IConfiguration config)
{ {
var options = config.GetSection("kafka").Get<KafkaProducerOptions>(); var options = config.GetSection("kafka").Get<KafkaProducerOptions>() ?? new ();
if (options.IsProducerConfigured()) if (options.IsProducerConfigured())
{ {

2
backend/extensions/Squidex.Extensions/Assets/Azure/AzureMetadataSourcePlugin.cs

@ -17,7 +17,7 @@ namespace Squidex.Extensions.Assets.Azure
{ {
public void ConfigureServices(IServiceCollection services, IConfiguration config) public void ConfigureServices(IServiceCollection services, IConfiguration config)
{ {
var options = config.GetSection("assets:azureCognitive").Get<AzureMetadataSourceOptions>(); var options = config.GetSection("assets:azurecognitive").Get<AzureMetadataSourceOptions>() ?? new ();
if (options.IsConfigured()) if (options.IsConfigured())
{ {

2
backend/src/Squidex/Config/Authentication/AuthenticationServices.cs

@ -15,7 +15,7 @@ namespace Squidex.Config.Authentication
{ {
public static void AddSquidexAuthentication(this IServiceCollection services, IConfiguration config) public static void AddSquidexAuthentication(this IServiceCollection services, IConfiguration config)
{ {
var identityOptions = config.GetSection("identity").Get<MyIdentityOptions>(); var identityOptions = config.GetSection("identity").Get<MyIdentityOptions>() ?? new ();
services.AddAuthentication() services.AddAuthentication()
.AddSquidexCookies() .AddSquidexCookies()

2
backend/src/Squidex/Config/Domain/AssetServices.cs

@ -123,7 +123,7 @@ namespace Squidex.Config.Domain
}, },
["AmazonS3"] = () => ["AmazonS3"] = () =>
{ {
var amazonS3Options = config.GetSection("assetStore:amazonS3").Get<AmazonS3Options>(); var amazonS3Options = config.GetSection("assetStore:amazonS3").Get<AmazonS3Options>() ?? new ();
services.AddSingletonAs(c => new AmazonS3AssetStore(amazonS3Options)) services.AddSingletonAs(c => new AmazonS3AssetStore(amazonS3Options))
.As<IAssetStore>(); .As<IAssetStore>();

6
backend/src/Squidex/Config/Domain/NotificationsServices.cs

@ -1,4 +1,4 @@
// ========================================================================== // ==========================================================================
// Squidex Headless CMS // Squidex Headless CMS
// ========================================================================== // ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt) // Copyright (c) Squidex UG (haftungsbeschraenkt)
@ -19,7 +19,7 @@ namespace Squidex.Config.Domain
{ {
public static void AddSquidexNotifications(this IServiceCollection services, IConfiguration config) public static void AddSquidexNotifications(this IServiceCollection services, IConfiguration config)
{ {
var emailOptions = config.GetSection("email:smtp").Get<SmtpOptions>(); var emailOptions = config.GetSection("email:smtp").Get<SmtpOptions>() ?? new ();
if (emailOptions.IsConfigured()) if (emailOptions.IsConfigured())
{ {
@ -44,4 +44,4 @@ namespace Squidex.Config.Domain
.As<IEventConsumer>(); .As<IEventConsumer>();
} }
} }
} }

Loading…
Cancel
Save