2 Commits

Author SHA1 Message Date
Dmitrii Cravcenco
a84c498073 Automatic google auth fix 2023-12-04 16:01:38 +02:00
Dmitrii Cravcenco
aaf67ab09b Automatic google auth fix 2023-12-04 15:57:22 +02:00
5 changed files with 7 additions and 3 deletions

View File

@@ -65,7 +65,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
response.getWriter().write(objectMapper.writeValueAsString(errorResponse)); response.getWriter().write(objectMapper.writeValueAsString(errorResponse));
response.getWriter().flush(); response.getWriter().flush();
return; return;
} }

View File

@@ -45,6 +45,7 @@ public class SecurityConfiguration {
.cors(Customizer.withDefaults()) .cors(Customizer.withDefaults())
.csrf(AbstractHttpConfigurer::disable) .csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(auth -> auth .authorizeHttpRequests(auth -> auth
.requestMatchers("/api/v1/auth/*").permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.oauth2Login(withDefaults()); .oauth2Login(withDefaults());

View File

@@ -14,16 +14,19 @@ public class AuthenticationController {
@PostMapping("/register") @PostMapping("/register")
public ResponseEntity<AuthenticationResponse> register(@RequestBody RegisterRequest request) { public ResponseEntity<AuthenticationResponse> register(@RequestBody RegisterRequest request) {
System.out.println("register");
return ResponseEntity.ok(service.register(request)); return ResponseEntity.ok(service.register(request));
} }
@PostMapping("/authenticate") @PostMapping("/authenticate")
public ResponseEntity<AuthenticationResponse> authenticate(@RequestBody AuthenticationRequest request) { public ResponseEntity<AuthenticationResponse> authenticate(@RequestBody AuthenticationRequest request) {
System.out.println("Refresh token!========================");
return ResponseEntity.ok(service.authenticate(request)); return ResponseEntity.ok(service.authenticate(request));
} }
@PostMapping("/refreshtoken") @PostMapping("/refreshtoken")
public ResponseEntity<AuthenticationResponse> refreshAccessToken(@RequestBody TokenRefreshRequest request) { public ResponseEntity<AuthenticationResponse> refreshAccessToken(@RequestBody TokenRefreshRequest request) {
System.out.println("Refresh token!========================");
return ResponseEntity.ok(service.refreshAccessToken(request)); return ResponseEntity.ok(service.refreshAccessToken(request));
} }
} }

View File

@@ -34,8 +34,6 @@ public class User {
private String username; private String username;
@Transient @Transient
@NotNull(message = "Password must not be null")
@NotEmpty(message = "Password must not be empty")
private String password; private String password;
@OneToMany(mappedBy = "user", fetch = FetchType.LAZY) @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)

View File

@@ -49,6 +49,7 @@ public class AuthenticationService {
String jwtToken = jwtService.generateToken(userDetails); String jwtToken = jwtService.generateToken(userDetails);
String refreshToken = jwtService.generateRefreshToken(userDetails); String refreshToken = jwtService.generateRefreshToken(userDetails);
System.out.println(user);
return AuthenticationResponse.builder() return AuthenticationResponse.builder()
.accessToken(jwtToken) .accessToken(jwtToken)
.refreshToken(refreshToken) .refreshToken(refreshToken)
@@ -113,6 +114,7 @@ public class AuthenticationService {
UserDetails userDetails = new PersonDetails(credential); UserDetails userDetails = new PersonDetails(credential);
String jwtToken = jwtService.generateToken(userDetails); String jwtToken = jwtService.generateToken(userDetails);
String refreshToken = jwtService.generateRefreshToken(userDetails); String refreshToken = jwtService.generateRefreshToken(userDetails);
System.out.println(jwtToken);
return AuthenticationResponse.builder() return AuthenticationResponse.builder()
.accessToken(jwtToken) .accessToken(jwtToken)
.refreshToken(refreshToken) .refreshToken(refreshToken)
@@ -127,6 +129,7 @@ public class AuthenticationService {
UserDetails userDetails = new PersonDetails(credential.get()); UserDetails userDetails = new PersonDetails(credential.get());
String jwtToken = jwtService.generateToken(userDetails); String jwtToken = jwtService.generateToken(userDetails);
System.out.println(jwtToken);
return AuthenticationResponse.builder() return AuthenticationResponse.builder()
.accessToken(jwtToken) .accessToken(jwtToken)
.refreshToken(refreshToken) .refreshToken(refreshToken)