Code clean-up

Test/Altinn.Broker.Tests/FileControllerTests.cs

@@ -9,6 +9,8 @@
 
 using Microsoft.AspNetCore.Mvc.Testing;
 
+using Xunit;
+
 namespace Altinn.Broker.Tests;
 public class FileControllerTests : IClassFixture<WebApplicationFactory<Program>>
 {

src/Altinn.Broker.Integrations/Azure/AzureResourceManager.cs

@@ -21,14 +21,14 @@ namespace Altinn.Broker.Integrations.Azure;
 public class AzureResourceManager : IResourceManager
 {
     private readonly AzureResourceManagerOptions _resourceManagerOptions;
-    private readonly IHostingEnvironment _hostingEnvironment;
+    private readonly IHostEnvironment _hostingEnvironment;
     private readonly ArmClient _armClient;
     private readonly IServiceOwnerRepository _serviceOwnerRepository;
     private readonly ILogger<AzureResourceManager> _logger;
     public string GetResourceGroupName(ServiceOwnerEntity serviceOwnerEntity) => $"serviceowner-{_resourceManagerOptions.Environment}-{serviceOwnerEntity.Id.Replace(":", "-")}-rg";
     public string GetStorageAccountName(ServiceOwnerEntity serviceOwnerEntity) => $"ai{_resourceManagerOptions.Environment.ToLowerInvariant()}{serviceOwnerEntity.Id.Replace(":", "")}sa";
 
-    public AzureResourceManager(IOptions<AzureResourceManagerOptions> resourceManagerOptions, IHostingEnvironment hostingEnvironment, IServiceOwnerRepository serviceOwnerRepository, ILogger<AzureResourceManager> logger)
+    public AzureResourceManager(IOptions<AzureResourceManagerOptions> resourceManagerOptions, IHostEnvironment hostingEnvironment, IServiceOwnerRepository serviceOwnerRepository, ILogger<AzureResourceManager> logger)
     {
         _resourceManagerOptions = resourceManagerOptions.Value;
         _hostingEnvironment = hostingEnvironment;
@@ -105,6 +105,7 @@ public async Task<DeploymentStatus> GetDeploymentStatus(ServiceOwnerEntity servi
 
     public async Task<string> GetStorageConnectionString(ServiceOwnerEntity serviceOwnerEntity)
     {
+        _logger.LogInformation($"Retrieving connection string for {serviceOwnerEntity.Name}");
         var resourceGroupName = GetResourceGroupName(serviceOwnerEntity);
         var storageAccountName = GetStorageAccountName(serviceOwnerEntity);
         var subscription = await _armClient.GetDefaultSubscriptionAsync();
@@ -131,6 +132,6 @@ public async Task<string> GetStorageConnectionString(ServiceOwnerEntity serviceO
         sasBuilder.SetPermissions(BlobSasPermissions.Read | BlobSasPermissions.Create | BlobSasPermissions.List | BlobSasPermissions.Write);
         string sasToken = sasBuilder.ToSasQueryParameters(credential).ToString();
 
-        return $"{serviceClient.Uri}{sasBuilder.BlobContainerName}?{sasToken}";
+        return $"BlobEndpoint={serviceClient.Uri}{sasBuilder.BlobContainerName}?{sasToken}";
     }
 }

src/Altinn.Broker/Controllers/FileController.cs

@@ -213,7 +213,11 @@ public async Task<ActionResult<List<Guid>>> GetFiles([FromQuery] FileStatus? sta
         [Route("{fileId}/download")]
         public async Task<ActionResult<Stream>> DownloadFile(Guid fileId)
         {
-            var caller = AuthenticationSimulator.GetCallerFromTestToken(HttpContext) ?? "politiet";
+            var caller = AuthenticationSimulator.GetCallerFromTestToken(HttpContext);
+            if (string.IsNullOrWhiteSpace(caller))
+            {
+                return Unauthorized();
+            }
             var serviceOwner = await _serviceOwnerRepository.GetServiceOwner(caller);
             if (serviceOwner is not null)
             {

src/Altinn.Broker/Controllers/HealthController.cs

@@ -52,7 +52,7 @@ public async Task<ActionResult> HealthCheckAsync()
             var resourceGroupCount = resourceGroupCollection.Count();
             if (resourceGroupCount < 1)
             {
-                return BadRequest("Resource groups not found under subscription with id : {_azureResourceManagerOptions.SubscriptionId}. Are the service principal environment variables set?");
+                return BadRequest($"Resource groups not found under subscription with id: {subscription.Id}. Are the service principal environment variables set?");
             }
             await resourceGroupCollection.GetAsync($"altinn-{_azureResourceManagerOptions.Environment}-broker-rg");
 

src/Altinn.Broker/Mappers/FileStatusOverviewExtMapper.cs

@@ -1,4 +1,6 @@
-using Altinn.Broker.Core.Domain;
+using System.ComponentModel;
+
+using Altinn.Broker.Core.Domain;
 using Altinn.Broker.Core.Domain.Enums;
 using Altinn.Broker.Core.Models;
 using Altinn.Broker.Enums;
@@ -20,7 +22,7 @@ public static FileOverviewExt MapToExternalModel(FileEntity file)
             FileStatusChanged = file.FileStatusChanged,
             FileStatusText = MapToFileStatusText(file.FileStatus),
             PropertyList = file.PropertyList,
-            Recipients = MapToRecipients(file.ActorEvents, file.Sender, file.ServiceOwnerId),
+            Recipients = MapToRecipients(file.ActorEvents, file.Sender),
             SendersFileReference = file.SendersFileReference
         };
     }
@@ -36,7 +38,8 @@ public static FileStatusExt MapToExternalEnum(FileStatus domainEnum)
             FileStatus.Cancelled => FileStatusExt.Cancelled,
             FileStatus.AllConfirmedDownloaded => FileStatusExt.AllConfirmedDownloaded,
             FileStatus.Deleted => FileStatusExt.Deleted,
-            FileStatus.Failed => FileStatusExt.Failed
+            FileStatus.Failed => FileStatusExt.Failed,
+            _ => throw new InvalidEnumArgumentException()
         };
     }
 
@@ -51,7 +54,8 @@ public static string MapToFileStatusText(FileStatus domainEnum)
             FileStatus.Cancelled => "File cancelled",
             FileStatus.AllConfirmedDownloaded => "All downloaded",
             FileStatus.Deleted => "File has been deleted",
-            FileStatus.Failed => "Upload failed"
+            FileStatus.Failed => "Upload failed",
+            _ => throw new InvalidEnumArgumentException()
         };
     }
 
@@ -62,7 +66,7 @@ public static string MapToFileStatusText(FileStatus domainEnum)
         FileStatusText = MapToFileStatusText(entity.Status)
     }).ToList();
 
-    public static List<RecipientFileStatusDetailsExt> MapToRecipients(List<ActorFileStatusEntity> actorEvents, string sender, string applicationId)
+    public static List<RecipientFileStatusDetailsExt> MapToRecipients(List<ActorFileStatusEntity> actorEvents, string sender)
     {
         var recipientEvents = actorEvents.Where(actorEvent => actorEvent.Actor.ActorExternalId != sender);
         var lastStatusForEveryRecipient = recipientEvents
@@ -85,7 +89,8 @@ private static RecipientFileStatusExt MapToExternalRecipientStatus(ActorFileStat
         {
             ActorFileStatus.Initialized => RecipientFileStatusExt.Initialized,
             ActorFileStatus.DownloadStarted => RecipientFileStatusExt.DownloadStarted,
-            ActorFileStatus.DownloadConfirmed => RecipientFileStatusExt.DownloadConfirmed
+            ActorFileStatus.DownloadConfirmed => RecipientFileStatusExt.DownloadConfirmed,
+            _ => throw new InvalidEnumArgumentException()
         };
     }
 
@@ -95,7 +100,8 @@ private static string MapToRecipientStatusText(ActorFileStatus actorFileStatus)
         {
             ActorFileStatus.Initialized => "Initialized",
             ActorFileStatus.DownloadStarted => "Recipient has attempted to download file",
-            ActorFileStatus.DownloadConfirmed => "Recipient has downloaded file"
+            ActorFileStatus.DownloadConfirmed => "Recipient has downloaded file",
+            _ => throw new InvalidEnumArgumentException()
         };
 
     }