Fixed #1674: duplicated route prefix in profiler urls

adamwojs · adamwojs · commit 360a03c1b9fc · 2021-08-01T19:33:40.000+02:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java
@@ -128,7 +128,7 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@
             if(tokenLink != null) {
                 String href = tokenLink.getAttributeValue("href");
                 if(StringUtils.isNotBlank(href)) {
-                    profilerUrl = StringUtils.stripEnd(baseUrl, "/") + href;
+                    profilerUrl = getProfilerAbsoluteUrl(baseUrl, href);
                 }
             }
 
@@ -153,6 +153,11 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@
         return requests;
     }
 
+    @NotNull
+    private static String getProfilerAbsoluteUrl(@NotNull String baseUrl, @NotNull String href) {
+        return StringUtils.stripEnd(baseUrl, "/") + href.substring(href.indexOf("/_profiler/"));
+    }
+
     @NotNull
     public static Collection<ProfilerRequestInterface> collectHttpDataForRequest(@NotNull Project project, @NotNull Collection<ProfilerRequestInterface> requests) {
         Collection<Callable<ProfilerRequestInterface>> callable = requests.stream().map(

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@`
`128`	`128`	`if(tokenLink != null) {`
`129`	`129`	`String href = tokenLink.getAttributeValue("href");`
`130`	`130`	`if(StringUtils.isNotBlank(href)) {`
`131`		`- profilerUrl = StringUtils.stripEnd(baseUrl, "/") + href;`
	`131`	`+ profilerUrl = getProfilerAbsoluteUrl(baseUrl, href);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`@@ -153,6 +153,11 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@`
`153`	`153`	`return requests;`
`154`	`154`	`}`
`155`	`155`
	`156`	`+ @NotNull`
	`157`	`+ private static String getProfilerAbsoluteUrl(@NotNull String baseUrl, @NotNull String href) {`
	`158`	`+ return StringUtils.stripEnd(baseUrl, "/") + href.substring(href.indexOf("/_profiler/"));`
	`159`	`+ }`
	`160`	`+`
`156`	`161`	`@NotNull`
`157`	`162`	`public static Collection<ProfilerRequestInterface> collectHttpDataForRequest(@NotNull Project project, @NotNull Collection<ProfilerRequestInterface> requests) {`
`158`	`163`	`Collection<Callable<ProfilerRequestInterface>> callable = requests.stream().map(`