Skip to content

Commit 1c5c49b

Browse files
authored
Merge pull request #25 from GabrielNatPr0/main
feat: Changes made for new API versioning and organization in the VPN… and fixed routes not authorized
2 parents 056727f + e0faae7 commit 1c5c49b

19 files changed

Lines changed: 88 additions & 67 deletions

.env.example

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# .env.example
2+
3+
# name application
4+
SPRING_APPLICATION_NAME=
5+
6+
# admin configuration
7+
ADMIN_USERNAME=
8+
ADMIN_PASSWORD=
9+
10+
# cache configuration
11+
SERVER_COMPRESSION_MIN_RESPONSE_SIZE=1024 #example value
12+
13+
# JWT Configuration
14+
JWT_SECRET_KEY=

src/main/java/com/example/spring_boot_project/Security/JwtUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public String extractUsername(String token) {
4949
// token expirado
5050
return null;
5151
} catch (JwtException e) {
52-
// assinatura inválida ou outro erro de parsing
5352
return null;
5453
}
5554
}
Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,54 @@
11
package com.example.spring_boot_project.config;
22

3-
import com.example.spring_boot_project.model.User;
4-
import com.example.spring_boot_project.repository.UserRepository;
5-
import org.springframework.beans.factory.annotation.Autowired;
6-
import org.springframework.boot.CommandLineRunner;
7-
import org.springframework.security.crypto.password.PasswordEncoder;
8-
import org.springframework.stereotype.Component;
9-
10-
@Component
11-
public class AdminInitializer implements CommandLineRunner {
12-
13-
@Autowired
14-
private UserRepository userRepository;
15-
16-
@Autowired
17-
private PasswordEncoder passwordEncoder;
18-
19-
@Override
20-
public void run(String... args) {
21-
String tempAdminUsername = System.getenv("ADMIN_USERNAME");
22-
if (tempAdminUsername == null) {
23-
tempAdminUsername = System.getProperty("ADMIN_USERNAME");
24-
}
25-
26-
String tempAdminPassword = System.getenv("ADMIN_PASSWORD");
27-
if (tempAdminPassword == null) {
28-
tempAdminPassword = System.getProperty("ADMIN_PASSWORD");
29-
}
30-
31-
if (tempAdminUsername == null || tempAdminPassword == null) {
32-
System.err.println("⚠️ ADMIN_USERNAME and ADMIN_PASSWORD are not set. Admin will not be created.");
33-
return;
34-
}
35-
36-
final String adminUsername = tempAdminUsername;
37-
final String adminPassword = tempAdminPassword;
38-
39-
userRepository.findByUsername(adminUsername).ifPresentOrElse(
40-
user -> System.out.println(),
41-
() -> {
42-
User admin = new User();
43-
admin.setUsername(adminUsername);
44-
admin.setPassword(passwordEncoder.encode(adminPassword));
45-
admin.setRole("ADMIN");
46-
userRepository.save(admin);
47-
//System.out.println("✅ Admin user created successfully");
48-
}
49-
);
50-
}
51-
}
3+
//import com.example.spring_boot_project.model.User;
4+
//import com.example.spring_boot_project.repository.UserRepository;
5+
//import org.springframework.beans.factory.annotation.Autowired;
6+
//import org.springframework.boot.CommandLineRunner;
7+
//import org.springframework.security.crypto.password.PasswordEncoder;
8+
//import org.springframework.stereotype.Component;
9+
10+
11+
// ----- fix later
12+
13+
//@Component
14+
//public class AdminInitializer implements CommandLineRunner {
15+
//
16+
// @Autowired
17+
// private UserRepository userRepository;
18+
//
19+
// @Autowired
20+
// private PasswordEncoder passwordEncoder;
21+
//
22+
// @Override
23+
// public void run(String... args) {
24+
// String tempAdminUsername = System.getenv("ADMIN_USERNAME");
25+
// if (tempAdminUsername == null) {
26+
// tempAdminUsername = System.getProperty("ADMIN_USERNAME");
27+
// }
28+
//
29+
// String tempAdminPassword = System.getenv("ADMIN_PASSWORD");
30+
// if (tempAdminPassword == null) {
31+
// tempAdminPassword = System.getProperty("ADMIN_PASSWORD");
32+
// }
33+
//
34+
// if (tempAdminUsername == null || tempAdminPassword == null) {
35+
// System.err.println("⚠️ ADMIN_USERNAME and ADMIN_PASSWORD are not set. Admin will not be created.");
36+
// return;
37+
// }
38+
//
39+
// final String adminUsername = tempAdminUsername;
40+
// final String adminPassword = tempAdminPassword;
41+
//
42+
// userRepository.findByUsername(adminUsername).ifPresentOrElse(
43+
// user -> System.out.println(),
44+
// () -> {
45+
// User admin = new User();
46+
// admin.setUsername(adminUsername);
47+
// admin.setPassword(passwordEncoder.encode(adminPassword));
48+
// admin.setRole("ADMIN");
49+
// userRepository.save(admin);
50+
// //System.out.println("✅ Admin user created successfully");
51+
// }
52+
// );
53+
// }
54+
//}

src/main/java/com/example/spring_boot_project/config/SecurityConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
3939
.csrf(AbstractHttpConfigurer::disable)
4040
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
4141
.authorizeHttpRequests(auth -> auth
42-
.requestMatchers("/api/auth/**").permitAll()
43-
.requestMatchers("/test-captcha/**").permitAll() // <-- libera o captcha
42+
.requestMatchers("/api/v1/auth/**").permitAll()
43+
.requestMatchers("/api/v1/test-captcha/**").permitAll() // <-- libera o captcha
4444
.requestMatchers("/error").permitAll()
4545
.anyRequest().authenticated()
4646
)

src/main/java/com/example/spring_boot_project/controller/AuthController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.Optional;
1414

1515
@RestController
16-
@RequestMapping("/api/auth")
16+
@RequestMapping("/api/v1/auth")
1717
public class AuthController {
1818
private final UserService userService;
1919
private final BCryptPasswordEncoder passwordEncoder;

src/main/java/com/example/spring_boot_project/controller/CaptchaTestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.Map;
1010

1111
@RestController
12-
@RequestMapping("/test-captcha")
12+
@RequestMapping("api/v1/test-captcha")
1313
public class CaptchaTestController {
1414

1515
@GetMapping

src/main/java/com/example/spring_boot_project/controller/CartController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.web.bind.annotation.*;
88

99
@RestController
10-
@RequestMapping("/cart")
10+
@RequestMapping("api/v1/cart")
1111
public class CartController {
1212

1313
@Autowired

src/main/java/com/example/spring_boot_project/controller/HelloController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.web.bind.annotation.RestController;
66

77
@RestController
8-
@RequestMapping("/api")
8+
@RequestMapping("/api/v1")
99
public class HelloController {
1010
@GetMapping("/hello")
1111
public String hello(){

src/main/java/com/example/spring_boot_project/controller/MessageCompressionControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.web.bind.annotation.RestController;
66

77
@RestController
8-
@RequestMapping("/api")
8+
@RequestMapping("/api/v1")
99
public class MessageCompressionControllerTest {
1010
@GetMapping("/compress")
1111
public String compressMessage(String message) {

src/main/java/com/example/spring_boot_project/controller/MessageCompressionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.web.bind.annotation.RestController;
66

77
@RestController
8-
@RequestMapping("/api")
8+
@RequestMapping("/api/v1")
99
public class MessageCompressionTest {
1010
@GetMapping("/compression")
1111
public String helloCompression(){

0 commit comments

Comments
 (0)