Add MethodAndUrl record instead of tuple and MethodAndUrlComparer

bartizan · bartizan · commit 826d64455aac · 2025-08-14T14:54:49.000+03:00
diff --git a/DevProxy.Plugins/Reporting/GraphMinimalPermissionsGuidancePlugin.cs b/DevProxy.Plugins/Reporting/GraphMinimalPermissionsGuidancePlugin.cs
@@ -77,9 +77,8 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
             return;
         }
 
-        var methodAndUrlComparer = new MethodAndUrlComparer();
-        var delegatedEndpoints = new List<(string method, string url)>();
-        var applicationEndpoints = new List<(string method, string url)>();
+        var delegatedEndpoints = new List<MethodAndUrl>();
+        var applicationEndpoints = new List<MethodAndUrl>();
 
         // scope for delegated permissions
         IEnumerable<string> scopesToEvaluate = [];
@@ -95,20 +94,20 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
 
             var methodAndUrlString = request.Message;
             var methodAndUrl = MethodAndUrlUtils.ToMethodAndUrl(methodAndUrlString);
-            if (methodAndUrl.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
+            if (methodAndUrl.Method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
             {
                 continue;
             }
 
-            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.Url))
             {
-                Logger.LogDebug("URL not matched: {Url}", methodAndUrl.url);
+                Logger.LogDebug("URL not matched: {Url}", methodAndUrl.Url);
                 continue;
             }
 
-            var requestsFromBatch = Array.Empty<(string method, string url)>();
+            var requestsFromBatch = Array.Empty<MethodAndUrl>();
 
-            var uri = new Uri(methodAndUrl.url);
+            var uri = new Uri(methodAndUrl.Url);
             if (!ProxyUtils.IsGraphUrl(uri))
             {
                 continue;
@@ -121,7 +120,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
             }
             else
             {
-                methodAndUrl = (methodAndUrl.method, GetTokenizedUrl(methodAndUrl.url));
+                methodAndUrl = new(methodAndUrl.Method, GetTokenizedUrl(methodAndUrl.Url));
             }
 
             var (type, permissions) = GetPermissionsAndType(request);
@@ -162,8 +161,8 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
         }
 
         // Remove duplicates
-        delegatedEndpoints = [.. delegatedEndpoints.Distinct(methodAndUrlComparer)];
-        applicationEndpoints = [.. applicationEndpoints.Distinct(methodAndUrlComparer)];
+        delegatedEndpoints = [.. delegatedEndpoints.Distinct()];
+        applicationEndpoints = [.. applicationEndpoints.Distinct()];
 
         if (delegatedEndpoints.Count == 0 && applicationEndpoints.Count == 0)
         {
@@ -187,7 +186,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
             var delegatedPermissionsInfo = new GraphMinimalPermissionsInfo();
             report.DelegatedPermissions = delegatedPermissionsInfo;
 
-            Logger.LogInformation("Evaluating delegated permissions for: {Endpoints}", string.Join(", ", delegatedEndpoints.Select(e => $"{e.method} {e.url}")));
+            Logger.LogInformation("Evaluating delegated permissions for: {Endpoints}", string.Join(", ", delegatedEndpoints.Select(e => $"{e.Method} {e.Url}")));
 
             await EvaluateMinimalScopesAsync(delegatedEndpoints, scopesToEvaluate, GraphPermissionsType.Delegated, delegatedPermissionsInfo, cancellationToken);
         }
@@ -197,7 +196,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
             var applicationPermissionsInfo = new GraphMinimalPermissionsInfo();
             report.ApplicationPermissions = applicationPermissionsInfo;
 
-            Logger.LogInformation("Evaluating application permissions for: {Endpoints}", string.Join(", ", applicationEndpoints.Select(e => $"{e.method} {e.url}")));
+            Logger.LogInformation("Evaluating application permissions for: {Endpoints}", string.Join(", ", applicationEndpoints.Select(e => $"{e.Method} {e.Url}")));
 
             await EvaluateMinimalScopesAsync(applicationEndpoints, rolesToEvaluate, GraphPermissionsType.Application, applicationPermissionsInfo, cancellationToken);
         }
@@ -217,7 +216,7 @@ private void InitializePermissionsToExclude()
     }
 
     private async Task EvaluateMinimalScopesAsync(
-        IEnumerable<(string method, string url)> endpoints,
+        IEnumerable<MethodAndUrl> endpoints,
         IEnumerable<string> permissionsFromAccessToken,
         GraphPermissionsType scopeType,
         GraphMinimalPermissionsInfo permissionsInfo,
@@ -228,12 +227,12 @@ private async Task EvaluateMinimalScopesAsync(
             throw new InvalidOperationException("GraphUtils is not initialized. Make sure to call InitializeAsync first.");
         }
 
-        var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.method, Url = e.url });
+        var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.Method, Url = e.Url });
 
         permissionsInfo.Operations = [.. endpoints.Select(e => new GraphMinimalPermissionsOperationInfo
         {
-            Method = e.method,
-            Endpoint = e.url
+            Method = e.Method,
+            Endpoint = e.Url
         })];
         permissionsInfo.PermissionsFromTheToken = permissionsFromAccessToken;
 
@@ -289,9 +288,9 @@ private async Task EvaluateMinimalScopesAsync(
         }
     }
 
-    private static (string method, string url)[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)
+    private static MethodAndUrl[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)
     {
-        var requests = new List<(string method, string url)>();
+        var requests = new List<MethodAndUrl>();
 
         if (string.IsNullOrEmpty(batchBody))
         {
@@ -313,7 +312,8 @@ private static (string method, string url)[] GetRequestsFromBatch(string batchBo
                     var method = request.Method;
                     var url = request.Url;
                     var absoluteUrl = $"https://{graphHostName}/{graphVersion}{url}";
-                    requests.Add((method, GetTokenizedUrl(absoluteUrl)));
+                    MethodAndUrl methodAndUrl = new(Method: method, Url: GetTokenizedUrl(absoluteUrl));
+                    requests.Add(methodAndUrl);
                 }
                 catch { }
             }
diff --git a/DevProxy.Plugins/Reporting/GraphMinimalPermissionsPlugin.cs b/DevProxy.Plugins/Reporting/GraphMinimalPermissionsPlugin.cs
@@ -60,8 +60,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
             return;
         }
 
-        var methodAndUrlComparer = new MethodAndUrlComparer();
-        var endpoints = new List<(string method, string url)>();
+        var endpoints = new List<MethodAndUrl>();
 
         foreach (var request in e.RequestLogs)
         {
@@ -72,18 +71,18 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
 
             var methodAndUrlString = request.Message;
             var methodAndUrl = MethodAndUrlUtils.ToMethodAndUrl(methodAndUrlString);
-            if (methodAndUrl.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
+            if (methodAndUrl.Method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
             {
                 continue;
             }
 
-            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))
+            if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.Url))
             {
-                Logger.LogDebug("URL not matched: {Url}", methodAndUrl.url);
+                Logger.LogDebug("URL not matched: {Url}", methodAndUrl.Url);
                 continue;
             }
 
-            var uri = new Uri(methodAndUrl.url);
+            var uri = new Uri(methodAndUrl.Url);
             if (!ProxyUtils.IsGraphUrl(uri))
             {
                 continue;
@@ -97,21 +96,21 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
             }
             else
             {
-                methodAndUrl = (methodAndUrl.method, GetTokenizedUrl(methodAndUrl.url));
+                methodAndUrl = new(methodAndUrl.Method, GetTokenizedUrl(methodAndUrl.Url));
                 endpoints.Add(methodAndUrl);
             }
         }
 
         // Remove duplicates
-        endpoints = [.. endpoints.Distinct(methodAndUrlComparer)];
+        endpoints = [.. endpoints.Distinct()];
 
         if (endpoints.Count == 0)
         {
             Logger.LogInformation("No requests to Microsoft Graph endpoints recorded. Will not retrieve minimal permissions.");
             return;
         }
 
-        Logger.LogInformation("Retrieving minimal permissions for:\r\n{Endpoints}\r\n", string.Join(Environment.NewLine, endpoints.Select(e => $"- {e.method} {e.url}")));
+        Logger.LogInformation("Retrieving minimal permissions for:\r\n{Endpoints}\r\n", string.Join(Environment.NewLine, endpoints.Select(e => $"- {e.Method} {e.Url}")));
 
         Logger.LogWarning("This plugin is in preview and may not return the correct results.\r\nPlease review the permissions and test your app before using them in production.\r\nIf you have any feedback, please open an issue at https://aka.ms/devproxy/issue.\r\n");
 
@@ -125,15 +124,15 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
     }
 
     private async Task<GraphMinimalPermissionsPluginReport?> DetermineMinimalScopesAsync(
-        IEnumerable<(string method, string url)> endpoints,
+        IEnumerable<MethodAndUrl> endpoints,
         CancellationToken cancellationToken)
     {
         if (_graphUtils is null)
         {
             throw new InvalidOperationException("GraphUtils is not initialized. Make sure to call InitializeAsync first.");
         }
 
-        var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.method, Url = e.url });
+        var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.Method, Url = e.Url });
 
         try
         {
@@ -179,9 +178,9 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation
         }
     }
 
-    private static (string method, string url)[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)
+    private static MethodAndUrl[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)
     {
-        var requests = new List<(string, string)>();
+        var requests = new List<MethodAndUrl>();
 
         if (string.IsNullOrEmpty(batchBody))
         {
@@ -203,7 +202,8 @@ private static (string method, string url)[] GetRequestsFromBatch(string batchBo
                     var method = request.Method;
                     var url = request.Url;
                     var absoluteUrl = $"https://{graphHostName}/{graphVersion}{url}";
-                    requests.Add((method, GetTokenizedUrl(absoluteUrl)));
+                    MethodAndUrl methodAndUrl = new(Method: method, Url: GetTokenizedUrl(absoluteUrl));
+                    requests.Add(methodAndUrl);
                 }
                 catch { }
             }
diff --git a/DevProxy.Plugins/Utils/GraphUtils.cs b/DevProxy.Plugins/Utils/GraphUtils.cs
@@ -47,9 +47,9 @@ internal static string GetScopeTypeString(GraphPermissionsType type)
         };
     }
 
-    internal async Task<IEnumerable<string>> UpdateUserScopesAsync(IEnumerable<string> minimalScopes, IEnumerable<(string method, string url)> endpoints, GraphPermissionsType permissionsType)
+    internal async Task<IEnumerable<string>> UpdateUserScopesAsync(IEnumerable<string> minimalScopes, IEnumerable<MethodAndUrl> endpoints, GraphPermissionsType permissionsType)
     {
-        var userEndpoints = endpoints.Where(e => e.url.Contains("/users/{", StringComparison.OrdinalIgnoreCase));
+        var userEndpoints = endpoints.Where(e => e.Url.Contains("/users/{", StringComparison.OrdinalIgnoreCase));
         if (!userEndpoints.Any())
         {
             return minimalScopes;
@@ -60,8 +60,8 @@ internal async Task<IEnumerable<string>> UpdateUserScopesAsync(IEnumerable<strin
         var url = $"https://devxapi-func-prod-eastus.azurewebsites.net/permissions?scopeType={GetScopeTypeString(permissionsType)}";
         var urls = userEndpoints.Select(e =>
         {
-            _logger.LogDebug("Getting permissions for {Method} {Url}", e.method, e.url);
-            return $"{url}&requesturl={e.url}&method={e.method}";
+            _logger.LogDebug("Getting permissions for {Method} {Url}", e.Method, e.Url);
+            return $"{url}&requesturl={e.Url}&method={e.Method}";
         });
         var tasks = urls.Select(u =>
         {
diff --git a/DevProxy.Plugins/Utils/MethodAndUrlComparer.cs b/DevProxy.Plugins/Utils/MethodAndUrlComparer.cs
diff --git a/DevProxy.Plugins/Utils/MethodAndUrlUtils.cs b/DevProxy.Plugins/Utils/MethodAndUrlUtils.cs
@@ -4,9 +4,11 @@
 
 namespace DevProxy.Plugins.Utils;
 
+internal readonly record struct MethodAndUrl(string Method, string Url);
+
 internal static class MethodAndUrlUtils
 {
-    public static (string method, string url) ToMethodAndUrl(string methodAndUrlString)
+    public static MethodAndUrl ToMethodAndUrl(string methodAndUrlString)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(methodAndUrlString, nameof(methodAndUrlString));
 
@@ -15,6 +17,6 @@ public static (string method, string url) ToMethodAndUrl(string methodAndUrlStri
         {
             info = [info[0], string.Join(" ", info.Skip(1))];
         }
-        return (method: info[0], url: info[1]);
+        return new(Method: info[0], Url: info[1]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,8 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`77`	`77`	`return;`
`78`	`78`	`}`
`79`	`79`
`80`		`- var methodAndUrlComparer = new MethodAndUrlComparer();`
`81`		`- var delegatedEndpoints = new List<(string method, string url)>();`
`82`		`- var applicationEndpoints = new List<(string method, string url)>();`
	`80`	`+ var delegatedEndpoints = new List<MethodAndUrl>();`
	`81`	`+ var applicationEndpoints = new List<MethodAndUrl>();`
`83`	`82`
`84`	`83`	`// scope for delegated permissions`
`85`	`84`	`IEnumerable<string> scopesToEvaluate = [];`
`@@ -95,20 +94,20 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`95`	`94`
`96`	`95`	`var methodAndUrlString = request.Message;`
`97`	`96`	`var methodAndUrl = MethodAndUrlUtils.ToMethodAndUrl(methodAndUrlString);`
`98`		`- if (methodAndUrl.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))`
	`97`	`+ if (methodAndUrl.Method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))`
`99`	`98`	`{`
`100`	`99`	`continue;`
`101`	`100`	`}`
`102`	`101`
`103`		`- if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))`
	`102`	`+ if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.Url))`
`104`	`103`	`{`
`105`		`- Logger.LogDebug("URL not matched: {Url}", methodAndUrl.url);`
	`104`	`+ Logger.LogDebug("URL not matched: {Url}", methodAndUrl.Url);`
`106`	`105`	`continue;`
`107`	`106`	`}`
`108`	`107`
`109`		`- var requestsFromBatch = Array.Empty<(string method, string url)>();`
	`108`	`+ var requestsFromBatch = Array.Empty<MethodAndUrl>();`
`110`	`109`
`111`		`- var uri = new Uri(methodAndUrl.url);`
	`110`	`+ var uri = new Uri(methodAndUrl.Url);`
`112`	`111`	`if (!ProxyUtils.IsGraphUrl(uri))`
`113`	`112`	`{`
`114`	`113`	`continue;`
`@@ -121,7 +120,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`121`	`120`	`}`
`122`	`121`	`else`
`123`	`122`	`{`
`124`		`- methodAndUrl = (methodAndUrl.method, GetTokenizedUrl(methodAndUrl.url));`
	`123`	`+ methodAndUrl = new(methodAndUrl.Method, GetTokenizedUrl(methodAndUrl.Url));`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`var (type, permissions) = GetPermissionsAndType(request);`
`@@ -162,8 +161,8 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`162`	`161`	`}`
`163`	`162`
`164`	`163`	`// Remove duplicates`
`165`		`- delegatedEndpoints = [.. delegatedEndpoints.Distinct(methodAndUrlComparer)];`
`166`		`- applicationEndpoints = [.. applicationEndpoints.Distinct(methodAndUrlComparer)];`
	`164`	`+ delegatedEndpoints = [.. delegatedEndpoints.Distinct()];`
	`165`	`+ applicationEndpoints = [.. applicationEndpoints.Distinct()];`
`167`	`166`
`168`	`167`	`if (delegatedEndpoints.Count == 0 && applicationEndpoints.Count == 0)`
`169`	`168`	`{`
`@@ -187,7 +186,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`187`	`186`	`var delegatedPermissionsInfo = new GraphMinimalPermissionsInfo();`
`188`	`187`	`report.DelegatedPermissions = delegatedPermissionsInfo;`
`189`	`188`
`190`		`- Logger.LogInformation("Evaluating delegated permissions for: {Endpoints}", string.Join(", ", delegatedEndpoints.Select(e => $"{e.method} {e.url}")));`
	`189`	`+ Logger.LogInformation("Evaluating delegated permissions for: {Endpoints}", string.Join(", ", delegatedEndpoints.Select(e => $"{e.Method} {e.Url}")));`
`191`	`190`
`192`	`191`	`await EvaluateMinimalScopesAsync(delegatedEndpoints, scopesToEvaluate, GraphPermissionsType.Delegated, delegatedPermissionsInfo, cancellationToken);`
`193`	`192`	`}`
`@@ -197,7 +196,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`197`	`196`	`var applicationPermissionsInfo = new GraphMinimalPermissionsInfo();`
`198`	`197`	`report.ApplicationPermissions = applicationPermissionsInfo;`
`199`	`198`
`200`		`- Logger.LogInformation("Evaluating application permissions for: {Endpoints}", string.Join(", ", applicationEndpoints.Select(e => $"{e.method} {e.url}")));`
	`199`	`+ Logger.LogInformation("Evaluating application permissions for: {Endpoints}", string.Join(", ", applicationEndpoints.Select(e => $"{e.Method} {e.Url}")));`
`201`	`200`
`202`	`201`	`await EvaluateMinimalScopesAsync(applicationEndpoints, rolesToEvaluate, GraphPermissionsType.Application, applicationPermissionsInfo, cancellationToken);`
`203`	`202`	`}`
`@@ -217,7 +216,7 @@ private void InitializePermissionsToExclude()`
`217`	`216`	`}`
`218`	`217`
`219`	`218`	`private async Task EvaluateMinimalScopesAsync(`
`220`		`- IEnumerable<(string method, string url)> endpoints,`
	`219`	`+ IEnumerable<MethodAndUrl> endpoints,`
`221`	`220`	`IEnumerable<string> permissionsFromAccessToken,`
`222`	`221`	`GraphPermissionsType scopeType,`
`223`	`222`	`GraphMinimalPermissionsInfo permissionsInfo,`
`@@ -228,12 +227,12 @@ private async Task EvaluateMinimalScopesAsync(`
`228`	`227`	`throw new InvalidOperationException("GraphUtils is not initialized. Make sure to call InitializeAsync first.");`
`229`	`228`	`}`
`230`	`229`
`231`		`- var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.method, Url = e.url });`
	`230`	`+ var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.Method, Url = e.Url });`
`232`	`231`
`233`	`232`	`permissionsInfo.Operations = [.. endpoints.Select(e => new GraphMinimalPermissionsOperationInfo`
`234`	`233`	`{`
`235`		`- Method = e.method,`
`236`		`- Endpoint = e.url`
	`234`	`+ Method = e.Method,`
	`235`	`+ Endpoint = e.Url`
`237`	`236`	`})];`
`238`	`237`	`permissionsInfo.PermissionsFromTheToken = permissionsFromAccessToken;`
`239`	`238`
`@@ -289,9 +288,9 @@ private async Task EvaluateMinimalScopesAsync(`
`289`	`288`	`}`
`290`	`289`	`}`
`291`	`290`
`292`		`- private static (string method, string url)[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)`
	`291`	`+ private static MethodAndUrl[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)`
`293`	`292`	`{`
`294`		`- var requests = new List<(string method, string url)>();`
	`293`	`+ var requests = new List<MethodAndUrl>();`
`295`	`294`
`296`	`295`	`if (string.IsNullOrEmpty(batchBody))`
`297`	`296`	`{`
`@@ -313,7 +312,8 @@ private static (string method, string url)[] GetRequestsFromBatch(string batchBo`
`313`	`312`	`var method = request.Method;`
`314`	`313`	`var url = request.Url;`
`315`	`314`	`var absoluteUrl = $"https://{graphHostName}/{graphVersion}{url}";`
`316`		`- requests.Add((method, GetTokenizedUrl(absoluteUrl)));`
	`315`	`+ MethodAndUrl methodAndUrl = new(Method: method, Url: GetTokenizedUrl(absoluteUrl));`
	`316`	`+ requests.Add(methodAndUrl);`
`317`	`317`	`}`
`318`	`318`	`catch { }`
`319`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`	`62`
`63`		`- var methodAndUrlComparer = new MethodAndUrlComparer();`
`64`		`- var endpoints = new List<(string method, string url)>();`
	`63`	`+ var endpoints = new List<MethodAndUrl>();`
`65`	`64`
`66`	`65`	`foreach (var request in e.RequestLogs)`
`67`	`66`	`{`
`@@ -72,18 +71,18 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`72`	`71`
`73`	`72`	`var methodAndUrlString = request.Message;`
`74`	`73`	`var methodAndUrl = MethodAndUrlUtils.ToMethodAndUrl(methodAndUrlString);`
`75`		`- if (methodAndUrl.method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))`
	`74`	`+ if (methodAndUrl.Method.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))`
`76`	`75`	`{`
`77`	`76`	`continue;`
`78`	`77`	`}`
`79`	`78`
`80`		`- if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.url))`
	`79`	`+ if (!ProxyUtils.MatchesUrlToWatch(UrlsToWatch, methodAndUrl.Url))`
`81`	`80`	`{`
`82`		`- Logger.LogDebug("URL not matched: {Url}", methodAndUrl.url);`
	`81`	`+ Logger.LogDebug("URL not matched: {Url}", methodAndUrl.Url);`
`83`	`82`	`continue;`
`84`	`83`	`}`
`85`	`84`
`86`		`- var uri = new Uri(methodAndUrl.url);`
	`85`	`+ var uri = new Uri(methodAndUrl.Url);`
`87`	`86`	`if (!ProxyUtils.IsGraphUrl(uri))`
`88`	`87`	`{`
`89`	`88`	`continue;`
`@@ -97,21 +96,21 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`97`	`96`	`}`
`98`	`97`	`else`
`99`	`98`	`{`
`100`		`- methodAndUrl = (methodAndUrl.method, GetTokenizedUrl(methodAndUrl.url));`
	`99`	`+ methodAndUrl = new(methodAndUrl.Method, GetTokenizedUrl(methodAndUrl.Url));`
`101`	`100`	`endpoints.Add(methodAndUrl);`
`102`	`101`	`}`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`// Remove duplicates`
`106`		`- endpoints = [.. endpoints.Distinct(methodAndUrlComparer)];`
	`105`	`+ endpoints = [.. endpoints.Distinct()];`
`107`	`106`
`108`	`107`	`if (endpoints.Count == 0)`
`109`	`108`	`{`
`110`	`109`	`Logger.LogInformation("No requests to Microsoft Graph endpoints recorded. Will not retrieve minimal permissions.");`
`111`	`110`	`return;`
`112`	`111`	`}`
`113`	`112`
`114`		`- Logger.LogInformation("Retrieving minimal permissions for:\r\n{Endpoints}\r\n", string.Join(Environment.NewLine, endpoints.Select(e => $"- {e.method} {e.url}")));`
	`113`	`+ Logger.LogInformation("Retrieving minimal permissions for:\r\n{Endpoints}\r\n", string.Join(Environment.NewLine, endpoints.Select(e => $"- {e.Method} {e.Url}")));`
`115`	`114`
`116`	`115`	`Logger.LogWarning("This plugin is in preview and may not return the correct results.\r\nPlease review the permissions and test your app before using them in production.\r\nIf you have any feedback, please open an issue at https://aka.ms/devproxy/issue.\r\n");`
`117`	`116`
`@@ -125,15 +124,15 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`private async Task<GraphMinimalPermissionsPluginReport?> DetermineMinimalScopesAsync(`
`128`		`- IEnumerable<(string method, string url)> endpoints,`
	`127`	`+ IEnumerable<MethodAndUrl> endpoints,`
`129`	`128`	`CancellationToken cancellationToken)`
`130`	`129`	`{`
`131`	`130`	`if (_graphUtils is null)`
`132`	`131`	`{`
`133`	`132`	`throw new InvalidOperationException("GraphUtils is not initialized. Make sure to call InitializeAsync first.");`
`134`	`133`	`}`
`135`	`134`
`136`		`- var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.method, Url = e.url });`
	`135`	`+ var payload = endpoints.Select(e => new GraphRequestInfo { Method = e.Method, Url = e.Url });`
`137`	`136`
`138`	`137`	`try`
`139`	`138`	`{`
`@@ -179,9 +178,9 @@ public override async Task AfterRecordingStopAsync(RecordingArgs e, Cancellation`
`179`	`178`	`}`
`180`	`179`	`}`
`181`	`180`
`182`		`- private static (string method, string url)[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)`
	`181`	`+ private static MethodAndUrl[] GetRequestsFromBatch(string batchBody, string graphVersion, string graphHostName)`
`183`	`182`	`{`
`184`		`- var requests = new List<(string, string)>();`
	`183`	`+ var requests = new List<MethodAndUrl>();`
`185`	`184`
`186`	`185`	`if (string.IsNullOrEmpty(batchBody))`
`187`	`186`	`{`
`@@ -203,7 +202,8 @@ private static (string method, string url)[] GetRequestsFromBatch(string batchBo`
`203`	`202`	`var method = request.Method;`
`204`	`203`	`var url = request.Url;`
`205`	`204`	`var absoluteUrl = $"https://{graphHostName}/{graphVersion}{url}";`
`206`		`- requests.Add((method, GetTokenizedUrl(absoluteUrl)));`
	`205`	`+ MethodAndUrl methodAndUrl = new(Method: method, Url: GetTokenizedUrl(absoluteUrl));`
	`206`	`+ requests.Add(methodAndUrl);`
`207`	`207`	`}`
`208`	`208`	`catch { }`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ internal static string GetScopeTypeString(GraphPermissionsType type)`
`47`	`47`	`};`
`48`	`48`	`}`
`49`	`49`
`50`		`- internal async Task<IEnumerable<string>> UpdateUserScopesAsync(IEnumerable<string> minimalScopes, IEnumerable<(string method, string url)> endpoints, GraphPermissionsType permissionsType)`
	`50`	`+ internal async Task<IEnumerable<string>> UpdateUserScopesAsync(IEnumerable<string> minimalScopes, IEnumerable<MethodAndUrl> endpoints, GraphPermissionsType permissionsType)`
`51`	`51`	`{`
`52`		`- var userEndpoints = endpoints.Where(e => e.url.Contains("/users/{", StringComparison.OrdinalIgnoreCase));`
	`52`	`+ var userEndpoints = endpoints.Where(e => e.Url.Contains("/users/{", StringComparison.OrdinalIgnoreCase));`
`53`	`53`	`if (!userEndpoints.Any())`
`54`	`54`	`{`
`55`	`55`	`return minimalScopes;`
`@@ -60,8 +60,8 @@ internal async Task<IEnumerable<string>> UpdateUserScopesAsync(IEnumerable<strin`
`60`	`60`	`var url = $"https://devxapi-func-prod-eastus.azurewebsites.net/permissions?scopeType={GetScopeTypeString(permissionsType)}";`
`61`	`61`	`var urls = userEndpoints.Select(e =>`
`62`	`62`	`{`
`63`		`- _logger.LogDebug("Getting permissions for {Method} {Url}", e.method, e.url);`
`64`		`- return $"{url}&requesturl={e.url}&method={e.method}";`
	`63`	`+ _logger.LogDebug("Getting permissions for {Method} {Url}", e.Method, e.Url);`
	`64`	`+ return $"{url}&requesturl={e.Url}&method={e.Method}";`
`65`	`65`	`});`
`66`	`66`	`var tasks = urls.Select(u =>`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`
`5`	`5`	`namespace DevProxy.Plugins.Utils;`
`6`	`6`
	`7`	`+internal readonly record struct MethodAndUrl(string Method, string Url);`
	`8`	`+`
`7`	`9`	`internal static class MethodAndUrlUtils`
`8`	`10`	`{`
`9`		`- public static (string method, string url) ToMethodAndUrl(string methodAndUrlString)`
	`11`	`+ public static MethodAndUrl ToMethodAndUrl(string methodAndUrlString)`
`10`	`12`	`{`
`11`	`13`	`ArgumentException.ThrowIfNullOrWhiteSpace(methodAndUrlString, nameof(methodAndUrlString));`
`12`	`14`
`@@ -15,6 +17,6 @@ public static (string method, string url) ToMethodAndUrl(string methodAndUrlStri`
`15`	`17`	`{`
`16`	`18`	`info = [info[0], string.Join(" ", info.Skip(1))];`
`17`	`19`	`}`
`18`		`- return (method: info[0], url: info[1]);`
	`20`	`+ return new(Method: info[0], Url: info[1]);`
`19`	`21`	`}`
`20`	`22`	`}`