Merge branch 'main' into feat/resourcesubject-mappings-sync

digdir · Sep 4, 2024 · 17d6544 · 17d6544
2 parents 31d110c + dce6e56
commit 17d6544
Show file tree

Hide file tree

Showing 37 changed files with 1,958 additions and 164 deletions.
diff --git a/.azure/applications/graphql/main.bicep b/.azure/applications/graphql/main.bicep
@@ -16,6 +16,9 @@ param location string
 @minLength(3)
 param apimIp string
 
+@description('CPU and memory resources for the container app')
+param resources object?
+
 @description('The name of the container app environment')
 @minLength(3)
 @secure()
@@ -83,6 +86,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     containerAppEnvId: containerAppEnvironment.id
     apimIp: apimIp
     tags: tags
+    resources: resources
   }
 }
 

diff --git a/.azure/applications/web-api-eu/main.bicep b/.azure/applications/web-api-eu/main.bicep
@@ -16,6 +16,9 @@ param location string
 @minLength(3)
 param apimIp string
 
+@description('CPU and memory resources for the container app')
+param resources object?
+
 @description('The name of the container app environment')
 @minLength(3)
 @secure()
@@ -86,6 +89,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     containerAppEnvId: containerAppEnvironment.id
     apimIp: apimIp
     tags: tags
+    resources: resources
   }
 }
 

diff --git a/.azure/applications/web-api-so/main.bicep b/.azure/applications/web-api-so/main.bicep
@@ -16,6 +16,9 @@ param location string
 @minLength(3)
 param apimIp string
 
+@description('CPU and memory resources for the container app')
+param resources object?
+
 @description('The name of the container app environment')
 @minLength(3)
 @secure()
@@ -90,6 +93,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     containerAppEnvId: containerAppEnvironment.id
     apimIp: apimIp
     tags: tags
+    resources: resources
   }
 }
 

diff --git a/.azure/modules/containerApp/main.bicep b/.azure/modules/containerApp/main.bicep
@@ -22,6 +22,9 @@ param containerAppEnvId string
 @description('The tags to be applied to the container app')
 param tags object
 
+@description('CPU and memory resources for the container app')
+param resources object?
+
 var probes = [
   {
     periodSeconds: 5
@@ -82,6 +85,7 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
           image: image
           env: envVariables
           probes: probes
+          resources: resources
         }
       ]
     }

diff --git a/.github/workflows/action-delete-deployments.yml b/.github/workflows/action-delete-deployments.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Delete Previous deployments
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       env:
         GITHUB_SHA_HEAD: ${{ github.event.pull_request.head.sha }}
       with:

diff --git a/src/Digdir.Domain.Dialogporten.Application/Common/Authorization/Constants.cs b/src/Digdir.Domain.Dialogporten.Application/Common/Authorization/Constants.cs
@@ -8,4 +8,5 @@ public static class Constants
     public static readonly Uri UnauthorizedUri = new("urn:dialogporten:unauthorized");
     public const string CorrespondenceScope = "digdir:dialogporten.correspondence";
     public const string ServiceOwnerAdminScope = "digdir:dialogporten.serviceprovider.admin";
+    public const string LegacyHtmlScope = "digdir:dialogporten.serviceprovider.legacyhtml";
 }
diff --git a/...Domain.Dialogporten.Application/Features/V1/Common/Actors/ActorValidationErrorMessages.cs b/...Domain.Dialogporten.Application/Features/V1/Common/Actors/ActorValidationErrorMessages.cs
@@ -0,0 +1,7 @@
+namespace Digdir.Domain.Dialogporten.Application.Features.V1.Common.Actors;
+
+public static class ActorValidationErrorMessages
+{
+    public const string ActorIdActorNameExclusiveOr = "If 'ActorType' is 'ServiceOwner', both 'ActorId' and 'ActorName' must be null. " +
+                                                      "For any other value of 'ActorType', 'ActorId' or 'ActorName' must be set, but not both simultaneously.";
+}
diff --git a/...ir.Domain.Dialogporten.Application/Features/V1/Common/Content/ContentValueDtoValidator.cs b/...ir.Domain.Dialogporten.Application/Features/V1/Common/Content/ContentValueDtoValidator.cs
@@ -1,4 +1,7 @@
+using Digdir.Domain.Dialogporten.Application.Common.Authorization;
+using Digdir.Domain.Dialogporten.Application.Common.Extensions;
 using Digdir.Domain.Dialogporten.Application.Common.Extensions.FluentValidation;
+using Digdir.Domain.Dialogporten.Application.Externals.Presentation;
 using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Localizations;
 using Digdir.Domain.Dialogporten.Domain;
 using Digdir.Domain.Dialogporten.Domain.Dialogs.Entities.Contents;
@@ -14,19 +17,19 @@ internal interface IIgnoreOnAssemblyScan;
 
 internal sealed class ContentValueDtoValidator : AbstractValidator<ContentValueDto>, IIgnoreOnAssemblyScan
 {
+    private const string LegacyHtmlMediaType = "text/html";
+
     public ContentValueDtoValidator(DialogTransmissionContentType contentType)
     {
         RuleFor(x => x.MediaType)
             .NotEmpty()
             .Must(value => value is not null && contentType.AllowedMediaTypes.Contains(value))
             .WithMessage($"{{PropertyName}} '{{PropertyValue}}' is not allowed for content type {contentType.Name}. " +
                          $"Allowed media types are {string.Join(", ", contentType.AllowedMediaTypes.Select(x => $"'{x}'"))}");
-        RuleForEach(x => x.Value)
-            .ContainsValidHtml()
-            .When(x => x.MediaType is not null and MediaTypes.Html);
+
         RuleForEach(x => x.Value)
             .ContainsValidMarkdown()
-            .When(x => x.MediaType is not null and MediaTypes.Markdown);
+            .When(x => x.MediaType is MediaTypes.Markdown);
         RuleForEach(x => x.Value)
             .Must(x => Uri.TryCreate(x.Value, UriKind.Absolute, out var uri) && uri.Scheme == Uri.UriSchemeHttps)
             .When(x => x.MediaType is not null && x.MediaType.StartsWith(MediaTypes.EmbeddablePrefix, StringComparison.InvariantCultureIgnoreCase))
@@ -36,19 +39,20 @@ public ContentValueDtoValidator(DialogTransmissionContentType contentType)
             .SetValidator(_ => new LocalizationDtosValidator(contentType.MaxLength));
     }
 
-    public ContentValueDtoValidator(DialogContentType contentType)
+    public ContentValueDtoValidator(DialogContentType contentType, IUser? user = null)
     {
+        var allowedMediaTypes = GetAllowedMediaTypes(contentType, user);
         RuleFor(x => x.MediaType)
             .NotEmpty()
-            .Must(value => value is not null && contentType.AllowedMediaTypes.Contains(value))
+            .Must(value => value is not null && allowedMediaTypes.Contains(value))
             .WithMessage($"{{PropertyName}} '{{PropertyValue}}' is not allowed for content type {contentType.Name}. " +
-                         $"Allowed media types are {string.Join(", ", contentType.AllowedMediaTypes.Select(x => $"'{x}'"))}");
+                         $"Allowed media types are {string.Join(", ", allowedMediaTypes.Select(x => $"'{x}'"))}");
         RuleForEach(x => x.Value)
             .ContainsValidHtml()
-            .When(x => x.MediaType is not null and MediaTypes.Html);
+            .When(x => x.MediaType.Equals(LegacyHtmlMediaType, StringComparison.OrdinalIgnoreCase));
         RuleForEach(x => x.Value)
             .ContainsValidMarkdown()
-            .When(x => x.MediaType is not null and MediaTypes.Markdown);
+            .When(x => x.MediaType is MediaTypes.Markdown);
         RuleForEach(x => x.Value)
             .Must(x => Uri.TryCreate(x.Value, UriKind.Absolute, out var uri) && uri.Scheme == Uri.UriSchemeHttps)
             .When(x => x.MediaType is not null && x.MediaType.StartsWith(MediaTypes.EmbeddablePrefix, StringComparison.InvariantCultureIgnoreCase))
@@ -57,4 +61,18 @@ public ContentValueDtoValidator(DialogContentType contentType)
             .NotEmpty()
             .SetValidator(_ => new LocalizationDtosValidator(contentType.MaxLength));
     }
+
+    private static string[] GetAllowedMediaTypes(DialogContentType contentType, IUser? user)
+    {
+        if (user == null)
+        {
+            return contentType.AllowedMediaTypes;
+        }
+
+        var allowHtmlSupport = user.GetPrincipal().HasScope(Constants.LegacyHtmlScope);
+
+        return allowHtmlSupport
+            ? contentType.AllowedMediaTypes.Append(LegacyHtmlMediaType).ToArray()
+            : contentType.AllowedMediaTypes;
+    }
 }
diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs
@@ -1,7 +1,8 @@
 using System.Reflection;
 using Digdir.Domain.Dialogporten.Application.Common.Extensions.Enumerables;
 using Digdir.Domain.Dialogporten.Application.Common.Extensions.FluentValidation;
-using Digdir.Domain.Dialogporten.Application.Features.V1.Common;
+using Digdir.Domain.Dialogporten.Application.Externals.Presentation;
+using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Actors;
 using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Content;
 using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Localizations;
 using Digdir.Domain.Dialogporten.Domain.Actors;
@@ -168,7 +169,7 @@ internal sealed class CreateDialogContentDtoValidator : AbstractValidator<Create
         })
         .ToDictionary(x => x.Property.Name, StringComparer.InvariantCultureIgnoreCase);
 
-    public CreateDialogContentDtoValidator()
+    public CreateDialogContentDtoValidator(IUser? user)
     {
         foreach (var (propertyName, propMetadata) in SourcePropertyMetaDataByName)
         {
@@ -179,12 +180,12 @@ public CreateDialogContentDtoValidator()
                         .NotNull()
                         .WithMessage($"{propertyName} must not be empty.")
                         .SetValidator(new ContentValueDtoValidator(
-                            DialogContentType.Parse(propertyName))!);
+                            DialogContentType.Parse(propertyName), user)!);
                     break;
                 case NullabilityState.Nullable:
                     RuleFor(x => propMetadata.Property.GetValue(x) as ContentValueDto)
                         .SetValidator(new ContentValueDtoValidator(
-                            DialogContentType.Parse(propertyName))!)
+                            DialogContentType.Parse(propertyName), user)!)
                         .When(x => propMetadata.Property.GetValue(x) is not null);
                     break;
                 case NullabilityState.Unknown:
@@ -392,14 +393,11 @@ public CreateDialogDialogTransmissionActorDtoValidator()
         RuleFor(x => x.ActorType)
             .IsInEnum();
 
-        RuleFor(x => x.ActorId)
-            .Must((dto, value) => value is null || dto.ActorName is null)
-            .WithMessage("Only one of 'ActorId' or 'ActorName' can be set, but not both.");
-
-        RuleFor(x => x.ActorType)
-            .Must((dto, value) => (value == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
-                                  (value != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null)))
-            .WithMessage("If 'ActorType' is 'ServiceOwner', both 'ActorId' and 'ActorName' must be null. Otherwise, one of them must be set.");
+        RuleFor(x => x)
+            .Must(dto => (dto.ActorId is null || dto.ActorName is null) &&
+                         ((dto.ActorType == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
+                          (dto.ActorType != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null))))
+            .WithMessage(ActorValidationErrorMessages.ActorIdActorNameExclusiveOr);
 
         RuleFor(x => x.ActorId!)
             .IsValidPartyIdentifier()
@@ -414,14 +412,11 @@ public CreateDialogDialogActivityActorDtoValidator()
         RuleFor(x => x.ActorType)
             .IsInEnum();
 
-        RuleFor(x => x.ActorId)
-            .Must((dto, value) => value is null || dto.ActorName is null)
-            .WithMessage("Only one of 'ActorId' or 'ActorName' can be set, but not both.");
-
-        RuleFor(x => x.ActorType)
-            .Must((dto, value) => (value == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
-                                  (value != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null)))
-            .WithMessage("If 'ActorType' is 'ServiceOwner', both 'ActorId' and 'ActorName' must be null. Otherwise, one of them must be set.");
+        RuleFor(x => x)
+            .Must(dto => (dto.ActorId is null || dto.ActorName is null) &&
+                         ((dto.ActorType == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
+                          (dto.ActorType != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null))))
+            .WithMessage(ActorValidationErrorMessages.ActorIdActorNameExclusiveOr);
 
         RuleFor(x => x.ActorId!)
             .IsValidPartyIdentifier()

diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommandValidator.cs
@@ -1,7 +1,8 @@
 using System.Reflection;
 using Digdir.Domain.Dialogporten.Application.Common.Extensions.Enumerables;
 using Digdir.Domain.Dialogporten.Application.Common.Extensions.FluentValidation;
-using Digdir.Domain.Dialogporten.Application.Features.V1.Common;
+using Digdir.Domain.Dialogporten.Application.Externals.Presentation;
+using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Actors;
 using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Content;
 using Digdir.Domain.Dialogporten.Application.Features.V1.Common.Localizations;
 using Digdir.Domain.Dialogporten.Domain.Actors;
@@ -141,14 +142,11 @@ public UpdateDialogDialogTransmissionActorDtoValidator()
         RuleFor(x => x.ActorType)
             .IsInEnum();
 
-        RuleFor(x => x.ActorId)
-            .Must((dto, value) => value is null || dto.ActorName is null)
-            .WithMessage("Only one of 'ActorId' or 'ActorName' can be set, but not both.");
-
-        RuleFor(x => x.ActorType)
-            .Must((dto, value) => (value == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
-                                  (value != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null)))
-            .WithMessage("If 'ActorType' is 'ServiceOwner', both 'ActorId' and 'ActorName' must be null. Otherwise, one of them must be set.");
+        RuleFor(x => x)
+            .Must(dto => (dto.ActorId is null || dto.ActorName is null) &&
+                         ((dto.ActorType == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
+                          (dto.ActorType != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null))))
+            .WithMessage(ActorValidationErrorMessages.ActorIdActorNameExclusiveOr);
 
         RuleFor(x => x.ActorId!)
             .IsValidPartyIdentifier()
@@ -222,7 +220,7 @@ internal sealed class UpdateDialogContentDtoValidator : AbstractValidator<Update
             })
             .ToDictionary(x => x.Property.Name, StringComparer.InvariantCultureIgnoreCase);
 
-    public UpdateDialogContentDtoValidator()
+    public UpdateDialogContentDtoValidator(IUser? user)
     {
         foreach (var (propertyName, propMetadata) in SourcePropertyMetaDataByName)
         {
@@ -233,12 +231,12 @@ public UpdateDialogContentDtoValidator()
                         .NotNull()
                         .WithMessage($"{propertyName} must not be empty.")
                         .SetValidator(
-                            new ContentValueDtoValidator(DialogContentType.Parse(propertyName))!);
+                            new ContentValueDtoValidator(DialogContentType.Parse(propertyName), user)!);
                     break;
                 case NullabilityState.Nullable:
                     RuleFor(x => propMetadata.Property.GetValue(x) as ContentValueDto)
                         .SetValidator(
-                            new ContentValueDtoValidator(DialogContentType.Parse(propertyName))!)
+                            new ContentValueDtoValidator(DialogContentType.Parse(propertyName), user)!)
                         .When(x => propMetadata.Property.GetValue(x) is not null);
                     break;
                 case NullabilityState.Unknown:
@@ -408,14 +406,11 @@ public UpdateDialogDialogActivityActorDtoValidator()
         RuleFor(x => x.ActorType)
             .IsInEnum();
 
-        RuleFor(x => x.ActorId)
-            .Must((dto, value) => value is null || dto.ActorName is null)
-            .WithMessage("Only one of 'ActorId' or 'ActorName' can be set, but not both.");
-
-        RuleFor(x => x.ActorType)
-            .Must((dto, value) => (value == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
-                                  (value != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null)))
-            .WithMessage("If 'ActorType' is 'ServiceOwner', both 'ActorId' and 'ActorName' must be null. Otherwise, one of them must be set.");
+        RuleFor(x => x)
+            .Must(dto => (dto.ActorId is null || dto.ActorName is null) &&
+                         ((dto.ActorType == ActorType.Values.ServiceOwner && dto.ActorId is null && dto.ActorName is null) ||
+                          (dto.ActorType != ActorType.Values.ServiceOwner && (dto.ActorId is not null || dto.ActorName is not null))))
+            .WithMessage(ActorValidationErrorMessages.ActorIdActorNameExclusiveOr);
 
         RuleFor(x => x.ActorId!)
             .IsValidPartyIdentifier()

diff --git a/...Domain.Dialogporten.ChangeDataCapture/Digdir.Domain.Dialogporten.ChangeDataCapture.csproj b/...Domain.Dialogporten.ChangeDataCapture/Digdir.Domain.Dialogporten.ChangeDataCapture.csproj
@@ -2,7 +2,7 @@
 
     <ItemGroup>
         <PackageReference Include="Azure.Identity" Version="1.12.0"/>
-        <PackageReference Include="MassTransit" Version="8.2.4"/>
+        <PackageReference Include="MassTransit" Version="8.2.5"/>
         <PackageReference Include="Npgsql" Version="8.0.3"/>
         <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0"/>
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.2"/>

diff --git a/src/Digdir.Domain.Dialogporten.Domain/Dialogs/Entities/Contents/DialogContentType.cs b/src/Digdir.Domain.Dialogporten.Domain/Dialogs/Entities/Contents/DialogContentType.cs
@@ -51,7 +51,7 @@ public enum Values
             Required = false,
             MaxLength = 1023,
             OutputInList = false,
-            AllowedMediaTypes = [MediaTypes.Html, MediaTypes.PlainText, MediaTypes.Markdown]
+            AllowedMediaTypes = [MediaTypes.PlainText, MediaTypes.Markdown]
         },
         Values.ExtendedStatus => new(id)
         {

diff --git a/src/Digdir.Domain.Dialogporten.Domain/MediaTypes.cs b/src/Digdir.Domain.Dialogporten.Domain/MediaTypes.cs
@@ -7,5 +7,4 @@ public static class MediaTypes
 
     public const string Markdown = "text/markdown";
     public const string PlainText = "text/plain";
-    public const string Html = "text/html";
 }
diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/Program.cs b/src/Digdir.Domain.Dialogporten.GraphQL/Program.cs
@@ -45,7 +45,6 @@ static void BuildAndRun(string[] args)
 
     builder.Host.UseSerilog((context, services, configuration) => configuration
         .MinimumLevel.Warning()
-        .MinimumLevel.Override("Microsoft.EntityFrameworkCore", Serilog.Events.LogEventLevel.Fatal)
         .ReadFrom.Configuration(context.Configuration)
         .ReadFrom.Services(services)
         .Enrich.FromLogContext()

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.Development.json b/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.Development.json
@@ -1,10 +1,4 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
   "Infrastructure": {
     "Redis": {
       "Enabled": true,

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.json b/src/Digdir.Domain.Dialogporten.GraphQL/appsettings.json
@@ -1,10 +1,16 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
-      "Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddleware": "None",
-      "System.Net.Http.HttpClient": "Information"
+      "Default": "Warning"
+    }
+  },
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Warning",
+      "Override": {
+        "Microsoft.AspNetCore": "Warning",
+        "Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddleware": "Fatal"
+      }
     }
   },
   "Infrastructure": {