Merge remote-tracking branch 'origin/master' into manifest-mod

Author: roehlerw

PluginWebRequest/API/Write/GetSchemaForSettingsAsync.cs

@@ -23,10 +23,10 @@ public static async Task<Schema> GetSchemaForSettingsAsync(ConfigureWriteFormDat
                 PublisherMetaJson = JsonConvert.SerializeObject(formData)
             };
 
-            var urlParams = FindParamsRegex.Match(formData.Url);
-            var bodyParams = FindParamsRegex.Match(formData.Body);
+            var urlParams = FindParamsRegex.Matches(formData.Url);
+            var bodyParams = FindParamsRegex.Matches(formData.Body);
 
-            foreach (var match in urlParams.Captures)
+            foreach (var match in urlParams)
             {
                 var property = new Property
                 {
@@ -40,7 +40,7 @@ public static async Task<Schema> GetSchemaForSettingsAsync(ConfigureWriteFormDat
                 schema.Properties.Add(property);
             }
 
-            foreach (var match in bodyParams.Captures)
+            foreach (var match in bodyParams)
             {
                 var property = new Property
                 {

PluginWebRequestTest/Plugin/PluginIntegrationTest.cs

@@ -271,9 +271,9 @@ public async Task ConfigureWriteTest()
         ""cache-control"": ""no-cache"",
         ""postman-token"": ""5c27cd7d-6b16-4e5a-a0ef-191c9a3a275f"",
         ""user-agent"": ""PostmanRuntime/7.6.1"",
-        ""x-forwarded-port"": ""443""
+        ""x-forwarded-port"": ""{0}""
     },
-    ""url"": ""{0}""
+    ""url"": ""{1}""
 }";
             // https://postman-echo.com/post
             var formData = GetFormData("test", "https://postman-echo.com/{0}", body,"POST", new List<Header>
@@ -307,7 +307,7 @@ public async Task ConfigureWriteTest()
             Assert.Equal("", schema.Description);
             Assert.Equal("https://postman-echo.com/{0}", schema.Query);
             Assert.Equal(Schema.Types.DataFlowDirection.Write, schema.DataFlowDirection);
-            Assert.Equal(2, schema.Properties.Count);
+            Assert.Equal(3, schema.Properties.Count);
 
             var property = schema.Properties[0];