Merge pull request #138 from TeamLearningFlow/develop

Develop

Author: MODUGGAGI

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

@@ -54,10 +54,14 @@ public SecurityFilterChain filterChain(HttpSecurity http, JwtAuthenticationFilte
                                 "/",
                                 "/collections/{collectionId:[\\d]+}",
                                 "/image/upload", //이미지 업로드는 허용
-                                "/favicon.ico"
+                                "/favicon.ico",
+                                "/register",
+                                "/register/complete",
+                                "/login",
+                                "/login/google",
+                                "/oauth2/**",
+                                "/login/oauth2/**"
                         ).permitAll()
-                        .requestMatchers(
-                                "/register", "/register/complete", "/login", "/login/google", "/oauth2/**", "/login/oauth2/**").permitAll()
                         .requestMatchers("/admin/**").hasRole("ADMIN")
                         .requestMatchers("/user/**", "/resources/**", "/collections/{collectionId:[\\d]+}/likes", "/logout/**").authenticated()
                         .anyRequest().permitAll()

src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java

@@ -123,16 +123,8 @@ public ApiResponse<UserResponseDTO.UserLoginResponseDTO> login(
      */
     @GetMapping("/login/google")
     @Operation(summary = "구글 로그인 리다이렉트", description = "구글 로그인 페이지로 리다이렉트하는 API\n"+"리다이렉트해야하므로 swagger에서는 테스트 불가!")
-    public ResponseEntity<String> googleLogin(HttpServletResponse response) throws IOException {
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setAccessControlAllowOrigin("*");
-        headers.setAccessControlAllowCredentials(true);
-        headers.set("Location", "/oauth2/authorization/google");
-
-        return new ResponseEntity<>(headers, HttpStatus.FOUND);
-
-//        response.sendRedirect("/oauth2/authorization/google");
+    public void googleLogin(HttpServletResponse response) throws IOException {
+        response.sendRedirect("/oauth2/authorization/google");
     }
 
     /**