Updates request log plugins to consider URLs to watch. Closes #1081 (#1084)

Author: waldekmastykarz

dev-proxy-plugins/RequestLogs/ApiCenterMinimalPermissionsPlugin.cs

@@ -95,6 +95,7 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 l.MessageType == MessageType.InterceptedRequest &&
                 !l.Message.StartsWith("OPTIONS") &&
                 l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri) &&
                 l.Context.Session.HttpClient.Request.Headers.Any(h => h.Name.Equals("authorization", StringComparison.OrdinalIgnoreCase))
             );
         if (!interceptedRequests.Any())

dev-proxy-plugins/RequestLogs/ApiCenterOnboardingPlugin.cs

@@ -118,7 +118,8 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 var methodAndUrl = request.Message.Split(' ');
                 return (method: methodAndUrl[0], url: methodAndUrl[1]);
             })
-            .Where(r => !r.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
+            .Where(r => !r.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase) &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, r.url))
             .Distinct();
 
         var existingApis = new List<ApiCenterOnboardingPluginReportExistingApiInfo>();

dev-proxy-plugins/RequestLogs/ApiCenterProductionVersionPlugin.cs

@@ -90,7 +90,8 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
         var interceptedRequests = e.RequestLogs
             .Where(
                 l => l.MessageType == MessageType.InterceptedRequest &&
-                l.Context?.Session is not null
+                l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri)
             );
         if (!interceptedRequests.Any())
         {

dev-proxy-plugins/RequestLogs/GraphMinimalPermissionsGuidancePlugin.cs

@@ -94,6 +94,12 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
             {
                 continue;
             }
+
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))
+            {
+                Logger.LogDebug("URL not matched: {url}", methodAndUrl.url);
+                continue;
+            }
 
             var requestsFromBatch = Array.Empty<(string method, string url)>();
 

dev-proxy-plugins/RequestLogs/GraphMinimalPermissionsPlugin.cs

@@ -64,6 +64,12 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
                 continue;
             }
 
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))
+            {
+                Logger.LogDebug("URL not matched: {url}", methodAndUrl.url);
+                continue;
+            }
+
             var uri = new Uri(methodAndUrl.url);
             if (!ProxyUtils.IsGraphUrl(uri))
             {

dev-proxy-plugins/RequestLogs/HttpFileGeneratorPlugin.cs

@@ -139,7 +139,8 @@ private async Task<HttpFile> GetHttpRequestsAsync(IEnumerable<RequestLog> reques
         {
             if (request.MessageType != MessageType.InterceptedResponse ||
               request.Context is null ||
-              request.Context.Session is null)
+              request.Context.Session is null ||
+              !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
             {
                 continue;
             }

dev-proxy-plugins/RequestLogs/MinimalCsomPermissionsPlugin.cs

@@ -74,7 +74,6 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
             .Where(l =>
                 l.MessageType == MessageType.InterceptedRequest &&
                 l.Message.StartsWith("POST") &&
-                l.Message.Contains(".sharepoint.com", StringComparison.InvariantCultureIgnoreCase) &&
                 l.Message.Contains("/_vti_bin/client.svc/ProcessQuery", StringComparison.InvariantCultureIgnoreCase)
             );
         if (!interceptedRequests.Any())
@@ -95,6 +94,12 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 continue;
             }
 
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
+            {
+                Logger.LogDebug("URL not matched: {url}", request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri);
+                continue;
+            }
+
             var requestBody = await request.Context.Session.GetRequestBodyAsString();
             if (string.IsNullOrEmpty(requestBody))
             {

dev-proxy-plugins/RequestLogs/MinimalPermissionsGuidancePlugin.cs

@@ -71,6 +71,7 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
                 l.MessageType == MessageType.InterceptedRequest &&
                 !l.Message.StartsWith("OPTIONS") &&
                 l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri) &&
                 l.Context.Session.HttpClient.Request.Headers.Any(h => h.Name.Equals("authorization", StringComparison.OrdinalIgnoreCase))
             );
         if (!interceptedRequests.Any())

dev-proxy-plugins/RequestLogs/MinimalPermissionsPlugin.cs

@@ -68,7 +68,8 @@ private async Task AfterRecordingStopAsync(object sender, RecordingArgs e)
             .Where(l =>
                 l.MessageType == MessageType.InterceptedRequest &&
                 !l.Message.StartsWith("OPTIONS") &&
-                l.Context?.Session is not null
+                l.Context?.Session is not null &&
+                ProxyUtils.MatchesUrlToWatch(UrlsToWatch, l.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri)
             );
         if (!interceptedRequests.Any())
         {

dev-proxy-plugins/RequestLogs/MockGeneratorPlugin.cs

@@ -39,7 +39,8 @@ private async Task AfterRecordingStopAsync(object? sender, RecordingArgs e)
         {
             if (request.MessageType != MessageType.InterceptedResponse ||
               request.Context is null ||
-              request.Context.Session is null)
+              request.Context.Session is null ||
+              !ProxyUtils.MatchesUrlToWatch(UrlsToWatch, request.Context.Session.HttpClient.Request.RequestUri.AbsoluteUri))
             {
                 continue;
             }