Null detection and improved error handling

Altinn · Nov 6, 2022 · 51fa5fa · 51fa5fa
1 parent f21908b
commit 51fa5fa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/Altinn.App.Api/Controllers/EventsReceiverController.cs b/src/Altinn.App.Api/Controllers/EventsReceiverController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Altinn.App.Core.Configuration;
 using Altinn.App.Core.Features;
@@ -49,7 +50,13 @@ public async Task<ActionResult> Post([FromQuery] string code, [FromBody] CloudEv
             {
                 return Unauthorized();
             }
-
+
+            if (cloudEventEnvelope.CloudEvent == null)
+            {
+                _logger.LogError("CloudEvent is null, unable to process event! Data received: {data}", JsonSerializer.Serialize(cloudEventEnvelope));
+                return BadRequest();
+            }
+
             CloudEvent cloudEvent = cloudEventEnvelope.CloudEvent;
 
             IEventHandler eventHandler = _eventHandlerResolver.ResolveEventHandler(cloudEvent.Type);

diff --git a/src/Altinn.App.Core/Internal/Events/EventHandlerResolver.cs b/src/Altinn.App.Core/Internal/Events/EventHandlerResolver.cs
@@ -16,6 +16,11 @@ public EventHandlerResolver(IEnumerable<IEventHandler> eventHandlers)
         /// <inheritDoc/>
         public IEventHandler ResolveEventHandler(string eventType)
         {
+            if (eventType == null)
+            {
+                return new UnhandledEventHandler();
+            }
+
             foreach (var handler in _eventHandlers)
             {
                 if (handler.EventType.ToLower() != eventType.ToLower())

diff --git a/src/Altinn.App.Core/Internal/Events/UnhandledEventHandler.cs b/src/Altinn.App.Core/Internal/Events/UnhandledEventHandler.cs
@@ -15,7 +15,7 @@ public class UnhandledEventHandler : IEventHandler
         /// <inheritdoc/>
         public Task<bool> ProcessEvent(CloudEvent cloudEvent)
         {
-            throw new NotImplementedException($"Received unhandled event {cloudEvent.Type} with the following data: {JsonSerializer.Serialize(cloudEvent)}");
+            throw new NotImplementedException($"Received unhandled event {cloudEvent?.Type} with the following data: {JsonSerializer.Serialize(cloudEvent)}");
         }
     }
 }
diff --git a/test/Altinn.App.Api.Tests/Controllers/EventsReceiverControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/EventsReceiverControllerTests.cs
@@ -71,7 +71,7 @@ public async Task Post_NonValidEventType_ShouldReturnBadRequest()
                 Time = DateTime.Parse("2022-10-13T09:33:46.6330634Z"),
                 AlternativeSubject = "/person/17858296439"
             };
-            CloudEventEnvelope envelope = new() { CloudEvent = cloudEvent };
+            CloudEventEnvelope envelope = new() { CloudEvent = null };
 
             var org = "ttd";
             var app = "non-existing-app";