Commit 3780ad8a authored by Alex Segers's avatar Alex Segers

Merge branch 'fix/mongodb_config' into 'dev'

🔀  FIX: 🔧  MongoDB configuration file [@asegers]

See merge request !47
parents 8e280738 35bdc027
Pipeline #1766 failed with stage
in 39 seconds
File deleted
...@@ -16,12 +16,16 @@ public class AuthWebFilter implements WebFilter { ...@@ -16,12 +16,16 @@ public class AuthWebFilter implements WebFilter {
@Override @Override
public Mono<Void> filter(ServerWebExchange serverWebExchange, WebFilterChain webFilterChain) { public Mono<Void> filter(ServerWebExchange serverWebExchange, WebFilterChain webFilterChain) {
// String origin = serverWebExchange.getRequest().getHeaders().getOrigin(); String path = serverWebExchange.getRequest().getPath().toString();
// if (managerTokenVerifier.hasTokenHeader(serverWebExchange)) {
// String token = managerTokenVerifier.getTokenHeader(serverWebExchange); if (!path.contains("/api/managers/")) return webFilterChain.filter(serverWebExchange);
// if (managerTokenVerifier.isTokenValid(token))
if (managerTokenVerifier.hasTokenHeader(serverWebExchange)) {
String token = managerTokenVerifier.getTokenHeader(serverWebExchange);
if (managerTokenVerifier.isTokenValid(token))
return webFilterChain.filter(serverWebExchange); return webFilterChain.filter(serverWebExchange);
// } }
// return Mono.error(new BadAccessTokenException());
return Mono.error(new BadAccessTokenException());
} }
} }
...@@ -10,13 +10,16 @@ import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory; ...@@ -10,13 +10,16 @@ import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
@Configuration @Configuration
public class MongoConfig { public class MongoConfig {
@Value("${spring.data.mongodb.database}") @Value("${spring.data.mongodb.database:myFirstDatabase}")
public String databaseName; public String database;
@Value("${spring.data.mongodb.uri:mongodb+srv://user:password2021@cluster0.g23rm.mongodb.net/myFirstDatabase?}")
public String uri;
@Bean @Bean
public SimpleReactiveMongoDatabaseFactory reactiveMongoDbFactory() { public SimpleReactiveMongoDatabaseFactory reactiveMongoDbFactory() {
MongoClient mongoClient = MongoClients.create(); MongoClient mongoClient = MongoClients.create(uri);
return new SimpleReactiveMongoDatabaseFactory(mongoClient, databaseName); return new SimpleReactiveMongoDatabaseFactory(mongoClient, database);
} }
@Bean @Bean
......
...@@ -18,6 +18,7 @@ import javax.validation.Valid; ...@@ -18,6 +18,7 @@ import javax.validation.Valid;
@RestController @RestController
@AuthManagerController @AuthManagerController
@RequestMapping("/api/managers/") @RequestMapping("/api/managers/")
@CrossOrigin
public class ManagerController { public class ManagerController {
@Autowired @Autowired
ManagerService managerService; ManagerService managerService;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment