From f0be249b0f23a70f38542855a6e8279411798716 Mon Sep 17 00:00:00 2001 From: dizda13 Date: Thu, 8 Jun 2017 22:24:00 +0200 Subject: [PATCH] bug fix in EventGaleryController, diffrent name of link in database and real link for getting image --- .../java/ba/steleks/CrossOriginConfig.java | 29 +++++++++++++++++++ .../controller/EventGalleryController.java | 16 ++++++---- .../ba/steles/SteleksProxyApplication.java | 18 ------------ users/build.gradle | 1 + .../controller/AuthenticationController.java | 3 ++ 5 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 common/src/main/java/ba/steleks/CrossOriginConfig.java diff --git a/common/src/main/java/ba/steleks/CrossOriginConfig.java b/common/src/main/java/ba/steleks/CrossOriginConfig.java new file mode 100644 index 0000000..d7ba93e --- /dev/null +++ b/common/src/main/java/ba/steleks/CrossOriginConfig.java @@ -0,0 +1,29 @@ +package ba.steleks; +/** + * Created by admin on 06/05/2017. + */ +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +@Configuration +public class CrossOriginConfig { + + @Bean + public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + config.addAllowedOrigin("*"); + config.addAllowedHeader("*"); + config.addAllowedMethod("OPTIONS"); + config.addAllowedMethod("GET"); + config.addAllowedMethod("POST"); + config.addAllowedMethod("PUT"); + config.addAllowedMethod("DELETE"); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } +} \ No newline at end of file diff --git a/events/src/main/java/ba/steleks/controller/EventGalleryController.java b/events/src/main/java/ba/steleks/controller/EventGalleryController.java index ed42542..c5d0316 100644 --- a/events/src/main/java/ba/steleks/controller/EventGalleryController.java +++ b/events/src/main/java/ba/steleks/controller/EventGalleryController.java @@ -41,7 +41,7 @@ public class EventGalleryController { @ResponseBody public ResponseEntity serveFile(@PathVariable String filename) { - Resource file = storageService.loadAsResource("mediaEvent/"+filename); + Resource file = storageService.loadAsResource("eventPictures/"+filename); return ResponseEntity .ok() .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\""+file.getFilename()+"\"") @@ -54,15 +54,21 @@ public class EventGalleryController { String mediaServiceBase = discoveryClient.getServiceUrl(Service.EVENTS); - + System.out.println(mediaServiceBase); String[] names = file.getOriginalFilename().split("\\."); - String dest = String.valueOf("mediaEvent/" + mediaId + "_" + new Date().getTime()) + "." + names[names.length - 1]; + String dest = String.valueOf("eventPictures/" + mediaId + "_" + new Date().getTime()) + "." + names[names.length - 1]; storageService.store(file, dest); redirectAttributes.addFlashAttribute("message", "You successfully uploaded " + file.getOriginalFilename() + "!"); - + System.out.println(dest); Media media = repository.findOne(mediaId); - media.setContentUrl(mediaServiceBase +"/" + dest); + if(media==null){ + media= new Media(); + media.setContentUrl(mediaServiceBase +"/" + dest); + media.setCreatedById(0); + repository.save(media); + }else + media.setContentUrl(mediaServiceBase +"/" + dest); repository.save(media); diff --git a/steleks-proxy/src/main/java/ba/steles/SteleksProxyApplication.java b/steleks-proxy/src/main/java/ba/steles/SteleksProxyApplication.java index b8f1328..a4cfc3f 100644 --- a/steleks-proxy/src/main/java/ba/steles/SteleksProxyApplication.java +++ b/steleks-proxy/src/main/java/ba/steles/SteleksProxyApplication.java @@ -14,24 +14,6 @@ import org.springframework.web.filter.CorsFilter; @SpringBootApplication public class SteleksProxyApplication { - @Bean - public CorsFilter corsFilter() { - final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - final CorsConfiguration config = new CorsConfiguration(); - config.setAllowCredentials(true); - config.addAllowedOrigin("*"); - config.addAllowedHeader("*"); - config.addAllowedMethod("OPTIONS"); - config.addAllowedMethod("HEAD"); - config.addAllowedMethod("GET"); - config.addAllowedMethod("PUT"); - config.addAllowedMethod("POST"); - config.addAllowedMethod("DELETE"); - config.addAllowedMethod("PATCH"); - source.registerCorsConfiguration("/**", config); - return new CorsFilter(source); - } - public static void main(String[] args) { SpringApplication.run(SteleksProxyApplication.class, args); } diff --git a/users/build.gradle b/users/build.gradle index 8c9d32d..5af015b 100644 --- a/users/build.gradle +++ b/users/build.gradle @@ -40,6 +40,7 @@ dependencies { compile('org.springframework.cloud:spring-cloud-starter-eureka') compile('io.jsonwebtoken:jjwt:0.7.0') compile project(':common') + compile('org.springframework.security:spring-security-jwt') testCompile('org.springframework.cloud:spring-cloud-starter-eureka-server') } diff --git a/users/src/main/java/ba/steleks/controller/AuthenticationController.java b/users/src/main/java/ba/steleks/controller/AuthenticationController.java index 18ff246..caea988 100644 --- a/users/src/main/java/ba/steleks/controller/AuthenticationController.java +++ b/users/src/main/java/ba/steleks/controller/AuthenticationController.java @@ -10,6 +10,7 @@ import ba.steleks.security.token.TokenStore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; + import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.*; @@ -27,6 +28,7 @@ public class AuthenticationController { private TokenStore tokenStore; @Autowired + public AuthenticationController(UsersJpaRepository usersJpaRepository, PasswordEncoder passwordEncoder, TokenStore tokenStore) { this.usersJpaRepository = usersJpaRepository; this.passwordEncoder = passwordEncoder; @@ -59,6 +61,7 @@ public class AuthenticationController { throw new CustomHttpStatusException(HttpStatus.UNAUTHORIZED, "Invalid password!"); } + } @RequestMapping(path = "/accesstoken/{token}", method = RequestMethod.DELETE)