extension method for httpcontext

Altinn · Oct 16, 2023 · f296797 · f296797
1 parent 82c47b8
commit f296797
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/Altinn.Notifications/Controllers/EmailNotificationOrdersController.cs b/src/Altinn.Notifications/Controllers/EmailNotificationOrdersController.cs
@@ -61,7 +61,7 @@ public async Task<ActionResult<OrderIdExt>> Post(EmailNotificationOrderRequestEx
             return ValidationProblem(ModelState);
         }
 
-        string? creator = HttpContext.Items["Org"] as string;
+        string? creator = HttpContext.GetOrg();
 
         if (creator == null)
         {

diff --git a/src/Altinn.Notifications/Controllers/OrdersController.cs b/src/Altinn.Notifications/Controllers/OrdersController.cs
@@ -1,4 +1,5 @@
 using Altinn.Notifications.Core.Services.Interfaces;
+using Altinn.Notifications.Extensions;
 using Altinn.Notifications.Mappers;
 using Altinn.Notifications.Models;
 
@@ -42,7 +43,7 @@ public OrdersController(IGetOrderService getOrderService)
     [SwaggerResponse(404, "No order with the provided id was found")]
     public async Task<ActionResult<NotificationOrderExt>> GetById([FromRoute] Guid id)
     {
-        string? expectedCreator = HttpContext.Items["Org"] as string;
+        string? expectedCreator = HttpContext.GetOrg();
 
         if (expectedCreator == null)
         {
@@ -69,7 +70,7 @@ public async Task<ActionResult<NotificationOrderExt>> GetById([FromRoute] Guid i
     [SwaggerResponse(200, "The list of notification orders matching the provided senders ref was retrieved successfully", typeof(NotificationOrderListExt))]
     public async Task<ActionResult<NotificationOrderListExt>> GetBySendersRef([FromQuery, BindRequired] string sendersReference)
     {
-        string? expectedCreator = HttpContext.Items["Org"] as string;
+        string? expectedCreator = HttpContext.GetOrg();
         if (expectedCreator == null)
         {
             return Forbid();
@@ -97,7 +98,7 @@ public async Task<ActionResult<NotificationOrderListExt>> GetBySendersRef([FromQ
     [SwaggerResponse(404, "No order with the provided id was found")]
     public async Task<ActionResult<NotificationOrderWithStatusExt>> GetWithStatusById([FromRoute] Guid id)
     {
-        string? expectedCreator = HttpContext.Items["Org"] as string;
+        string? expectedCreator = HttpContext.GetOrg();
         if (expectedCreator == null)
         {
             return Forbid();

diff --git a/src/Altinn.Notifications/Extensions/HttpContextExtensions.cs b/src/Altinn.Notifications/Extensions/HttpContextExtensions.cs
@@ -0,0 +1,15 @@
+namespace Altinn.Notifications.Extensions;
+
+/// <summary>
+/// Extensions for HTTP Context
+/// </summary>
+public static class HttpContextExtensions
+{
+    /// <summary>
+    /// Get the org identifier string or null if it is not an org.
+    /// </summary>        
+    public static string? GetOrg(this HttpContext context)
+    {
+        return context.Items["Org"] as string;
+    }
+}