From e775a3cd6d85ed7bf7c7c44ed7db63dec2b0c817 Mon Sep 17 00:00:00 2001 From: AbdellahASKI Date: Wed, 16 Jan 2019 15:32:18 +0100 Subject: [PATCH] Final changes --- .../aski/catalogueservice/security/JWTAuthorizationFilter.java | 1 + .../java/me/aski/catalogueservice/web/ProductController.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/me/aski/catalogueservice/security/JWTAuthorizationFilter.java b/src/main/java/me/aski/catalogueservice/security/JWTAuthorizationFilter.java index 236b917..6f08496 100644 --- a/src/main/java/me/aski/catalogueservice/security/JWTAuthorizationFilter.java +++ b/src/main/java/me/aski/catalogueservice/security/JWTAuthorizationFilter.java @@ -26,6 +26,7 @@ public class JWTAuthorizationFilter extends OncePerRequestFilter { response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT, PATCH"); String allHeaders = "No-Auth, Accept, Accept-CH, Accept-Charset, Accept-Datetime, Accept-Encoding, Accept-Ext, Accept-Features, Accept-Language, Accept-Params, Accept-Ranges, Access-Control-Allow-Credentials, Access-Control-Allow-Headers, Access-Control-Allow-Methods, Access-Control-Allow-Origin, Access-Control-Expose-Headers, Access-Control-Max-Age, Access-Control-Request-Headers, Access-Control-Request-Method, Age, Allow, Alternates, Authentication-Info, Authorization, C-Ext, C-Man, C-Opt, C-PEP, C-PEP-Info, CONNECT, Cache-Control, Compliance, Connection, Content-Base, Content-Disposition, Content-Encoding, Content-ID, Content-Language, Content-Length, Content-Location, Content-MD5, Content-Range, Content-Script-Type, Content-Security-Policy, Content-Style-Type, Content-Transfer-Encoding, Content-Type, Content-Version, Cookie, Cost, DAV, DELETE, DNT, DPR, Date, Default-Style, Delta-Base, Depth, Derived-From, Destination, Differential-ID, Digest, ETag, Expect, Expires, Ext, From, GET, GetProfile, HEAD, HTTP-date, Host, IM, If, If-Match, If-Modified-Since, If-None-Match, If-Range, If-Unmodified-Since, Keep-Alive, Label, Last-Event-ID, Last-Modified, Link, Location, Lock-Token, MIME-Version, Man, Max-Forwards, Media-Range, Message-ID, Meter, Negotiate, Non-Compliance, OPTION, OPTIONS, OWS, Opt, Optional, Ordering-Type, Origin, Overwrite, P3P, PEP, PICS-Label, POST, PUT, Pep-Info, Permanent, Position, Pragma, ProfileObject, Protocol, Protocol-Query, Protocol-Request, Proxy-Authenticate, Proxy-Authentication-Info, Proxy-Authorization, Proxy-Features, Proxy-Instruction, Public, RWS, Range, Referer, Refresh, Resolution-Hint, Resolver-Location, Retry-After, Safe, Sec-Websocket-Extensions, Sec-Websocket-Key, Sec-Websocket-Origin, Sec-Websocket-Protocol, Sec-Websocket-Version, Security-Scheme, Server, Set-Cookie, Set-Cookie2, SetProfile, SoapAction, Status, Status-URI, Strict-Transport-Security, SubOK, Subst, Surrogate-Capability, Surrogate-Control, TCN, TE, TRACE, Timeout, Title, Trailer, Transfer-Encoding, UA-Color, UA-Media, UA-Pixels, UA-Resolution, UA-Windowpixels, URI, Upgrade, User-Agent, Variant-Vary, Vary, Version, Via, Viewport-Width, WWW-Authenticate, Want-Digest, Warning, Width, X-Content-Duration, X-Content-Security-Policy, X-Content-Type-Options, X-CustomHeader, X-DNSPrefetch-Control, X-Forwarded-For, X-Forwarded-Port, X-Forwarded-Proto, X-Frame-Options, X-Modified, X-OTHER, X-PING, X-PINGOTHER, X-Powered-By, X-Requested-With"; response.setHeader("Access-Control-Allow-Headers", allHeaders); + response.setHeader("Access-Control-Expose-Headers", allHeaders); response.setHeader("Access-Control-Allow-Credentials", "true"); if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { diff --git a/src/main/java/me/aski/catalogueservice/web/ProductController.java b/src/main/java/me/aski/catalogueservice/web/ProductController.java index 7902ad9..304a33c 100644 --- a/src/main/java/me/aski/catalogueservice/web/ProductController.java +++ b/src/main/java/me/aski/catalogueservice/web/ProductController.java @@ -25,6 +25,8 @@ public class ProductController { @PostMapping("/customProducts") public ResponseEntity postProduct(@RequestBody ProductForm form) { + form.setCategory(form.getCategory().split("/")[form.getCategory().split("/").length - 1]); + Category c = categoryRepository.findById(form.getCategory()).get(); Product p = productRepository.save(new Product(null, form.getName(), form.getPrice(), c)); c.getProducts().add(p); @@ -36,6 +38,7 @@ public class ProductController { public ResponseEntity putProduct(@RequestBody ProductForm form) { form.setCategory(form.getCategory().split("/")[form.getCategory().split("/").length - 1]); + form.setId(form.getId().split("/")[form.getId().split("/").length - 1]); Product product = productRepository.findById(form.getId()).get();