From 500a4b0b7edb33b97099816b1a0044b249a53049 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Mon, 19 Feb 2024 04:35:08 -0500
Subject: [PATCH] [M] Move security config

---
 .../aqua/security/config/SecurityConfig.java  | 43 -------------------
 .../icu/samnyan/aqua/spring/SecurityConfig.kt | 20 +++++++++
 2 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 src/main/java/icu/samnyan/aqua/security/config/SecurityConfig.java
 create mode 100644 src/main/java/icu/samnyan/aqua/spring/SecurityConfig.kt

diff --git a/src/main/java/icu/samnyan/aqua/security/config/SecurityConfig.java b/src/main/java/icu/samnyan/aqua/security/config/SecurityConfig.java
deleted file mode 100644
index 3fc549ca..00000000
--- a/src/main/java/icu/samnyan/aqua/security/config/SecurityConfig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package icu.samnyan.aqua.security.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.Customizer;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig {
-
-    @Bean
-    CorsConfigurationSource corsConfigurationSource() {
-        CorsConfiguration config = new CorsConfiguration();
-        config.setAllowedOrigins(Collections.singletonList("*"));
-        config.setAllowedHeaders(Collections.singletonList("*"));
-        config.setAllowedMethods(Arrays.asList("GET", "PUT", "POST", "DELETE", "OPTIONS"));
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/api/**", config);
-        return source;
-    }
-
-    @Bean
-    public SecurityFilterChain configure(HttpSecurity http) throws Exception {
-        http.headers(headers -> headers.disable())
-                .cors(Customizer.withDefaults())
-                .csrf(csrf -> csrf.disable())
-                .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll());
-
-        return http.build();
-    }
-}
diff --git a/src/main/java/icu/samnyan/aqua/spring/SecurityConfig.kt b/src/main/java/icu/samnyan/aqua/spring/SecurityConfig.kt
new file mode 100644
index 00000000..f5aaa776
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/spring/SecurityConfig.kt
@@ -0,0 +1,20 @@
+package icu.samnyan.aqua.spring
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.security.config.Customizer
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
+import org.springframework.security.web.SecurityFilterChain
+
+@Configuration
+@EnableWebSecurity
+class SecurityConfig() {
+    @Bean
+    fun configure(http: HttpSecurity): SecurityFilterChain = http
+        .headers { it.disable() }
+        .cors(Customizer.withDefaults())
+        .csrf { it.disable() }
+        .authorizeHttpRequests { it.anyRequest().permitAll() }
+        .build()
+}