Remove SP enabled flag

Author: jasontaylordev

src/ServiceControl/Authentication/AuthenticationController.cs

@@ -15,7 +15,7 @@ public ActionResult<AuthConfig> Configuration()
         {
             var info = new AuthConfig
             {
-                Enabled = settings.OpenIdConnectSettings.ServicePulseEnabled,
+                Enabled = settings.OpenIdConnectSettings.Enabled,
                 ClientId = settings.OpenIdConnectSettings.ServicePulseClientId,
                 Authority = settings.OpenIdConnectSettings.ServicePulseAuthority,
                 ApiScope = settings.OpenIdConnectSettings.ServicePulseApiScope

src/ServiceControl/Infrastructure/Settings/OpenIdConnectSettings.cs

@@ -26,15 +26,9 @@ public OpenIdConnectSettings(bool validateConfiguration)
             ValidateLifetime = SettingsReader.Read(Settings.SettingsRootNamespace, "Authentication.ValidateLifetime", true);
             ValidateIssuerSigningKey = SettingsReader.Read(Settings.SettingsRootNamespace, "Authentication.ValidateIssuerSigningKey", true);
             RequireHttpsMetadata = SettingsReader.Read(Settings.SettingsRootNamespace, "Authentication.RequireHttpsMetadata", true);
-
-            ServicePulseEnabled = SettingsReader.Read(Settings.SettingsRootNamespace, "Authentication.ServicePulse.Enabled", false);
-
-            if (ServicePulseEnabled)
-            {
-                ServicePulseClientId = SettingsReader.Read<string>(Settings.SettingsRootNamespace, "Authentication.ServicePulse.ClientId");
-                ServicePulseApiScope = SettingsReader.Read<string>(Settings.SettingsRootNamespace, "Authentication.ServicePulse.ApiScope");
-                ServicePulseAuthority = SettingsReader.Read<string>(Settings.SettingsRootNamespace, "Authentication.ServicePulse.Authority");
-            }
+            ServicePulseClientId = SettingsReader.Read<string>(Settings.SettingsRootNamespace, "Authentication.ServicePulse.ClientId");
+            ServicePulseApiScope = SettingsReader.Read<string>(Settings.SettingsRootNamespace, "Authentication.ServicePulse.ApiScope");
+            ServicePulseAuthority = SettingsReader.Read<string>(Settings.SettingsRootNamespace, "Authentication.ServicePulse.Authority");
 
             if (validateConfiguration)
             {
@@ -66,9 +60,6 @@ public OpenIdConnectSettings(bool validateConfiguration)
         [JsonPropertyName("requireHttpsMetadata")]
         public bool RequireHttpsMetadata { get; }
 
-        [JsonPropertyName("servicePulseEnabled")]
-        public bool ServicePulseEnabled { get; }
-
         [JsonPropertyName("servicePulseAuthority")]
         public string ServicePulseAuthority { get; }
 
@@ -133,22 +124,19 @@ void Validate()
                 logger.LogWarning("Authentication.ValidateIssuerSigningKey is set to false. This is a serious security risk and should only be used in development environments");
             }
 
-            if (ServicePulseEnabled)
+            if (string.IsNullOrWhiteSpace(ServicePulseClientId))
+            {
+                throw new Exception("Authentication.ServicePulse.ClientId is required when Authentication.ServicePulse.Enabled is true.");
+            }
+
+            if (string.IsNullOrWhiteSpace(ServicePulseApiScope))
+            {
+                throw new Exception("Authentication.ServicePulse.ApiScope is required when Authentication.ServicePulse.Enabled is true.");
+            }
+
+            if (ServicePulseAuthority != null && !Uri.TryCreate(ServicePulseAuthority, UriKind.Absolute, out _))
             {
-                if (string.IsNullOrWhiteSpace(ServicePulseClientId))
-                {
-                    throw new Exception("Authentication.ServicePulse.ClientId is required when Authentication.ServicePulse.Enabled is true.");
-                }
-
-                if (string.IsNullOrWhiteSpace(ServicePulseApiScope))
-                {
-                    throw new Exception("Authentication.ServicePulse.ApiScope is required when Authentication.ServicePulse.Enabled is true.");
-                }
-
-                if (ServicePulseAuthority != null && !Uri.TryCreate(ServicePulseAuthority, UriKind.Absolute, out _))
-                {
-                    throw new Exception("Authentication.ServicePulse.Authority must be a valid absolute URI if provided.");
-                }
+                throw new Exception("Authentication.ServicePulse.Authority must be a valid absolute URI if provided.");
             }
 
             logger.LogInformation("Authentication configuration validated successfully");
@@ -159,7 +147,6 @@ void Validate()
             logger.LogInformation("  ValidateLifetime: {ValidateLifetime}", ValidateLifetime);
             logger.LogInformation("  ValidateIssuerSigningKey: {ValidateIssuerSigningKey}", ValidateIssuerSigningKey);
             logger.LogInformation("  RequireHttpsMetadata: {RequireHttpsMetadata}", RequireHttpsMetadata);
-            logger.LogInformation("  ServicePulseEnabled: {ServicePulseEnabled}", ServicePulseEnabled);
             logger.LogInformation("  ServicePulseClientId: {ServicePulseClientId}", ServicePulseClientId);
             logger.LogInformation("  ServicePulseAuthority: {ServicePulseAuthority}", ServicePulseAuthority);
             logger.LogInformation("  ServicePulseApiScope: {ServicePulseApiScope}", ServicePulseApiScope);