centralize open isle domain

This commit is contained in:
Tim
2025-07-20 21:27:31 +08:00
parent 6674946c7c
commit 4c98812601
7 changed files with 26 additions and 13 deletions

View File

@@ -25,6 +25,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.beans.factory.annotation.Value;
import java.util.List;
import jakarta.servlet.FilterChain;
@@ -40,6 +41,8 @@ public class SecurityConfig {
private final UserRepository userRepository;
private final AccessDeniedHandler customAccessDeniedHandler;
private final UserVisitService userVisitService;
@Value("${app.website-url}")
private String websiteUrl;
@Bean
public PasswordEncoder passwordEncoder() {
@@ -70,14 +73,14 @@ public class SecurityConfig {
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration cfg = new CorsConfiguration();
cfg.setAllowedOrigins(List.of(
"http://127.0.0.1:8080",
"http://127.0.0.1",
"http://localhost:8080",
"http://localhost",
"http://30.211.97.200:8080",
"http://30.211.97.200",
"https://www.open-isle.com",
"https://open-isle.com"
"http://127.0.0.1:8080",
"http://127.0.0.1",
"http://localhost:8080",
"http://localhost",
"http://30.211.97.200:8080",
"http://30.211.97.200",
websiteUrl,
websiteUrl.replace("://www.", "://")
));
cfg.setAllowedMethods(List.of("GET","POST","PUT","DELETE","OPTIONS"));
cfg.setAllowedHeaders(List.of("*"));

View File

@@ -4,6 +4,7 @@ import com.openisle.model.User;
import com.openisle.service.EmailSender;
import com.openisle.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
public class AdminUserController {
private final UserRepository userRepository;
private final EmailSender emailSender;
@Value("${app.website-url}")
private String websiteUrl;
@PostMapping("/{id}/approve")
public ResponseEntity<?> approve(@PathVariable Long id) {
@@ -20,7 +23,7 @@ public class AdminUserController {
user.setApproved(true);
userRepository.save(user);
emailSender.sendEmail(user.getEmail(), "Registration Approved",
"Your account has been approved. Visit: https://www.open-isle.com");
"Your account has been approved. Visit: " + websiteUrl);
return ResponseEntity.ok().build();
}
@@ -30,7 +33,7 @@ public class AdminUserController {
user.setApproved(false);
userRepository.save(user);
emailSender.sendEmail(user.getEmail(), "Registration Rejected",
"Your account request was rejected. Visit: https://www.open-isle.com");
"Your account request was rejected. Visit: " + websiteUrl);
return ResponseEntity.ok().build();
}
}