[#38] refactor: ResponseCookie에서 그냥 쿠키로 변경

- FE에서 자꾸 오류 발생하여 변경:
codesquad-member-2020 · Jun 5, 2020 · 4a19263 · 4a19263
1 parent d65a5b3
commit 4a19263
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/BE/src/main/java/com/codesquad/airbnb/user/application/LoginInterceptor.java b/BE/src/main/java/com/codesquad/airbnb/user/application/LoginInterceptor.java
@@ -10,8 +10,6 @@
 
 import java.util.Arrays;
 
-import static com.codesquad.airbnb.common.utils.JwtUtils.decrypt;
-
 @Component
 public class LoginInterceptor extends HandlerInterceptorAdapter {
 
@@ -25,6 +23,11 @@ public boolean preHandle(HttpServletRequest request,
         }
 
         Cookie[] cookies = request.getCookies();
+
+        if(cookies == null) {
+            return false;
+        }
+
         validateCookies(cookies);
         return true;
     }

diff --git a/BE/src/main/java/com/codesquad/airbnb/user/application/LoginService.java b/BE/src/main/java/com/codesquad/airbnb/user/application/LoginService.java
@@ -14,6 +14,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
@@ -70,28 +71,13 @@ private void setCookie(User user, HttpServletResponse response) throws IOExcepti
         Map<String, Object> userMap = new HashMap<>();
         userMap.put("id", user.getUserId());
 
-        ResponseCookie jwtCookie = bakeCookie("jwt", createToken(userMap));
-        response.setHeader(HttpHeaders.SET_COOKIE, jwtCookie.toString());
-
-        List<ResponseCookie> cookies = new ArrayList<>();
-        cookies.add(bakeCookie("userId", user.getNickName()));
-        cookies.add(bakeCookie("userImage", user.getPictureUrl()));
-        cookies.forEach(value -> response.addHeader(HttpHeaders.SET_COOKIE, value.toString()));
-
+        response.reset();
+        response.addCookie(new Cookie("jwt", createToken(userMap)));
+        response.addCookie(new Cookie("userId", user.getNickName()));
+        response.addCookie(new Cookie("userImage", user.getPictureUrl()));
         response.sendRedirect("http://3.34.110.161/");
     }
 
-    private ResponseCookie bakeCookie(String key, String value) {
-        return ResponseCookie.from(key, value)
-                .domain("3.34.110.161")
-                .sameSite("Strict")
-                .secure(true)
-                .path("/")
-                .maxAge(60 * 60 * 24)
-                .httpOnly(false)
-                .build();
-    }
-
     private User parseUserInfo(String data) throws JsonProcessingException {
         JsonNode userData = mapper.readValue(data, JsonNode.class);