Merge pull request #107 from TeamLearningFlow/develop

config 수정

Author: JaehoonJung0430

src/main/generated/learningFlow/learningFlow_BE/domain/uuid/QUuid.java

@@ -0,0 +1,47 @@
+package learningFlow.learningFlow_BE.domain.uuid;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QUuid is a Querydsl query type for Uuid
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QUuid extends EntityPathBase<Uuid> {
+
+    private static final long serialVersionUID = 1905925310L;
+
+    public static final QUuid uuid1 = new QUuid("uuid1");
+
+    public final learningFlow.learningFlow_BE.domain.QBaseEntity _super = new learningFlow.learningFlow_BE.domain.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    public final StringPath uuid = createString("uuid");
+
+    public QUuid(String variable) {
+        super(Uuid.class, forVariable(variable));
+    }
+
+    public QUuid(Path<? extends Uuid> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QUuid(PathMetadata metadata) {
+        super(Uuid.class, metadata);
+    }
+
+}
+

src/main/java/learningFlow/learningFlow_BE/config/CorsConfig.java

@@ -7,6 +7,7 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
+import java.util.Arrays;
 import java.util.List;
 
 @Configuration
@@ -16,11 +17,26 @@ public class CorsConfig {
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
+
+        config.setAllowedOrigins(Arrays.asList(
+                "http://localhost:3000",
+                "http://localhost:8081",
+                "http://onboarding.p-e.kr:8080",
+                "http://54.180.118.227",
+                "https://accounts.google.com"
+        ));
+
+        config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+        config.setAllowedHeaders(Arrays.asList("*"));
         config.setAllowCredentials(true);
-        config.setAllowedOrigins(List.of("http://localhost:3000", "http://localhost:8081", "http://localhost:8080", "http://onboarding.p-e.kr:8080", "http://54.180.118.227")); // ✅ Swagger 포함
-        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-        config.setAllowedHeaders(List.of("*"));
-        config.setMaxAge(3600L);
+        config.setExposedHeaders(Arrays.asList(
+                "Authorization",
+                "Refresh-Token",
+                "Access-Control-Allow-Origin",
+                "Access-Control-Allow-Credentials"
+        ));
+        config.setMaxAge(86400L);
+
         source.registerCorsConfiguration("/**", config);
         return new CorsFilter(source);
     }

src/main/java/learningFlow/learningFlow_BE/config/WebConfig.java

@@ -10,8 +10,15 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:3000", "http://localhost:8080", "http://onboarding.p-e.kr:8080")
-//                .allowedOrigins("http://localhost:3000") // 프론트엔드 주소
+                .allowedOriginPatterns("*")  // 개발 중일 때만 사용
+                // 또는 특정 출처만 허용
+                .allowedOrigins(
+                        "http://localhost:3000",
+                        "http://localhost:8081",
+                        "http://onboarding.p-e.kr:8080",
+                        "http://54.180.118.227",
+                        "https://accounts.google.com"
+                )
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
                 .allowedHeaders("*")
                 .allowCredentials(true)

src/main/java/learningFlow/learningFlow_BE/config/security/SecurityConfig.java

@@ -89,10 +89,24 @@ public PasswordEncoder passwordEncoder() {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(List.of("http://localhost:3000", "http://localhost:8080", "http://onboarding.p-e.kr:8080", "http://54.180.118.227")); // 프론트엔드 주소
+
+        configuration.setAllowedOrigins(Arrays.asList(
+                "http://localhost:3000",
+                "http://localhost:8081",
+                "http://onboarding.p-e.kr:8080",
+                "http://54.180.118.227",
+                "https://accounts.google.com"
+        ));
+
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-        configuration.setAllowedHeaders(List.of("*"));
+        configuration.setAllowedHeaders(Arrays.asList("*"));
         configuration.setAllowCredentials(true);
+        configuration.setExposedHeaders(Arrays.asList(
+                "Authorization",
+                "Refresh-Token",
+                "Access-Control-Allow-Origin",
+                "Access-Control-Allow-Credentials"
+        ));
         configuration.setMaxAge(86400L);
 
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();

src/main/resources/application.yml

@@ -24,6 +24,7 @@ spring:
       client:
         registration:
           google:
+            redirect-uri: "http://onboarding.p-e.kr:8080/login/oauth2/code/google"
             client-id: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID}
             client-secret: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET}
             scope: