Correct UX bugs relating to context status.

GeekInTheNorth · GeekInTheNorth · commit 1c0696ac1c73 · 2026-03-26T23:48:30.000Z
diff --git a/src/Stott.Security.Optimizely.Test/Features/Csp/Reporting/ViolationReportSummaryTests.cs b/src/Stott.Security.Optimizely.Test/Features/Csp/Reporting/ViolationReportSummaryTests.cs
@@ -18,7 +18,7 @@ public void SanitizedSourceReturnsEitherTheFullDomainOrOriginalString(
         string expectedSanitizedSource)
     {
         // Arrange
-        var summary = new ViolationReportSummary(Guid.NewGuid(), source, string.Empty, 1, DateTime.Now);
+        var summary = new ViolationReportSummary(Guid.NewGuid(), source, string.Empty, null, null, 1, DateTime.Now);
 
         // Assert
         Assert.That(summary.SanitizedSource, Is.EqualTo(expectedSanitizedSource));
@@ -29,7 +29,7 @@ public void SanitizedSourceReturnsEitherTheFullDomainOrOriginalString(
     public void CreatesAppropriateSuggestionsForWildCardDomains(string source, IList<string> expectedSuggestions)
     {
         // Arrange
-        var summary = new ViolationReportSummary(Guid.NewGuid(), source, string.Empty, 1, DateTime.Now);
+        var summary = new ViolationReportSummary(Guid.NewGuid(), source, string.Empty, null, null, 1, DateTime.Now);
 
         // Assert
         Assert.That(summary.SourceSuggestions, Is.EquivalentTo(expectedSuggestions));
@@ -40,7 +40,7 @@ public void CreatesAppropriateSuggestionsForWildCardDomains(string source, IList
     public void CreatesASingleSuggestionMatchingTheSourceWhenSourceIsNotAUrl(string source)
     {
         // Arrange
-        var summary = new ViolationReportSummary(Guid.NewGuid(), source, string.Empty, 1, DateTime.Now);
+        var summary = new ViolationReportSummary(Guid.NewGuid(), source, string.Empty, null, null, 1, DateTime.Now);
 
         // Assert
         Assert.Multiple(() =>
@@ -55,7 +55,7 @@ public void CreatesASingleSuggestionMatchingTheSourceWhenSourceIsNotAUrl(string
     public void CreatesAppropriateSuggestionsForDirectives(string directive, IList<string> expectedDirectives)
     {
         // Arrange
-        var summary = new ViolationReportSummary(Guid.NewGuid(), string.Empty, directive, 1, DateTime.Now);
+        var summary = new ViolationReportSummary(Guid.NewGuid(), string.Empty, directive, null, null, 1, DateTime.Now);
 
         // Assert
         Assert.That(summary.DirectiveSuggestions, Is.EquivalentTo(expectedDirectives));
diff --git a/src/Stott.Security.Optimizely.Test/Features/PermissionPolicy/PermissionPolicyControllerTests.cs b/src/Stott.Security.Optimizely.Test/Features/PermissionPolicy/PermissionPolicyControllerTests.cs
@@ -235,31 +235,31 @@ public void DeleteDirectives_WhenServiceThrowsException_ThenExceptionIsRethrown(
     public async Task GetSettings_WhenOverrideExists_ThenIsInheritedIsFalse()
     {
         // Arrange
-        _mockService.Setup(x => x.HasOverrideAsync("app1", null)).ReturnsAsync(true);
+        _mockService.Setup(x => x.ExistsForContextAsync("app1", null)).ReturnsAsync(true);
         _mockService.Setup(x => x.GetPermissionPolicySettingsAsync("app1", null))
             .ReturnsAsync(new PermissionPolicySettingsModel { IsEnabled = true });
 
         // Act
         var result = await _controller.GetSettings("app1", null);
 
         // Assert
-        _mockService.Verify(x => x.HasOverrideAsync("app1", null), Times.Once);
+        _mockService.Verify(x => x.ExistsForContextAsync("app1", null), Times.Once);
         _mockService.Verify(x => x.GetPermissionPolicySettingsAsync("app1", null), Times.Once);
     }
 
     [Test]
     public async Task GetSettings_WhenNoOverrideExists_ThenIsInheritedIsTrue()
     {
         // Arrange
-        _mockService.Setup(x => x.HasOverrideAsync("app1", null)).ReturnsAsync(false);
+        _mockService.Setup(x => x.ExistsForContextAsync("app1", null)).ReturnsAsync(false);
         _mockService.Setup(x => x.GetPermissionPolicySettingsAsync("app1", null))
             .ReturnsAsync(new PermissionPolicySettingsModel { IsEnabled = false });
 
         // Act
         var result = await _controller.GetSettings("app1", null);
 
         // Assert
-        _mockService.Verify(x => x.HasOverrideAsync("app1", null), Times.Once);
+        _mockService.Verify(x => x.ExistsForContextAsync("app1", null), Times.Once);
         _mockService.Verify(x => x.GetPermissionPolicySettingsAsync("app1", null), Times.Once);
     }
 
diff --git a/src/Stott.Security.Optimizely.Test/Features/PermissionPolicy/Services/PermissionPolicyServiceTests.cs b/src/Stott.Security.Optimizely.Test/Features/PermissionPolicy/Services/PermissionPolicyServiceTests.cs
@@ -446,7 +446,7 @@ public async Task HasOverrideAsync_WhenSettingsByContextReturnsNonNull_ThenRetur
             .ReturnsAsync(new PermissionPolicySettingsModel());
 
         // Act
-        var result = await _service.HasOverrideAsync("app1", null);
+        var result = await _service.ExistsForContextAsync("app1", null);
 
         // Assert
         Assert.That(result, Is.True);
@@ -460,7 +460,7 @@ public async Task HasOverrideAsync_WhenSettingsByContextReturnsNull_ThenReturnsF
             .ReturnsAsync((PermissionPolicySettingsModel?)null);
 
         // Act
-        var result = await _service.HasOverrideAsync("app1", null);
+        var result = await _service.ExistsForContextAsync("app1", null);
 
         // Assert
         Assert.That(result, Is.False);
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Reporting/Repository/CspViolationReportRepository.cs b/src/Stott.Security.Optimizely/Features/Csp/Reporting/Repository/CspViolationReportRepository.cs
@@ -86,28 +86,29 @@ public async Task<IList<ViolationReportSummary>> GetReportAsync(string? source,
         // - Include host-specific records when both appId and hostName are provided
         if (!string.IsNullOrWhiteSpace(appId) && !string.IsNullOrWhiteSpace(hostName))
         {
-            query = query.Where(x => x.AppId == null || x.AppId == string.Empty
-                                  || (x.AppId == appId && (x.HostName == null || x.HostName == string.Empty))
-                                  || (x.AppId == appId && x.HostName == hostName));
+            query = query.Where(x => x.AppId == appId && x.HostName == hostName);
         }
         else if (!string.IsNullOrWhiteSpace(appId))
         {
-            query = query.Where(x => x.AppId == null || x.AppId == string.Empty
-                                  || x.AppId == appId);
+            query = query.Where(x => x.AppId == appId);
         }
 
         // Groups violations by BlockedUri and Violated Directive and gets the latest stats.
         var violations = await (from violation in query
                                 group violation by new
                                 {
                                     violation.BlockedUri,
-                                    violation.ViolatedDirective
+                                    violation.ViolatedDirective,
+                                    violation.AppId,
+                                    violation.HostName
                                 } into violationGroup
                                 select new
                                 {
                                     Id = violationGroup.Select(x => x.Id).First(),
                                     Source = violationGroup.Key.BlockedUri,
                                     Directive = violationGroup.Key.ViolatedDirective,
+                                    violationGroup.Key.AppId,
+                                    violationGroup.Key.HostName,
                                     Violations = violationGroup.Sum(y => y.Instances),
                                     LastViolated = violationGroup.Max(y => y.LastReported)
                                 }).ToListAsync();
@@ -124,7 +125,7 @@ public async Task<IList<ViolationReportSummary>> GetReportAsync(string? source,
 
         // Convert to a model collection with a unique Id per row.
         return violations.Where(x => x.LastViolated >= threshold)
-                         .Select(x => new ViolationReportSummary(x.Id, x.Source, x.Directive, x.Violations, x.LastViolated))
+                         .Select(x => new ViolationReportSummary(x.Id, x.Source, x.Directive, x.AppId, x.HostName, x.Violations, x.LastViolated))
                          .OrderByDescending(x => x.LastViolated)
                          .ToList();
     }
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Reporting/ViolationReportSummary.cs b/src/Stott.Security.Optimizely/Features/Csp/Reporting/ViolationReportSummary.cs
@@ -14,6 +14,10 @@ public sealed class ViolationReportSummary
 
     public string SanitizedSource { get; }
 
+    public string? AppId { get; }
+
+    public string? HostName { get; }
+
     public IList<string> SourceSuggestions { get; }
 
     public string Directive { get; set; }
@@ -28,12 +32,16 @@ public ViolationReportSummary(
         Guid key,
         string? source,
         string? directive,
+        string? appId,
+        string? hostName,
         int violations,
         DateTime lastViolated)
     {
         Key = key;
         Source = source ?? string.Empty;
         Directive = directive ?? string.Empty;
+        AppId = appId;
+        HostName = hostName;
         Violations = violations;
         LastViolated = lastViolated;
 
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Sandbox/CspSandboxController.cs b/src/Stott.Security.Optimizely/Features/Csp/Sandbox/CspSandboxController.cs
@@ -24,11 +24,10 @@ public async Task<IActionResult> Get(string? appId, string? hostName)
     {
         try
         {
-            var sanitizedHost = hostName.GetSanitizedHostDomain();
-            var contextData = await service.GetByContextAsync(appId, sanitizedHost);
-            var isInherited = contextData == null && (!string.IsNullOrWhiteSpace(appId) || !string.IsNullOrWhiteSpace(sanitizedHost));
-            contextData ??= await service.GetAsync(appId, sanitizedHost);
-            var data = CspSandboxMapper.MapToResponse(contextData, isInherited);
+            var sanitizedHostName = hostName.GetSanitizedHostDomain();
+            var existsForContext = await service.ExistsForContextAsync(appId, sanitizedHostName);
+            var contextData = await service.GetAsync(appId, sanitizedHostName);
+            var data = CspSandboxMapper.MapToResponse(contextData, !existsForContext);
 
             return CreateSuccessJson(data);
         }
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Sandbox/Service/CspSandboxService.cs b/src/Stott.Security.Optimizely/Features/Csp/Sandbox/Service/CspSandboxService.cs
@@ -26,11 +26,6 @@ public async Task<SandboxModel> GetAsync(string? appId, string? hostName)
         return settings;
     }
 
-    public async Task<SandboxModel?> GetByContextAsync(string? appId, string? hostName)
-    {
-        return await repository.GetByContextAsync(appId, hostName);
-    }
-
     public async Task SaveAsync(SandboxModel model, string? modifiedBy, string? appId, string? hostName)
     {
         if (string.IsNullOrWhiteSpace(modifiedBy))
@@ -55,6 +50,17 @@ public async Task DeleteByContextAsync(string? appId, string? hostName, string?
         cacheWrapper.RemoveAll();
     }
 
+    public async Task<bool> ExistsForContextAsync(string? appId, string? hostName)
+    {
+        if (string.IsNullOrWhiteSpace(appId) && string.IsNullOrWhiteSpace(hostName))
+        {
+            return true;
+        }
+
+        var actualSettings = await repository.GetByContextAsync(appId, hostName);
+        return actualSettings is not null;
+    }
+
     private static string GetCacheKey(string? appId, string? hostName)
     {
         return $"{CacheKeyPrefix}.{appId ?? "global"}.{hostName ?? "all"}";
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Sandbox/Service/ICspSandboxService.cs b/src/Stott.Security.Optimizely/Features/Csp/Sandbox/Service/ICspSandboxService.cs
@@ -16,14 +16,6 @@ public interface ICspSandboxService
     /// <returns></returns>
     Task<SandboxModel> GetAsync(string? appId, string? hostName);
 
-    /// <summary>
-    /// Gets sandbox settings without using fallbacks.
-    /// </summary>
-    /// <param name="appId"></param>
-    /// <param name="hostName"></param>
-    /// <returns></returns>
-    Task<SandboxModel?> GetByContextAsync(string? appId, string? hostName);
-
     /// <summary>
     /// Saves a specific sandbox settings for a given application and host context.
     /// </summary>
@@ -42,4 +34,12 @@ public interface ICspSandboxService
     /// <param name="deletedBy"></param>
     /// <returns></returns>
     Task DeleteByContextAsync(string? appId, string? hostName, string? deletedBy);
+
+    /// <summary>
+    /// Determines whether sandbox settings exist for a specific context (appId and hostName) that would override inherited settings.
+    /// </summary>
+    /// <param name="appId"></param>
+    /// <param name="hostName"></param>
+    /// <returns></returns>
+    Task<bool> ExistsForContextAsync(string? appId, string? hostName);
 }
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Settings/CspSettingsController.cs b/src/Stott.Security.Optimizely/Features/Csp/Settings/CspSettingsController.cs
@@ -24,9 +24,9 @@ public async Task<IActionResult> Get(string? appId, string? hostName)
     {
         try
         {
-            var contextData = await service.GetByContextAsync(appId, hostName);
-            var isInherited = contextData == null && (!string.IsNullOrWhiteSpace(appId) || !string.IsNullOrWhiteSpace(hostName));
-            var data = contextData ?? await service.GetAsync(appId, hostName.GetSanitizedHostDomain());
+            var sanitizedHostName = hostName.GetSanitizedHostDomain();
+            var existsForContext = await service.ExistsForContextAsync(appId, sanitizedHostName);
+            var data = await service.GetAsync(appId, sanitizedHostName);
 
             return CreateSuccessJson(new CspSettingsResponseModel
             {
@@ -38,7 +38,7 @@ public async Task<IActionResult> Get(string? appId, string? hostName)
                 UseInternalReporting = data.UseInternalReporting,
                 UseExternalReporting = data.UseExternalReporting,
                 ExternalReportToUrl = data.ExternalReportToUrl ?? string.Empty,
-                IsInherited = isInherited
+                IsInherited = !existsForContext
             });
         }
         catch (Exception exception)
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Settings/Service/CspSettingsService.cs b/src/Stott.Security.Optimizely/Features/Csp/Settings/Service/CspSettingsService.cs
@@ -26,11 +26,6 @@ public async Task<CspSettings> GetAsync(string? appId, string? hostName)
         return settings;
     }
 
-    public async Task<CspSettings?> GetByContextAsync(string? appId, string? hostName)
-    {
-        return await repository.GetByContextAsync(appId, hostName);
-    }
-
     public async Task SaveAsync(ICspSettings? cspSettings, string? modifiedBy, string? appId, string? hostName)
     {
         if (cspSettings is null || string.IsNullOrWhiteSpace(modifiedBy))
@@ -55,6 +50,17 @@ public async Task DeleteByContextAsync(string? appId, string? hostName, string?
         cache.RemoveAll();
     }
 
+    public async Task<bool> ExistsForContextAsync(string? appId, string? hostName)
+    {
+        if (string.IsNullOrWhiteSpace(appId) && string.IsNullOrWhiteSpace(hostName))
+        {
+            return false;
+        }
+
+        var actualSettings = await repository.GetByContextAsync(appId, hostName);
+        return actualSettings is not null;
+    }
+
     private static string GetCacheKey(string? appId, string? hostName)
     {
         return $"{CacheKeyPrefix}.{appId ?? "global"}.{hostName ?? "all"}";
diff --git a/src/Stott.Security.Optimizely/Features/Csp/Settings/Service/ICspSettingsService.cs b/src/Stott.Security.Optimizely/Features/Csp/Settings/Service/ICspSettingsService.cs
@@ -16,15 +16,6 @@ public interface ICspSettingsService
     /// <returns></returns>
     Task<CspSettings> GetAsync(string? appId, string? hostName);
 
-    /// <summary>
-    /// Gets settings based on a specific context (appId and hostName) without falling back to inherited settings.
-    /// Returns null if no settings exist for the specified context.
-    /// </summary>
-    /// <param name="appId"></param>
-    /// <param name="hostName"></param>
-    /// <returns></returns>
-    Task<CspSettings?> GetByContextAsync(string? appId, string? hostName);
-
     /// <summary>
     /// Asynchronously saves the specified Content Security Policy (CSP) settings to the data store.
     /// </summary>
@@ -43,4 +34,12 @@ public interface ICspSettingsService
     /// <param name="deletedBy">The user or process responsible for initiating the deletion. Can be null if not specified.</param>
     /// <returns>A task that represents the asynchronous delete operation.</returns>
     Task DeleteByContextAsync(string? appId, string? hostName, string? deletedBy);
+
+    /// <summary>
+    /// Determines whether content security policy settings exist for a specific context (appId and hostName) that would override inherited settings.
+    /// </summary>
+    /// <param name="appId"></param>
+    /// <param name="hostName"></param>
+    /// <returns></returns>
+    Task<bool> ExistsForContextAsync(string? appId, string? hostName);
 }
diff --git a/src/Stott.Security.Optimizely/Features/CustomHeaders/CustomHeaderController.cs b/src/Stott.Security.Optimizely/Features/CustomHeaders/CustomHeaderController.cs
@@ -66,9 +66,9 @@ public async Task<IActionResult> List(string? headerName, string? behavior, stri
     public async Task<IActionResult> HasOverride(string? appId, string? hostName)
     {
         var sanitizedHost = hostName.GetSanitizedHostDomain();
-        var hasOverride = await service.HasOverrideAsync(appId, sanitizedHost);
+        var existsForContext = await service.ExistsForContextAsync(appId, sanitizedHost);
 
-        return CreateSuccessJson(new { hasOverride, isInherited = !hasOverride });
+        return CreateSuccessJson(new { existsForContext, isInherited = !existsForContext });
     }
 
     /// <summary>
diff --git a/src/Stott.Security.Optimizely/Features/CustomHeaders/Service/CustomHeaderService.cs b/src/Stott.Security.Optimizely/Features/CustomHeaders/Service/CustomHeaderService.cs
@@ -49,11 +49,11 @@ public async Task<IList<HeaderDto>> GetCompiledHeaders(string? appId, string? ho
                 }).ToList();
     }
 
-    public async Task<bool> HasOverrideAsync(string? appId, string? hostName)
+    public async Task<bool> ExistsForContextAsync(string? appId, string? hostName)
     {
         if (string.IsNullOrWhiteSpace(appId) && string.IsNullOrWhiteSpace(hostName))
         {
-            return false;
+            return true;
         }
 
         var headers = await repository.GetAllByContextAsync(appId, hostName);
diff --git a/src/Stott.Security.Optimizely/Features/CustomHeaders/Service/ICustomHeaderService.cs b/src/Stott.Security.Optimizely/Features/CustomHeaders/Service/ICustomHeaderService.cs
@@ -25,7 +25,7 @@ public interface ICustomHeaderService
     /// <summary>
     /// Checks whether the exact context has its own custom header records (override exists).
     /// </summary>
-    Task<bool> HasOverrideAsync(string? appId, string? hostName);
+    Task<bool> ExistsForContextAsync(string? appId, string? hostName);
 
     /// <summary>
     /// Creates an override by copying resolved headers from the parent context to the target context.
diff --git a/src/Stott.Security.Optimizely/Features/PermissionPolicy/PermissionPolicyController.cs b/src/Stott.Security.Optimizely/Features/PermissionPolicy/PermissionPolicyController.cs
@@ -104,10 +104,10 @@ public async Task<IActionResult> DeleteOverride(string? appId, string? hostName)
     public async Task<IActionResult> GetSettings(string? appId, string? hostName)
     {
         var sanitizedHost = hostName.GetSanitizedHostDomain();
-        var hasOverride = await permissionPolicyService.HasOverrideAsync(appId, sanitizedHost);
+        var existsForContext = await permissionPolicyService.ExistsForContextAsync(appId, sanitizedHost);
         var settings = await permissionPolicyService.GetPermissionPolicySettingsAsync(appId, sanitizedHost);
 
-        return CreateSuccessJson(new { isEnabled = settings.IsEnabled, isInherited = !hasOverride });
+        return CreateSuccessJson(new { isEnabled = settings.IsEnabled, isInherited = !existsForContext });
     }
 
     [HttpPost]
diff --git a/src/Stott.Security.Optimizely/Features/PermissionPolicy/Service/IPermissionPolicyService.cs b/src/Stott.Security.Optimizely/Features/PermissionPolicy/Service/IPermissionPolicyService.cs
@@ -18,7 +18,7 @@ public interface IPermissionPolicyService
 
     Task SaveDirectiveAsync(SavePermissionPolicyModel? model, string? modifiedBy, string? appId, string? hostName);
 
-    Task<bool> HasOverrideAsync(string? appId, string? hostName);
+    Task<bool> ExistsForContextAsync(string? appId, string? hostName);
 
     Task CreateOverrideAsync(string? appId, string? hostName, string? modifiedBy);
 
diff --git a/src/Stott.Security.Optimizely/Features/PermissionPolicy/Service/PermissionPolicyService.cs b/src/Stott.Security.Optimizely/Features/PermissionPolicy/Service/PermissionPolicyService.cs
@@ -91,11 +91,11 @@ public async Task SaveDirectiveAsync(SavePermissionPolicyModel? model, string? m
         cache.RemoveAll();
     }
 
-    public async Task<bool> HasOverrideAsync(string? appId, string? hostName)
+    public async Task<bool> ExistsForContextAsync(string? appId, string? hostName)
     {
         if (string.IsNullOrWhiteSpace(appId) && string.IsNullOrWhiteSpace(hostName))
         {
-            return false;
+            return true;
         }
 
         var actualSettings = await repository.GetSettingsByContextAsync(appId, hostName);
diff --git a/src/Stott.Security.Optimizely/Static/index-Cre1Hs6l.js b/src/Stott.Security.Optimizely/Static/index-Cre1Hs6l.js
diff --git a/src/Stott.Security.Ui/src/CSP/EditSettings.jsx b/src/Stott.Security.Ui/src/CSP/EditSettings.jsx
@@ -187,7 +187,7 @@ function EditSettings(props) {
                 </div>
             )}
             <Form>
-                <fieldset disabled={isInherited}>
+                <fieldset disabled={isContextSpecific && isInherited}>
                 <Form.Group className='my-3'>
                     <Form.Check type='switch' label='Enable Content Security Policy (CSP)' checked={isCspEnabled} onChange={handleIsCspEnabledChange} />
                     <div className='form-text'>Enabling the Content Security Policy will apply the header to all requests from both content routes and CMS backend routes.</div>
diff --git a/src/Stott.Security.Ui/src/CSP/SandboxSettings.jsx b/src/Stott.Security.Ui/src/CSP/SandboxSettings.jsx

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,10 @@ public async Task<IActionResult> Get(string? appId, string? hostName)`
`24`	`24`	`{`
`25`	`25`	`try`
`26`	`26`	`{`
`27`		`- var sanitizedHost = hostName.GetSanitizedHostDomain();`
`28`		`- var contextData = await service.GetByContextAsync(appId, sanitizedHost);`
`29`		`- var isInherited = contextData == null && (!string.IsNullOrWhiteSpace(appId) \|\| !string.IsNullOrWhiteSpace(sanitizedHost));`
`30`		`- contextData ??= await service.GetAsync(appId, sanitizedHost);`
`31`		`- var data = CspSandboxMapper.MapToResponse(contextData, isInherited);`
	`27`	`+ var sanitizedHostName = hostName.GetSanitizedHostDomain();`
	`28`	`+ var existsForContext = await service.ExistsForContextAsync(appId, sanitizedHostName);`
	`29`	`+ var contextData = await service.GetAsync(appId, sanitizedHostName);`
	`30`	`+ var data = CspSandboxMapper.MapToResponse(contextData, !existsForContext);`
`32`	`31`
`33`	`32`	`return CreateSuccessJson(data);`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ public async Task<IActionResult> Get(string? appId, string? hostName)`
`24`	`24`	`{`
`25`	`25`	`try`
`26`	`26`	`{`
`27`		`- var contextData = await service.GetByContextAsync(appId, hostName);`
`28`		`- var isInherited = contextData == null && (!string.IsNullOrWhiteSpace(appId) \|\| !string.IsNullOrWhiteSpace(hostName));`
`29`		`- var data = contextData ?? await service.GetAsync(appId, hostName.GetSanitizedHostDomain());`
	`27`	`+ var sanitizedHostName = hostName.GetSanitizedHostDomain();`
	`28`	`+ var existsForContext = await service.ExistsForContextAsync(appId, sanitizedHostName);`
	`29`	`+ var data = await service.GetAsync(appId, sanitizedHostName);`
`30`	`30`
`31`	`31`	`return CreateSuccessJson(new CspSettingsResponseModel`
`32`	`32`	`{`
`@@ -38,7 +38,7 @@ public async Task<IActionResult> Get(string? appId, string? hostName)`
`38`	`38`	`UseInternalReporting = data.UseInternalReporting,`
`39`	`39`	`UseExternalReporting = data.UseExternalReporting,`
`40`	`40`	`ExternalReportToUrl = data.ExternalReportToUrl ?? string.Empty,`
`41`		`- IsInherited = isInherited`
	`41`	`+ IsInherited = !existsForContext`
`42`	`42`	`});`
`43`	`43`	`}`
`44`	`44`	`catch (Exception exception)`