Merge branch 'main' into crudapi-cors2

Author: waldekmastykarz

dev-proxy-plugins/Mocks/CrudApiPlugin.cs

@@ -218,7 +218,8 @@ private void AddCORSHeaders(Request request, List<HttpHeader> headers)
 
         headers.Add(new HttpHeader("access-control-allow-origin", origin));
 
-        if (_configuration.EntraAuthConfig is not null)
+        if (_configuration.EntraAuthConfig is not null ||
+            _configuration.Actions.Any(a => a.Auth == CrudApiAuthType.Entra))
         {
             headers.Add(new HttpHeader("access-control-allow-headers", "authorization, content-type"));
         }

dev-proxy-plugins/Mocks/OpenAIMockResponsePlugin.cs

@@ -34,8 +34,13 @@ public override async Task RegisterAsync()
 
     private async Task OnRequestAsync(object sender, ProxyRequestArgs e)
     {
+        if (e.ResponseState.HasBeenSet)
+        {
+            Logger.LogRequest("Response already set", MessageType.Skipped, new LoggingContext(e.Session));
+            return;
+        }
         if (UrlsToWatch is null ||
-            !e.HasRequestUrlMatch(UrlsToWatch))
+            !e.ShouldExecute(UrlsToWatch))
         {
             Logger.LogRequest("URL not matched", MessageType.Skipped, new LoggingContext(e.Session));
             return;