Sonar qube

Author: MWClayson-NHS

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

@@ -46,8 +46,15 @@ public async Task Invoke(FunctionContext context, FunctionExecutionDelegate next
         }
 
         var req = await context.GetHttpRequestDataAsync();
+
+        if(req == null)
+        {
+            throw new InvalidOperationException("HttpRequestData is required for permissions check but was not found in the context.");
+        }
+
         var user = (Cis2User)context.Items["Cis2User"]!;
-        if (requiredRoles.Length == 0 || requiredRoles.Any(role => _roleManager.ValidateRole(user, role)))
+
+        if (requiredRoles.Any(role => _roleManager.ValidateRole(user, role)))
         {
             await next(context);
             return;

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

@@ -6,15 +6,14 @@ namespace Common;
 public class RoleManager : IRoleManager
 {
     private readonly Dictionary<string, Role> _roleMappings;
-    private readonly IOptions<RoleConfig> _roleConfig;
+
 
     public RoleManager(IOptions<RoleConfig> roleConfig)
     {
-        _roleConfig = roleConfig;
         _roleMappings = new Dictionary<string, Role>
         {
-            { _roleConfig.Value.CohortManagerUserWorkgroupId, Role.CohortManagerUser },
-            { _roleConfig.Value.CohortManagerDummyGpRemovalWorkgroupId, Role.CohortManagerDummyGpRemoval }
+            { roleConfig.Value.CohortManagerUserWorkgroupId, Role.CohortManagerUser },
+            { roleConfig.Value.CohortManagerDummyGpRemovalWorkgroupId, Role.CohortManagerDummyGpRemoval }
         };
     }
     public bool ValidateRole(Cis2User user, Role role)
@@ -25,7 +24,7 @@ public bool ValidateRole(Cis2User user, Role role)
         {
             return false;
         }
-        return user.NhsidNrbacRoles.Count(x => x.WorkgroupsCodes.Contains(workgroupId)) > 0;
+        return user.NhsidNrbacRoles.Any(x => x.WorkgroupsCodes.Contains(workgroupId));
     }
 
 }