Skip to content

Commit bdbf77f

Browse files
authored
Merge pull request #22 from Halbes-Byte/chore/centralize-used-metadata
Chore/centralize used metadata
2 parents 3936ee1 + 1974c65 commit bdbf77f

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

server/src/main/java/com/studybuddies/server/configuration/CORS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class CORS {
1414
public CorsConfigurationSource cors() {
1515
CorsConfiguration conf = new CorsConfiguration();
1616
conf.setAllowedOrigins(Arrays.asList("http://localhost:3000", "http://localhost:7070"));
17-
conf.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE"));
17+
conf.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
1818
conf.setAllowedHeaders(List.of("*"));
1919
conf.setAllowCredentials(true);
2020
conf.setMaxAge(3600L);

server/src/main/java/com/studybuddies/server/configuration/JwtAuthConverter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Set;
77
import java.util.stream.Collectors;
88
import java.util.stream.Stream;
9+
import lombok.extern.slf4j.Slf4j;
910
import org.springframework.core.convert.converter.Converter;
1011
import org.springframework.security.authentication.AbstractAuthenticationToken;
1112
import org.springframework.security.core.GrantedAuthority;
@@ -15,6 +16,7 @@
1516
import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
1617
import org.springframework.stereotype.Component;
1718

19+
@Slf4j
1820
@Component
1921
public class JwtAuthConverter implements Converter<Jwt, AbstractAuthenticationToken> {
2022

@@ -27,6 +29,7 @@ public AbstractAuthenticationToken convert(Jwt source) {
2729
extractRoles(source).stream())
2830
.collect(Collectors.toSet());
2931

32+
3033
return new JwtAuthenticationToken(source, auths);
3134
}
3235

server/src/main/java/com/studybuddies/server/configuration/SecurityConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.studybuddies.server.configuration;
22

33
import lombok.RequiredArgsConstructor;
4+
import org.springframework.beans.factory.annotation.Autowired;
45
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
67
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
@@ -31,6 +32,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
3132
jwt.jwtAuthenticationConverter(jwtAuthConverter)
3233
)
3334
);
35+
http.authorizeHttpRequests(auth -> auth.anyRequest().authenticated());
3436
return http.build();
3537
}
3638
}

server/src/main/java/com/studybuddies/server/web/MeetingController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public ResponseEntity<?> changeMeeting(@RequestParam Long id, @Valid @RequestBod
3232
}
3333

3434
@GetMapping
35-
//@PreAuthorize("hasRole('ADMIN')")
3635
public ResponseEntity<?> getMeeting(@RequestParam(required = false) Long id) {
3736
String response = meetingService.retrieveMeetingFromDatabase(id);
3837
return ResponseEntity.status(HttpStatus.OK).body(response);

0 commit comments

Comments
 (0)