Fix broken local audit test. (#450)

src/Microsoft.Health.Fhir.Api/Features/ActionResults/BaseActionResult.cs

@@ -13,7 +13,7 @@
 
 namespace Microsoft.Health.Fhir.Api.Features.ActionResults
 {
-    public abstract class BaseActionResult<TResult> : ActionResult
+    public abstract class BaseActionResult<TResult> : ActionResult, IBaseActionResult
     {
         protected BaseActionResult()
         {
@@ -73,5 +73,10 @@ public override Task ExecuteResultAsync(ActionContext context)
 
             return result.ExecuteResultAsync(context);
         }
+
+        public string GetResultTypeName()
+        {
+            return Result?.GetType().Name;
+        }
     }
 }

src/Microsoft.Health.Fhir.Api/Features/ActionResults/IBaseActionResult.cs

@@ -0,0 +1,12 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+
+namespace Microsoft.Health.Fhir.Api.Features.ActionResults
+{
+    public interface IBaseActionResult
+    {
+        string GetResultTypeName();
+    }
+}

src/Microsoft.Health.Fhir.Api/Features/Audit/AuditHelper.cs

@@ -72,9 +72,9 @@ public void LogExecuting(string controllerName, string actionName)
         }
 
         /// <inheritdoc />
-        public void LogExecuted(string controllerName, string actionName, HttpStatusCode statusCode, string resourceType)
+        public void LogExecuted(string controllerName, string actionName, HttpStatusCode statusCode, string responseResultType)
         {
-            Log(AuditAction.Executed, controllerName, actionName, statusCode, resourceType);
+            Log(AuditAction.Executed, controllerName, actionName, statusCode, responseResultType);
         }
 
         void IStartable.Start()

src/Microsoft.Health.Fhir.Api/Features/Audit/AuditLoggingFilterAttribute.cs

@@ -49,13 +49,14 @@ public override void OnResultExecuted(ResultExecutedContext context)
 
             Debug.Assert(actionDescriptor != null, "The ActionDescriptor must be ControllerActionDescriptor.");
 
-            var fhirResult = context.Result as FhirResult;
+            // The result can either be a FhirResult or an OperationOutcomeResult which both extend BaseActionResult.
+            var result = context.Result as IBaseActionResult;
 
             _auditHelper.LogExecuted(
                 actionDescriptor.ControllerName,
                 actionDescriptor.ActionName,
                 (HttpStatusCode)context.HttpContext.Response.StatusCode,
-                fhirResult?.Result?.TypeName);
+                result?.GetResultTypeName());
 
             base.OnResultExecuted(context);
         }

src/Microsoft.Health.Fhir.Api/Features/Audit/IAuditHelper.cs

@@ -34,7 +34,7 @@ public interface IAuditHelper
         /// <param name="controllerName">The controller name.</param>
         /// <param name="actionName">The action name.</param>
         /// <param name="statusCode">The HTTP status code.</param>
-        /// <param name="resourceType">The optional resource type.</param>
-        void LogExecuted(string controllerName, string actionName, HttpStatusCode statusCode, string resourceType);
+        /// <param name="responseResultType">The optional response result type.</param>
+        void LogExecuted(string controllerName, string actionName, HttpStatusCode statusCode, string responseResultType);
     }
 }

test/Microsoft.Health.Fhir.Tests.E2E/SmartProxy/SmartProxyTests.cs

@@ -121,6 +121,8 @@ void Advance()
                 // Consent, should only be done if we can find the button
                 try
                 {
+                    // Sleep in case a light box is shown.
+                    Thread.Sleep(TimeSpan.FromMilliseconds(1000));
                     var button = driver.FindElementById("idSIButton9");
                     Advance();
                 }