From fbaabd4c2092750adbede0f3085789afdd348c46 Mon Sep 17 00:00:00 2001
From: Thomas Hilzendegen <thomas.hilzendegen@thinktecture.com>
Date: Tue, 7 Nov 2023 14:19:59 +0100
Subject: [PATCH] fix(connector): handle null targets

---
 .../RelayConnectorOptions.cs                                    | 2 +-
 .../Options/RelayConnectorConfigureOptions.cs                   | 2 +-
 .../Options/RelayConnectorPostConfigureOptions.cs               | 2 +-
 .../Options/RelayConnectorValidateOptions.cs                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Thinktecture.Relay.Connector.Abstractions/RelayConnectorOptions.cs b/src/Thinktecture.Relay.Connector.Abstractions/RelayConnectorOptions.cs
index 6b7a7cdbb..764b493cf 100644
--- 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
index 29c31e102..fafb7d1bb 100644
--- 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
index a1d63e1c1..f4089c0f2 100644
--- 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
index 980b00954..c095b1819 100644
--- 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();