Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

Fix/sonarcloud issues #1009

Merged
merged 6 commits into from
May 25, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public interface IDiagnosisRepository
{

Task<DiagnosisModel[]> GetNotApprovedAsync();
Task<DiagnosisModel> GetAsync(string SubmissionNumber, string UserUuid);
Task<DiagnosisModel> GetAsync(string submissionNumber, string sserUuid);
cocoa-dev001 marked this conversation as resolved.
Show resolved Hide resolved

Task<DiagnosisModel> SubmitDiagnosisAsync(string SubmissionNumber, DateTimeOffset timestamp, string UserUuid, TemporaryExposureKeyModel[] Keys);
Task<DiagnosisModel> SubmitDiagnosisAsync(string submissionNumber, DateTimeOffset timestamp, string userUuid, TemporaryExposureKeyModel[] Keys);

Task DeleteAsync(IUser user);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public ValidationServerService(IConfiguration config, ILogger<ValidationServerSe

public IValidationServerService.ValidateResult Validate(HttpRequest req)
{
Logger.LogInformation($"{nameof(ValidationServerService)}#{nameof(Validate)}");
if (AzureFrontDoorRestrictionEnabled)
{
if (!req.Headers.ContainsKey("X-Azure-FDID"))
Expand Down
2 changes: 0 additions & 2 deletions src/Covid19Radar.Api/DiagnosisApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ namespace Covid19Radar.Api
{
public class DiagnosisApi
{
private readonly IDiagnosisRepository DiagnosisRepository;
private readonly ITemporaryExposureKeyRepository TekRepository;
private readonly IDeviceValidationService DeviceCheck;
private readonly IVerificationService VerificationService;
Expand All @@ -39,7 +38,6 @@ public DiagnosisApi(
IValidationServerService validationServerService,
ILogger<DiagnosisApi> logger)
{
DiagnosisRepository = diagnosisRepository;
TekRepository = tekRepository;
DeviceCheck = deviceCheck;
Logger = logger;
Expand Down
19 changes: 8 additions & 11 deletions src/Covid19Radar.Api/Services/CustomVerificationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

using Covid19Radar.Api.DataAccess;
using Covid19Radar.Api.DataStore;
using Microsoft.Azure.Cosmos;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
Expand All @@ -18,7 +16,6 @@ namespace Covid19Radar.Api.Services
{
public class CustomVerificationService : IVerificationService
{
private readonly IConfiguration Config;
private readonly ICustomVerificationStatusRepository CustomVerification;
private readonly ILogger<CustomVerificationService> Logger;
private readonly X509Certificate2 Cert;
Expand All @@ -29,10 +26,9 @@ public class CustomVerificationService : IVerificationService
private readonly string VerificationPayloadParameterName;

public CustomVerificationService(IConfiguration config,
ICustomVerificationStatusRepository customVerification,
ICustomVerificationStatusRepository customVerification,
ILogger<CustomVerificationService> logger)
{
Config = config;
CustomVerification = customVerification;
Logger = logger;
var cert = config.VerificationPayloadPfx();
Expand All @@ -50,18 +46,19 @@ public CustomVerificationService(IConfiguration config,
VerificationPayloadParameterName = config.VerificationPayloadParameterName();
// option api secret for api management
ApiSecret = config.VerificationPayloadApiSecret();
if (!string.IsNullOrWhiteSpace(ApiSecret)) {
if (!string.IsNullOrWhiteSpace(ApiSecret))
{
Client.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", ApiSecret);
}
}

public async Task<int> VerificationAsync(string verificationPayload)
public async Task<int> VerificationAsync(string payload)
{
Logger.LogInformation($"start {nameof(VerificationAsync)}");
var payload = $@"{{
""{VerificationPayloadParameterName}"": ""{verificationPayload}""
}}";
var content = new StringContent(payload);

var content = new StringContent($@"{{
""{VerificationPayloadParameterName}"": ""{payload}""
}}");
var response = await Client.PostAsync(Url, content);
if (!response.IsSuccessStatusCode) return 503;

Expand Down
2 changes: 0 additions & 2 deletions src/Covid19Radar.Api/TemporaryExposureKeysApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ namespace Covid19Radar.Api
public class TemporaryExposureKeysApi
{
private readonly ITemporaryExposureKeyExportRepository TekExport;
private readonly ILogger<TemporaryExposureKeysApi> Logger;
private readonly string ExportKeyUrl;
private readonly string TekExportBlobStorageContainerPrefix;
private readonly IValidationServerService ValidationServerService;
Expand All @@ -32,7 +31,6 @@ public TemporaryExposureKeysApi(
ILogger<TemporaryExposureKeysApi> logger
)
{
Logger = logger;
TekExport = tekExportRepository;
ExportKeyUrl = config.ExportKeyUrl();
TekExportBlobStorageContainerPrefix = config.TekExportBlobStorageContainerPrefix();
Expand Down
3 changes: 0 additions & 3 deletions src/Covid19Radar.Api/V2DiagnosisApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ namespace Covid19Radar.Api
public class V2DiagnosisApi
{
private const string CHAFF_HEADER = "X-Chaff";

private readonly IDiagnosisRepository DiagnosisRepository;
private readonly ITemporaryExposureKeyRepository TekRepository;
private readonly IDeviceValidationService DeviceCheck;
private readonly IVerificationService VerificationService;
Expand All @@ -41,7 +39,6 @@ public V2DiagnosisApi(
IValidationServerService validationServerService,
ILogger<V2DiagnosisApi> logger)
{
DiagnosisRepository = diagnosisRepository;
TekRepository = tekRepository;
DeviceCheck = deviceCheck;
Logger = logger;
Expand Down