Revert redirect endpoint, fix jwt filter logic

hms-dbmi · Nov 8, 2024 · 3e26b93 · 3e26b93
1 parent 223034b
commit 3e26b93
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java
@@ -245,15 +245,4 @@ public Response getProxy(
         return proxyWebClient.getProxy(containerId, request, uriInfo.getQueryParameters(), headers);
     }
 
-    @GET
-    @Path("/query/{queryId}/signed-redirect")
-    @Consumes("*/*")
-    public Response getSignedRedirect(
-            @PathParam("queryId") UUID queryId,
-            @QueryParam("target") String target,
-            @Parameter QueryRequest credentialsQueryRequest,
-            @Context HttpHeaders headers) {
-        return queryService.getSignedRedirect(queryId, credentialsQueryRequest, headers, target);
-    }
-
 }
diff --git a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/security/JWTFilter.java b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/security/JWTFilter.java
@@ -244,7 +244,7 @@ private HashMap<String, Object> prepareRequestMap(ContainerRequestContext reques
             // Read the query from the backing store if we are getting the results (full query may not be specified in request)
             if (requestPath.startsWith("/query/") &&
                     (requestPath.endsWith("result") || requestPath.endsWith("result/") ||
-                            requestPath.endsWith("signed-redirect") || requestPath.endsWith("signed-redirect/"))
+                            requestPath.endsWith("signed-url") || requestPath.endsWith("signed-url/"))
             ) {
                 // Path: /query/{queryId}/result
                 String[] pathParts = requestPath.split("/");

diff --git a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/service/PicsureQueryService.java b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/service/PicsureQueryService.java
@@ -430,17 +430,5 @@ private Resource verifyQueryRequest(QueryRequest dataQueryRequest, HttpHeaders h
         );
         return resource;
     }
-
-    public Response getSignedRedirect(UUID queryId, QueryRequest credentialsQueryRequest, HttpHeaders headers, String target) {
-        Response response = this.queryResultSignedUrl(queryId, credentialsQueryRequest, headers);
-        String responseString = response.getEntity().toString();
-        try {
-            SignedUrlResponse signedUrlResponse = mapper.readValue(responseString, SignedUrlResponse.class);
-            String formattedString = String.format(target, URLEncoder.encode(signedUrlResponse.getSignedUrl(), StandardCharsets.UTF_8));
-            return Response.status(Response.Status.FOUND).location(URI.create(formattedString)).build();
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }