kangaroo-and-rabbit/karideo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEV] remove seurity that is not working

Browse Source
This commit is contained in:
Edouard DUPIN 2022-05-22 01:02:53 +02:00
parent a958602dd2
commit 3ad7a07616
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/src/org/kar/karideo/api/DataResource.java
View File

@ -329,7 +329,7 @@ public class DataResource {
@POST @POST
@Path("/upload/") @Path("/upload/")
@Consumes({MediaType.MULTIPART_FORM_DATA}) @Consumes({MediaType.MULTIPART_FORM_DATA})
@RolesAllowed("USER") //@RolesAllowed("USER")
public Response uploadFile(@Context SecurityContext sc, @FormDataParam("file") InputStream fileInputStream, @FormDataParam("file") FormDataContentDisposition fileMetaData) { public Response uploadFile(@Context SecurityContext sc, @FormDataParam("file") InputStream fileInputStream, @FormDataParam("file") FormDataContentDisposition fileMetaData) {
GenericContext gc = (GenericContext) sc.getUserPrincipal(); GenericContext gc = (GenericContext) sc.getUserPrincipal();
System.out.println("==================================================="); System.out.println("===================================================");
@ -351,7 +351,7 @@ public class DataResource {
//@Secured //@Secured
@GET @GET
@Path("{id}") @Path("{id}")
@RolesAllowed("USER") //@RolesAllowed("USER")
@Produces(MediaType.APPLICATION_OCTET_STREAM) @Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response retriveDataId(@Context SecurityContext sc, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception { public Response retriveDataId(@Context SecurityContext sc, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
GenericContext gc = (GenericContext) sc.getUserPrincipal(); GenericContext gc = (GenericContext) sc.getUserPrincipal();
@ -370,7 +370,7 @@ public class DataResource {
//@Secured //@Secured
@GET @GET
@Path("thumbnail/{id}") @Path("thumbnail/{id}")
@RolesAllowed("USER") //@RolesAllowed("USER")
@Produces(MediaType.APPLICATION_OCTET_STREAM) @Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response retriveDataThumbnailId(@Context SecurityContext sc, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception { public Response retriveDataThumbnailId(@Context SecurityContext sc, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
GenericContext gc = (GenericContext) sc.getUserPrincipal(); GenericContext gc = (GenericContext) sc.getUserPrincipal();
@ -417,7 +417,7 @@ public class DataResource {
//@Secured //@Secured
@GET @GET
@Path("{id}/{name}") @Path("{id}/{name}")
@RolesAllowed("USER") //@RolesAllowed("USER")
@Produces(MediaType.APPLICATION_OCTET_STREAM) @Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response retriveDataFull(@Context SecurityContext sc, @HeaderParam("Range") String range, @PathParam("id") Long id, @PathParam("name") String name) throws Exception { public Response retriveDataFull(@Context SecurityContext sc, @HeaderParam("Range") String range, @PathParam("id") Long id, @PathParam("name") String name) throws Exception {
GenericContext gc = (GenericContext) sc.getUserPrincipal(); GenericContext gc = (GenericContext) sc.getUserPrincipal();

2
front/src/app/service/data.ts
View File

@ -47,7 +47,7 @@ export class DataService {
return this.http.requestImage({ return this.http.requestImage({
endPoint: this.serviceName + "/thumbnail/" + _id, endPoint: this.serviceName + "/thumbnail/" + _id,
requestType: HTTPRequestModel.GET, requestType: HTTPRequestModel.GET,
accept: HTTPMimeType.IMAGE, accept: HTTPMimeType.ALL,//IMAGE,
contentType: HTTPMimeType.JSON, contentType: HTTPMimeType.JSON,
}); });
} }

3
front/src/app/service/http-wrapper.ts
View File

@ -86,6 +86,9 @@ export class HttpWrapperService {
'Content-Type': properties.contentType, 'Content-Type': properties.contentType,
'authorization': properties.authorization, 'authorization': properties.authorization,
} }
/*if (properties.requestType === HTTPRequestModel.GET) {
headers['Content-Type'] = undefined;
}*/
console.log(`disble tocken : ${JSON.stringify(properties)} properties.disableTocken=${properties.disableTocken}`); console.log(`disble tocken : ${JSON.stringify(properties)} properties.disableTocken=${properties.disableTocken}`);
if (properties.disableTocken === undefined || properties.disableTocken === null || properties.disableTocken === true) { if (properties.disableTocken === undefined || properties.disableTocken === null || properties.disableTocken === true) {
headers = this.addTokenIfNeeded(headers); headers = this.addTokenIfNeeded(headers);