Fixed failing bitbucket integration tests - Delete unused SlackLinkUn…

…installPermissionResourceFilter. Use correct URI builder method in AddQueryParamSlackFunction
atlassian-labs · Jun 2, 2024 · 1706a2c · 1706a2c
1 parent fbde1dc
commit 1706a2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 44 deletions.
diff --git a/...ain/java/com/atlassian/plugins/slack/rest/SlackLinkUninstallPermissionResourceFilter.java b/...ain/java/com/atlassian/plugins/slack/rest/SlackLinkUninstallPermissionResourceFilter.java
diff --git a/...tion-common/src/main/java/com/atlassian/plugins/slack/soy/AddQueryParamSlackFunction.java b/...tion-common/src/main/java/com/atlassian/plugins/slack/soy/AddQueryParamSlackFunction.java
@@ -3,6 +3,8 @@
 import com.atlassian.soy.renderer.SoyServerFunction;
 
 import javax.ws.rs.core.UriBuilder;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Set;
 
@@ -22,7 +24,8 @@ public Set<Integer> validArgSizes() {
 
     @Override
     public String apply(final Object... args) {
-        return UriBuilder.fromUri(args[0].toString())
+        String decodedUri = URLDecoder.decode(args[0].toString(), StandardCharsets.UTF_8);
+        return UriBuilder.fromUri(decodedUri)
                 .replaceQueryParam(args[1].toString(), args[2].toString())
                 .build()
                 .toString();