Fixing Issues & Security Hotspots from SonarQube (#85)

Author: Grabauskas

src/OneGround.ZGW.Autorisaties.Common/BusinessRules/ApplicatieBusinessRuleService.cs

@@ -56,7 +56,7 @@ public async Task<bool> ValidateUpdateAsync(
     }
 
     //ac-001
-    private async Task ValidateClientIdsUniquenessAsync(Applicatie applicatie, List<ValidationError> errors, Guid existingId = new Guid())
+    private async Task ValidateClientIdsUniquenessAsync(Applicatie applicatie, List<ValidationError> errors, Guid existingId = default)
     {
         var uniqueClientIds = applicatie.ClientIds.Select(c => c.ClientId.ToLower()).Distinct().ToList();
         var duplicateClientIdApplicatie = await _context.Applicaties.FirstOrDefaultAsync(a =>
@@ -192,18 +192,19 @@ private static void ValidateBrcComponentRules(
         bool checkComponentUrl = true
     )
     {
-        if (applicatieAutorisatie.Scopes.Any(s => s.StartsWith("besluiten.")))
+        if (
+            applicatieAutorisatie.Scopes.Any(s => s.StartsWith("besluiten."))
+            && checkComponentUrl
+            && string.IsNullOrEmpty(applicatieAutorisatie.BesluitType)
+        )
         {
-            if (checkComponentUrl && string.IsNullOrEmpty(applicatieAutorisatie.BesluitType))
-            {
-                validationErrors.Add(
-                    new ValidationError(
-                        $"autorisaties.{index}.besluittype",
-                        ErrorCode.Required,
-                        $"This field is required if `component` is {applicatieAutorisatie.Component}"
-                    )
-                );
-            }
+            validationErrors.Add(
+                new ValidationError(
+                    $"autorisaties.{index}.besluittype",
+                    ErrorCode.Required,
+                    $"This field is required if `component` is {applicatieAutorisatie.Component}"
+                )
+            );
         }
     }
 

src/OneGround.ZGW.Besluiten.Web/Handlers/v1/CreateBesluitCommandHandler.cs

@@ -130,7 +130,7 @@ public async Task<CommandResult<Besluit>> Handle(CreateBesluitCommand request, C
             if (!zaakBesluit.Success)
             {
                 _logger.LogError(
-                    "Could not add zaak-besluit to ZRC. Zaak url={zaak}; Besluit={besluit.Url}. Status={status}. Error={detail}.",
+                    "Could not add zaak-besluit to ZRC. Zaak url={zaak}; Besluit={besluit}. Status={status}. Error={detail}.",
                     besluit.Zaak,
                     besluit.Url,
                     zaakBesluit.Error.Status,

src/OneGround.ZGW.Catalogi.ServiceAgent/v1/3/CatalogiServiceAgent.cs

@@ -49,19 +49,19 @@ public Task<ServiceAgentResponse<CatalogusResponseDto>> GetCatalogusAsync(string
     }
 
     public Task<ServiceAgentResponse<PagedResponse<CatalogusResponseDto>>> GetCatalogussenAsync(
-        Contracts.v1.Queries.GetAllCatalogussenQueryParameters queryParameters,
+        Contracts.v1.Queries.GetAllCatalogussenQueryParameters parameters,
         int page = 1
     )
     {
-        return GetPagedResponseAsync<CatalogusResponseDto>("/catalogussen", queryParameters, page);
+        return GetPagedResponseAsync<CatalogusResponseDto>("/catalogussen", parameters, page);
     }
 
     public Task<ServiceAgentResponse<PagedResponse<ZaakTypeResponseDto>>> GetZaakTypenAsync(
-        Contracts.v1.Queries.GetAllZaakTypenQueryParameters queryParameters,
+        Contracts.v1.Queries.GetAllZaakTypenQueryParameters parameters,
         int page = 1
     )
     {
-        return GetPagedResponseAsync<ZaakTypeResponseDto>("/zaaktypen", queryParameters, page);
+        return GetPagedResponseAsync<ZaakTypeResponseDto>("/zaaktypen", parameters, page);
     }
 
     public Task<ServiceAgentResponse<ZaakTypeResponseDto>> GetZaakTypeByUrlAsync(string zaakTypeUrl)

src/OneGround.ZGW.Catalogi.ServiceAgent/v1/CatalogiServiceAgent.cs

@@ -33,12 +33,9 @@ public async Task<ServiceAgentResponse<CatalogusResponseDto>> GetCatalogusAsync(
         return await GetAsync<CatalogusResponseDto>(new Uri(catalogusUrl));
     }
 
-    public Task<ServiceAgentResponse<PagedResponse<ZaakTypeResponseDto>>> GetZaakTypenAsync(
-        GetAllZaakTypenQueryParameters queryParameters,
-        int page = 1
-    )
+    public Task<ServiceAgentResponse<PagedResponse<ZaakTypeResponseDto>>> GetZaakTypenAsync(GetAllZaakTypenQueryParameters parameters, int page = 1)
     {
-        return GetPagedResponseAsync<ZaakTypeResponseDto>("/zaaktypen", queryParameters, page);
+        return GetPagedResponseAsync<ZaakTypeResponseDto>("/zaaktypen", parameters, page);
     }
 
     public async Task<ServiceAgentResponse<ZaakTypeResponseDto>> GetZaakTypeByUrlAsync(string zaakTypeUrl)

src/OneGround.ZGW.Catalogi.Web/Handlers/v1/3/Extensions/StatusTypeExensionMethods.cs

@@ -17,8 +17,8 @@ public static bool CanBeUpdated(this StatusType statustype, StatusType other)
             && statustype.VolgNummer == other.VolgNummer
             && statustype.IsEindStatus == other.IsEindStatus
             && statustype.Informeren == other.Informeren
-            && statustype.Doorlooptijd == statustype.Doorlooptijd
-            && statustype.StatusTekst == statustype.StatusTekst
-            && statustype.Toelichting == statustype.Toelichting;
+            && statustype.Doorlooptijd == other.Doorlooptijd
+            && statustype.StatusTekst == other.StatusTekst
+            && statustype.Toelichting == other.Toelichting;
     }
 }

src/OneGround.ZGW.Common.ServiceAgent/ZGWServiceAgent.cs

@@ -181,7 +181,7 @@ private void LogUnsuccessfulResponse(HttpResponseMessage response)
             {
                 if (response.Headers.WwwAuthenticate.Count > 0)
                 {
-                    Logger.LogError("Request unauthorized. WWW-Authenticate: {response.Headers.WwwAuthenticate}", response.Headers.WwwAuthenticate);
+                    Logger.LogError("Request unauthorized. WWW-Authenticate: {WwwAuthenticate}", response.Headers.WwwAuthenticate);
                 }
             }
         }