Sonar Cloud issues

Author: MWClayson-NHS

application/CohortManager/src/Functions/Shared/Common/Authentication/CIS2AuthMiddleware.cs

@@ -57,7 +57,7 @@ public async Task Invoke(FunctionContext context, FunctionExecutionDelegate next
 
     private async Task HandleUnauthorizedAsync(FunctionContext context, HttpRequestData request, string logMessage, string responseMessage)
     {
-        _logger.LogWarning(logMessage);
+        _logger.LogWarning("Authentication Error: {LogMessage}", logMessage);
         var response = await _createResponse.CreateHttpResponseWithBodyAsync(HttpStatusCode.Unauthorized, request, responseMessage);
         context.GetInvocationResult().Value = response;
     }

application/CohortManager/src/Functions/Shared/Common/Authentication/Cis2User.cs

@@ -6,46 +6,46 @@ namespace Common;
 public class Cis2User
 {
     [JsonPropertyName("nhsid_useruid")]
-    public string NhsidUseruid { get; set; }
+    public required string NhsidUseruid { get; set; }
 
     [JsonPropertyName("name")]
-    public string Name { get; set; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("nhsid_nrbac_roles")]
-    public List<NhsidNrbacRole> NhsidNrbacRoles { get; set; }
+    public required List<NhsidNrbacRole> NhsidNrbacRoles { get; set; }
 
     [JsonPropertyName("given_name")]
-    public string GivenName { get; set; }
+    public required string GivenName { get; set; }
 
     [JsonPropertyName("family_name")]
-    public string FamilyName { get; set; }
+    public required string FamilyName { get; set; }
 
     [JsonPropertyName("uid")]
-    public string Uid { get; set; }
+    public required string Uid { get; set; }
 
     [JsonPropertyName("sub")]
-    public string Sub { get; set; }
+    public required string Sub { get; set; }
 }
 public class NhsidNrbacRole
 {
     [JsonPropertyName("person_orgid")]
-    public string PersonOrgid { get; set; }
+    public required string PersonOrgid { get; set; }
 
     [JsonPropertyName("person_roleid")]
-    public string PersonRoleid { get; set; }
+    public required string PersonRoleid { get; set; }
 
     [JsonPropertyName("org_code")]
-    public string OrgCode { get; set; }
+    public required string OrgCode { get; set; }
 
     [JsonPropertyName("role_name")]
-    public string RoleName { get; set; }
+    public required string RoleName { get; set; }
 
     [JsonPropertyName("role_code")]
-    public string RoleCode { get; set; }
+    public required string RoleCode { get; set; }
 
     [JsonPropertyName("workgroups")]
-    public List<string> Workgroups { get; set; }
+    public required List<string> Workgroups { get; set; }
 
     [JsonPropertyName("workgroups_codes")]
-    public List<string> WorkgroupsCodes { get; set; }
+    public required List<string> WorkgroupsCodes { get; set; }
 }

application/CohortManager/src/Functions/Shared/Common/Authentication/Cis2UserService.cs

@@ -1,15 +1,16 @@
 namespace Common;
 
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Hl7.FhirPath.Sprache;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 public class Cis2UserService : ICis2UserService
 {
-    ILogger<Cis2UserService> _logger;
-    IHttpClientFunction _httpClient;
-    AuthConfig _authConfig;
+    private readonly ILogger<Cis2UserService> _logger;
+    private readonly IHttpClientFunction _httpClient;
+    private readonly AuthConfig _authConfig;
 
     public Cis2UserService(ILogger<Cis2UserService> logger, IHttpClientFunction httpClient, IOptions<AuthConfig> authConfig)
     {

application/CohortManager/src/Functions/Shared/Common/Authentication/RoleManager.cs

@@ -1,12 +1,13 @@
 namespace Common;
 
+using System.Runtime.CompilerServices;
 using Microsoft.Extensions.Options;
 
 public class RoleManager : IRoleManager
 {
     private readonly Dictionary<string, Role> _roleMappings;
+    private readonly IOptions<RoleConfig> _roleConfig;
 
-    IOptions<RoleConfig> _roleConfig;
     public RoleManager(IOptions<RoleConfig> roleConfig)
     {
         _roleConfig = roleConfig;
@@ -18,7 +19,6 @@ public RoleManager(IOptions<RoleConfig> roleConfig)
     }
     public bool ValidateRole(Cis2User user, Role role)
     {
-
         var workgroupId = _roleMappings.FirstOrDefault(x => x.Value == role).Key;
 
         if (workgroupId == null)