Merge pull request #6 from Timetris-Trendithon/loginError

🔧Fix: redirection 코드 수정

scripts/start.sh

@@ -19,7 +19,7 @@ cp $PROJECT_ROOT/build/libs/*.jar $JAR_FILE
 echo "$TIME_NOW > $JAR_FILE 파일 실행" >> $DEPLOY_LOG
 
 nohup sudo java -jar \
-        -Dspring.config.location=/home/ubuntu/app/src/main/resources/application.yml, /home/ubuntu/app/src/main/resources/application-jwt, /home/ubuntu/app/src/main/resources/application-oauth.yml.yml \
+        -Dspring.config.location=/home/ubuntu/app/application.yml, /home/ubuntu/app/application-jwt, /home/ubuntu/app/application-oauth.yml \
         -Duser.timezone=Asia/Seoul\
         $JAR_FILE > $APP_LOG 2> $ERROR_LOG &
 

src/main/java/com/trendithon/timetris/domain/mainpage/controller/MainPageController.java

@@ -2,8 +2,12 @@
 
 import com.trendithon.timetris.domain.mainpage.dto.MainPageDTO;
 import com.trendithon.timetris.domain.mainpage.service.MainPageService;
+import com.trendithon.timetris.global.auth.jwt.TokenProvider;
 import com.trendithon.timetris.global.exception.ApiResponse;
+import com.trendithon.timetris.global.exception.CustomException;
+import com.trendithon.timetris.global.exception.enums.ErrorStatus;
 import com.trendithon.timetris.global.exception.enums.SuccessStatus;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,13 +23,25 @@
 public class MainPageController {
 
     private final MainPageService mainPageService;
+    private final TokenProvider tokenProvider;
 
     @GetMapping("/{userId}")
     public ApiResponse<MainPageDTO> getMainPage(Authentication authentication,
-                                                @PathVariable long userId)
-    {
+                                                @PathVariable long userId) {
         MainPageDTO mainPageDTO = mainPageService.getMainPage(userId);
         return ApiResponse.success(SuccessStatus.OK, mainPageDTO);
     }
 
+
+    @GetMapping
+    public ApiResponse<String> MainForTest(HttpServletRequest request) {
+        String userName = (String) request.getSession().getAttribute("name");
+
+        if (userName == null) {
+            return ApiResponse.of("LOGIN", "로그인 하세요");
+        } else {
+            return ApiResponse.success(SuccessStatus.OK, userName);
+        }
+
+    }
 }

src/main/java/com/trendithon/timetris/global/auth/jwt/TokenProvider.java

@@ -23,6 +23,7 @@
 @Slf4j
 @Configuration
 @Getter
+@PropertySource(value = "classpath:application-jwt.yml")
 public class TokenProvider {
 
 

src/main/java/com/trendithon/timetris/global/auth/oauth/handler/OAuth2SuccessHandler.java

@@ -48,7 +48,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
         String accessToken = tokenProvider.createAccessToken(foundAccount);
         response.addHeader(tokenProvider.getAccessHeader(), "Bearer " + accessToken);
-        response.sendRedirect("/member/detail");
+        response.sendRedirect("/main");
 
         tokenProvider.sendAccessAndRefreshToken(response, accessToken, null);
     }

src/main/java/com/trendithon/timetris/global/config/SecurityConfig.java

@@ -34,13 +34,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
         http.authorizeRequests()
                 .requestMatchers("/","/css/**","/images/**","/js/**","/favicon.ico","/h2-console/**", "/index.html").permitAll()
-                .requestMatchers("/api/v1/google/*").permitAll() // 모든 유저 접근 가능 (인증 필요 X)
+                .requestMatchers("/login").permitAll() // 모든 유저 접근 가능 (인증 필요 X)
                 .requestMatchers(
                         // Swagger 허용 URL
                         "/v2/api-docs", "/v3/api-docs", "/v3/api-docs/**", "/swagger-resources",
                         "/swagger-resources/**", "/configuration/ui", "/configuration/security", "/swagger-ui/**",
                         "/webjars/**", "/swagger-ui.html").permitAll()
-                .requestMatchers("/main").hasRole("USER") // "/main/authenticated"에 대한 접근은 "USER" 역할이 있어야 함
+                //.requestMatchers("/main").hasRole("USER") // "/main/authenticated"에 대한 접근은 "USER" 역할이 있어야 함
                 .requestMatchers("/api/**").authenticated() // 인증 필요
 
                 .anyRequest().permitAll();