steleks-university-project
/
steleks_backend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:esensar/steleks_web_app

master
esensar 2017-06-10 14:20:36 +02:00
parent d4f86c106c a396521e0b
commit ee2715bfd8
5 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/src/main/java/ba/steleks/CrossOriginConfig.java 100644
View File

@ -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);
}
}

16
events/src/main/java/ba/steleks/controller/EventGalleryController.java
View File

@ -41,7 +41,7 @@ public class EventGalleryController {
@ResponseBody
public ResponseEntity<Resource> 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);

18
steleks-proxy/src/main/java/ba/steles/SteleksProxyApplication.java
View File

@ -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);
}

1
users/build.gradle
View File

@ -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')
}

3
users/src/main/java/ba/steleks/controller/AuthenticationController.java
View File

@ -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)