Merge branch 'main' into 525_warn-on-mismatch-between-app-and-schema-versions

Author: waldekmastykarz

dev-proxy-abstractions/ProxyUtils.cs

@@ -465,7 +465,7 @@ private static string GetCommonPrefix(List<string> paths)
         var lastSlashIndex = prefix.LastIndexOf('/');
         return lastSlashIndex >= 0 ? prefix[..(lastSlashIndex + 1)] : prefix;
     }
-    
+
     public static async Task<(bool IsValid, IEnumerable<string> ValidationErrors)> ValidateJson(string? json, string? schemaUrl, ILogger logger)
     {
         try
@@ -486,7 +486,7 @@ private static string GetCommonPrefix(List<string> paths)
             logger.LogDebug("Downloading schema from {SchemaUrl}", schemaUrl);
             using var client = new HttpClient();
             var schemaContents = await client.GetStringAsync(schemaUrl);
-            
+
             logger.LogDebug("Parsing schema");
             var schema = JSchema.Parse(schemaContents);
             logger.LogDebug("Parsing JSON");
@@ -628,5 +628,11 @@ public static int CompareSemVer(string? a, string? b)
             // if both versions are prerelease, b is greater
             return -1;
         }
+
+    public static string GetVersionString(string productVersion)
+    {
+        return productVersion.Contains("-beta")
+            ? productVersion.Split("-")[0]
+            : productVersion;
     }
 }

dev-proxy-plugins/Mocks/CrudApiPlugin.cs

@@ -218,9 +218,10 @@ 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"));
+            headers.Add(new HttpHeader("access-control-allow-headers", "authorization, content-type"));
         }
 
         var methods = string.Join(", ", _configuration.Actions

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;

dev-proxy/CommandHandlers/ConfigNewCommandHandler.cs

@@ -17,7 +17,7 @@ public class VisualStudioCodeSnippet
 
 public static class ConfigNewCommandHandler
 {
-    private static readonly string snippetsFileUrl = $"https://aka.ms/devproxy/snippets/v{ProxyUtils.ProductVersion}";
+    private static readonly string snippetsFileUrl = $"https://aka.ms/devproxy/snippets/v{ProxyUtils.GetVersionString(ProxyUtils.ProductVersion)}";
     private static readonly string configFileSnippetName = "ConfigFile";
 
     public static async Task CreateConfigFileAsync(string name, ILogger logger)