From 1cebe698724c0ff4facb2bb0dd6c6c8a082f6963 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Tue, 24 May 2022 00:19:17 +0200
Subject: [PATCH] Wrong names query

---
 back/src/org/kar/karideo/AuthenticationFilter.java | 2 ++
 back/src/org/kar/karideo/api/DataResource.java     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/back/src/org/kar/karideo/AuthenticationFilter.java b/back/src/org/kar/karideo/AuthenticationFilter.java
index 306296e..d0f5817 100644
--- a/back/src/org/kar/karideo/AuthenticationFilter.java
+++ b/back/src/org/kar/karideo/AuthenticationFilter.java
@@ -11,6 +11,7 @@ import org.kar.karideo.model.UserSmall;
 
 import javax.annotation.Priority;
 import javax.ws.rs.Priorities;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.container.ResourceInfo;
@@ -83,6 +84,7 @@ public class AuthenticationFilter implements ContainerRequestFilter {
             System.out.println("  param: " + item.getKey() + " ==>" + item.getValue());
         }
         System.out.println("   -------------------------------");
+        // need to add "@QueryParam("p") String token, " in the model
         MultivaluedMap<String, String> quaryparam = requestContext.getUriInfo().getQueryParameters();
         for (Entry<String, List<String>> item: quaryparam.entrySet()) {
             System.out.println("  query: " + item.getKey() + " ==>" + item.getValue());
diff --git a/back/src/org/kar/karideo/api/DataResource.java b/back/src/org/kar/karideo/api/DataResource.java
index ee44a1c..a07a41d 100644
--- a/back/src/org/kar/karideo/api/DataResource.java
+++ b/back/src/org/kar/karideo/api/DataResource.java
@@ -350,7 +350,7 @@ public class DataResource {
     @PermitTokenInURI
     @RolesAllowed("USER")
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response retriveDataId(@Context SecurityContext sc, @QueryParam("p") String token, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
+    public Response retriveDataId(@Context SecurityContext sc, @QueryParam("Yota") String token, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
     	GenericContext gc = (GenericContext) sc.getUserPrincipal();
         System.out.println("===================================================");
         System.out.println("== DATA retriveDataId ? " + (gc==null?"null":gc.user));
@@ -370,7 +370,7 @@ public class DataResource {
     @RolesAllowed("USER")
     @PermitTokenInURI
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response retriveDataThumbnailId(@Context SecurityContext sc, @QueryParam("p") String token, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
+    public Response retriveDataThumbnailId(@Context SecurityContext sc, @QueryParam("Yota") String token, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
         GenericContext gc = (GenericContext) sc.getUserPrincipal();
         System.out.println("===================================================");
         System.out.println("== DATA retriveDataThumbnailId ? " + (gc==null?"null":gc.user));
@@ -418,7 +418,7 @@ public class DataResource {
     @PermitTokenInURI
     @RolesAllowed("USER")
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response retriveDataFull(@Context SecurityContext sc, @QueryParam("p") String token, @HeaderParam("Range") String range, @PathParam("id") Long id, @PathParam("name") String name) throws Exception {
+    public Response retriveDataFull(@Context SecurityContext sc, @QueryParam("Yota") String token, @HeaderParam("Range") String range, @PathParam("id") Long id, @PathParam("name") String name) throws Exception {
         GenericContext gc = (GenericContext) sc.getUserPrincipal();
         System.out.println("===================================================");
         System.out.println("== DATA retriveDataFull ? " + (gc==null?"null":gc.user));