Merge remote-tracking branch 'origin/feature_1/유저-auth-구현(-토큰-재발급,-로그…

…아웃)'
Mojacknong · Oct 21, 2023 · 63e6e99 · 63e6e99
2 parents c48078a + 275a2b3
commit 63e6e99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -3,9 +3,11 @@ name: ModernFarmer CI/CD
 on:
   push:
     branches: ["dev"]
+
   pull_request:
     branches: ["dev"]
 
+
 permissions:
   contents: read
 

diff --git a/src/main/java/modernfarmer/server/farmususer/user/controller/AuthController.java b/src/main/java/modernfarmer/server/farmususer/user/controller/AuthController.java
@@ -35,6 +35,7 @@ public TokenResponseDto kakaoLogin(HttpServletRequest request)  {
 
         return reissueTokenResponseDto;
     }
+
 //
 //    @DeleteMapping("/logout")
 //    public ResponseDto logout(HttpServletRequest request)  {
@@ -62,6 +63,7 @@ public TokenResponseDto kakaoLogin(HttpServletRequest request)  {
 //        return reissueTokenResponseDto;
 //    }
 
+
     @PostMapping(value = "/google-login")
     public TokenResponseDto googleLogin(HttpServletRequest request)  {
 

diff --git a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
@@ -95,8 +95,6 @@ public TokenResponseDto googleLogin(String accessToken) {
     public TokenResponseDto kakaoLogin(String accessToken) {
 
         User user;
-
-
         Mono<KakaoUserResponseDto> userInfoMono = getUserKakaoInfo(accessToken);
         KakaoUserResponseDto userInfo = userInfoMono.block();
 
@@ -209,7 +207,6 @@ public void deleteValueByKey(String key) {
 
 
 
-
     public Mono<KakaoUserResponseDto> getUserKakaoInfo(String accessToken) {
         return webClient
                 .get()