fix(connector): handle null targets

thinktecture · Nov 7, 2023 · fbaabd4 · fbaabd4
1 parent d111e59
commit fbaabd4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Thinktecture.Relay.Connector.Abstractions/RelayConnectorOptions.cs b/src/Thinktecture.Relay.Connector.Abstractions/RelayConnectorOptions.cs
@@ -37,5 +37,5 @@ public class RelayConnectorOptions
 	/// <summary>
 	/// The targets keyed by id.
 	/// </summary>
-	public Dictionary<string, Dictionary<string, string>> Targets { get; set; } = default!;
+	public Dictionary<string, Dictionary<string, string>>? Targets { get; set; }
 }
diff --git a/src/Thinktecture.Relay.Connector/Options/RelayConnectorConfigureOptions.cs b/src/Thinktecture.Relay.Connector/Options/RelayConnectorConfigureOptions.cs
@@ -7,7 +7,7 @@ internal class RelayConnectorConfigureOptions : IConfigureOptions<RelayConnector
 {
 	public void Configure(RelayConnectorOptions options)
 	{
-		if (options.Targets.Count == 0) return;
+		if (options.Targets == null || options.Targets.Count == 0) return;
 
 		foreach (var (_, value) in options.Targets)
 		{

diff --git a/src/Thinktecture.Relay.Connector/Options/RelayConnectorPostConfigureOptions.cs b/src/Thinktecture.Relay.Connector/Options/RelayConnectorPostConfigureOptions.cs
@@ -33,7 +33,7 @@ public RelayConnectorPostConfigureOptions(ILogger<RelayConnectorPostConfigureOpt
 
 	public void PostConfigure(string name, RelayConnectorOptions options)
 	{
-		if (options.Targets.Count > 0)
+		if (options.Targets != null)
 		{
 			RegisterTargets(options.Targets);
 		}

diff --git a/src/Thinktecture.Relay.Connector/Options/RelayConnectorValidateOptions.cs b/src/Thinktecture.Relay.Connector/Options/RelayConnectorValidateOptions.cs
@@ -8,7 +8,7 @@ internal class RelayConnectorValidateOptions : IValidateOptions<RelayConnectorOp
 {
 	public ValidateOptionsResult Validate(string name, RelayConnectorOptions options)
 	{
-		if (options.Targets.Count == 0) return ValidateOptionsResult.Success;
+		if (options.Targets == null || options.Targets.Count == 0) return ValidateOptionsResult.Success;
 
 		var missingType = options.Targets.Where(kvp => !kvp.Value.ContainsKey(Constants.RelayConnectorOptionsTargetType))
 			.Select(kvp => kvp.Key).ToArray();