[HTTP 서버 구현하기 - 2, 3단계] 현구막(최현구) 미션 제출합니다.

README.md

@@ -1,3 +1,9 @@
+# 쿠키 세션 구현하기
+- [x] HttpCookie에 JSESSION 값 저장하기
+  - [x] HttpCookie 테스트 코드 작성
+- [x] HttpSession 구현하기
+- [x] HttpCookie, HttpSession으로 변경된 객체 테스트 코드 작성
+
 # HTTP 서버 구현하기
 
 - [x] 서버를 실행시켜서 브라우저로 서버(`http://localhost:8080/index.html`)에 접속하면 index.html 페이지를 보여준다.

app/src/main/java/nextstep/jwp/controller/Controller.java

@@ -6,7 +6,5 @@
 
 public interface Controller {
 
-    boolean matchUri(String uri);
-
-    HttpResponse doService(HttpRequest httpRequest) throws IOException;
+    HttpResponse service(HttpRequest httpRequest) throws IOException;
 }

app/src/main/java/nextstep/jwp/controller/LoginController.java

@@ -1,10 +1,20 @@
 package nextstep.jwp.controller;
 
+import static nextstep.jwp.controller.StaticResourcePath.INDEX_PAGE;
+import static nextstep.jwp.controller.StaticResourcePath.NOT_FOUND_PAGE;
+import static nextstep.jwp.controller.StaticResourcePath.UNAUTHORIZED_PAGE;
+import static nextstep.jwp.http.common.HttpStatus.FOUND;
+import static nextstep.jwp.http.common.HttpStatus.OK;
+
+import java.io.IOException;
 import nextstep.jwp.controller.request.LoginRequest;
+import nextstep.jwp.controller.response.LoginResponse;
+import nextstep.jwp.exception.StaticResourceNotFoundException;
 import nextstep.jwp.exception.UnauthorizedException;
 import nextstep.jwp.http.common.HttpStatus;
 import nextstep.jwp.http.request.HttpRequest;
 import nextstep.jwp.http.response.HttpResponse;
+import nextstep.jwp.model.StaticResource;
 import nextstep.jwp.service.LoginService;
 import nextstep.jwp.service.StaticResourceService;
 import org.slf4j.Logger;
@@ -15,25 +25,51 @@ public class LoginController extends RestController {
     private static final Logger LOGGER = LoggerFactory.getLogger(LoginController.class);
 
     private final LoginService loginService;
+    private final StaticResourceService staticResourceService;
 
     public LoginController(LoginService loginService, StaticResourceService staticResourceService) {
-        super(staticResourceService);
         this.loginService = loginService;
+        this.staticResourceService = staticResourceService;
+    }
+
+    @Override
+    protected HttpResponse doGet(HttpRequest httpRequest) throws IOException {
+        try {
+            if (httpRequest.hasCookie() && loginService.isAlreadyLogin(httpRequest.getCookie())) {
+                return HttpResponse.redirect(FOUND, INDEX_PAGE.getValue());
+            }
+
+            StaticResource staticResource = staticResourceService.findByPathWithExtension(httpRequest.getUri(), ".html");
+
+            return HttpResponse.withBody(HttpStatus.OK, staticResource);
+        } catch (StaticResourceNotFoundException e) {
+            StaticResource staticResource = staticResourceService.findByPath(NOT_FOUND_PAGE.getValue());
+
+            LOGGER.warn(e.getMessage());
+
+            return HttpResponse.withBody(HttpStatus.NOT_FOUND, staticResource);
+        }
     }
 
     @Override
-    protected HttpResponse doPost(HttpRequest httpRequest) {
+    protected HttpResponse doPost(HttpRequest httpRequest) throws IOException {
         try {
+            if (httpRequest.hasCookie() && loginService.isAlreadyLogin(httpRequest.getCookie())) {
+                return HttpResponse.redirect(FOUND, INDEX_PAGE.getValue());
+            }
+
             LoginRequest loginRequest = getLoginRequest(httpRequest);
-            loginService.login(loginRequest);
+            LoginResponse loginResponse = loginService.login(loginRequest);
 
             LOGGER.debug("Login Success.");
 
-            return HttpResponse.redirect(HttpStatus.FOUND, "/index.html");
+            StaticResource resource = staticResourceService.findByPath(INDEX_PAGE.getValue());
+            return HttpResponse.withBodyAndCookie(OK, resource, loginResponse.toCookieString());
         } catch (UnauthorizedException e) {
             LOGGER.debug("Login Failed.");
 
-            return HttpResponse.redirect(HttpStatus.UNAUTHORIZED, "/401.html");
+            StaticResource resource = staticResourceService.findByPath(UNAUTHORIZED_PAGE.getValue());
+            return HttpResponse.withBody(HttpStatus.UNAUTHORIZED, resource);
         }
     }
 
@@ -45,9 +81,4 @@ private LoginRequest getLoginRequest(HttpRequest httpRequest) {
 
         return new LoginRequest(account, password);
     }
-
-    @Override
-    public boolean matchUri(String uri) {
-        return uri.startsWith("/login");
-    }
 }

app/src/main/java/nextstep/jwp/controller/RegisterController.java

@@ -1,10 +1,17 @@
 package nextstep.jwp.controller;
 
+import static nextstep.jwp.controller.StaticResourcePath.CONFLICT_PAGE;
+import static nextstep.jwp.controller.StaticResourcePath.INDEX_PAGE;
+import static nextstep.jwp.controller.StaticResourcePath.NOT_FOUND_PAGE;
+
+import java.io.IOException;
 import nextstep.jwp.controller.request.RegisterRequest;
 import nextstep.jwp.exception.DuplicateAccountException;
+import nextstep.jwp.exception.StaticResourceNotFoundException;
 import nextstep.jwp.http.common.HttpStatus;
 import nextstep.jwp.http.request.HttpRequest;
 import nextstep.jwp.http.response.HttpResponse;
+import nextstep.jwp.model.StaticResource;
 import nextstep.jwp.service.RegisterService;
 import nextstep.jwp.service.StaticResourceService;
 import org.slf4j.Logger;
@@ -15,25 +22,42 @@ public class RegisterController extends RestController {
     private static final Logger LOGGER = LoggerFactory.getLogger(RegisterController.class);
 
     private final RegisterService registerService;
+    private final StaticResourceService staticResourceService;
 
     public RegisterController(RegisterService registerService, StaticResourceService staticResourceService) {
-        super(staticResourceService);
         this.registerService = registerService;
+        this.staticResourceService = staticResourceService;
+    }
+
+    @Override
+    protected HttpResponse doGet(HttpRequest httpRequest) throws IOException {
+        try {
+            StaticResource staticResource = staticResourceService.findByPathWithExtension(httpRequest.getUri(), ".html");
+
+            return HttpResponse.withBody(HttpStatus.OK, staticResource);
+        } catch (StaticResourceNotFoundException e) {
+            StaticResource staticResource = staticResourceService.findByPath(NOT_FOUND_PAGE.getValue());
+
+            LOGGER.warn(e.getMessage());
+
+            return HttpResponse.withBody(HttpStatus.NOT_FOUND, staticResource);
+        }
     }
 
     @Override
-    protected HttpResponse doPost(HttpRequest httpRequest) {
+    protected HttpResponse doPost(HttpRequest httpRequest) throws IOException {
         try {
             RegisterRequest registerRequest = getRegisterRequest(httpRequest);
             registerService.registerUser(registerRequest);
 
             LOGGER.debug("Register Success.");
 
-            return HttpResponse.redirect(HttpStatus.MOVED_PERMANENTLY, "/index.html");
+            return HttpResponse.redirect(HttpStatus.MOVED_PERMANENTLY, INDEX_PAGE.getValue());
         } catch (DuplicateAccountException e) {
             LOGGER.debug("Register Failed.");
 
-            return HttpResponse.redirect(HttpStatus.CONFLICT, "/409.html");
+            StaticResource resource = staticResourceService.findByPath(CONFLICT_PAGE.getValue());
+            return HttpResponse.withBody(HttpStatus.CONFLICT, resource);
         }
     }
 
@@ -46,9 +70,4 @@ private RegisterRequest getRegisterRequest(HttpRequest httpRequest) {
 
         return new RegisterRequest(account, password, email);
     }
-
-    @Override
-    public boolean matchUri(String uri) {
-        return uri.startsWith("/register");
-    }
 }

app/src/main/java/nextstep/jwp/controller/RestController.java

@@ -3,47 +3,20 @@
 import static nextstep.jwp.http.request.Method.GET;
 
 import java.io.IOException;
-import nextstep.jwp.exception.StaticResourceNotFoundException;
-import nextstep.jwp.http.common.HttpStatus;
 import nextstep.jwp.http.request.HttpRequest;
 import nextstep.jwp.http.response.HttpResponse;
-import nextstep.jwp.model.StaticResource;
-import nextstep.jwp.service.StaticResourceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public abstract class RestController implements Controller {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RestController.class);
-
-    private final StaticResourceService staticResourceService;
-
-    public RestController(StaticResourceService staticResourceService) {
-        this.staticResourceService = staticResourceService;
-    }
-
-    protected abstract HttpResponse doPost(HttpRequest httpRequest);
-
-    private HttpResponse doGet(HttpRequest httpRequest) throws IOException {
-        try {
-            StaticResource staticResource = staticResourceService.findByPathWithExtension(
-                httpRequest.getUri(), ".html");
-
-            return HttpResponse.withBody(HttpStatus.OK, staticResource);
-        } catch (StaticResourceNotFoundException e) {
-            StaticResource staticResource = staticResourceService.findByPath("/404.html");
-
-            LOGGER.warn(e.getMessage());
-
-            return HttpResponse.withBody(HttpStatus.NOT_FOUND, staticResource);
-        }
-    }
-
-    public HttpResponse doService(HttpRequest httpRequest) throws IOException {
+    public HttpResponse service(HttpRequest httpRequest) throws IOException {
         if (httpRequest.hasMethod(GET)) {
             return doGet(httpRequest);
         }
 
         return doPost(httpRequest);
     }
+
+    protected abstract HttpResponse doGet(HttpRequest httpRequest) throws IOException;
+
+    protected abstract HttpResponse doPost(HttpRequest httpRequest) throws IOException;
 }

app/src/main/java/nextstep/jwp/controller/StaticResourceController.java

@@ -1,5 +1,7 @@
 package nextstep.jwp.controller;
 
+import static nextstep.jwp.controller.StaticResourcePath.NOT_FOUND_PAGE;
+
 import java.io.IOException;
 import nextstep.jwp.exception.StaticResourceNotFoundException;
 import nextstep.jwp.http.common.HttpStatus;
@@ -26,7 +28,7 @@ private HttpResponse doGet(HttpRequest httpRequest) throws IOException {
 
             return HttpResponse.withBody(HttpStatus.OK, staticResource);
         } catch (StaticResourceNotFoundException e) {
-            StaticResource staticResource = staticResourceService.findByPath("/404.html");
+            StaticResource staticResource = staticResourceService.findByPath(NOT_FOUND_PAGE.getValue());
 
             LOGGER.warn(e.getMessage());
 
@@ -35,12 +37,7 @@ private HttpResponse doGet(HttpRequest httpRequest) throws IOException {
     }
 
     @Override
-    public HttpResponse doService(HttpRequest httpRequest) throws IOException {
+    public HttpResponse service(HttpRequest httpRequest) throws IOException {
         return doGet(httpRequest);
     }
-
-    @Override
-    public boolean matchUri(String uri) {
-        return false;
-    }
 }

app/src/main/java/nextstep/jwp/controller/StaticResourcePath.java

@@ -0,0 +1,19 @@
+package nextstep.jwp.controller;
+
+public enum StaticResourcePath {
+
+    INDEX_PAGE("/index.html"),
+    UNAUTHORIZED_PAGE("/401.html"),
+    NOT_FOUND_PAGE("/404.html"),
+    CONFLICT_PAGE("/409.html");
+
+    private final String value;
+
+    StaticResourcePath(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

app/src/main/java/nextstep/jwp/controller/response/LoginResponse.java

@@ -0,0 +1,16 @@
+package nextstep.jwp.controller.response;
+
+public class LoginResponse {
+
+    private final String sessionKey;
+    private final String sessionValue;
+
+    public LoginResponse(String sessionKey, String sessionValue) {
+        this.sessionKey = sessionKey;
+        this.sessionValue = sessionValue;
+    }
+
+    public String toCookieString() {
+        return String.format("%s=%s;", sessionKey, sessionValue);
+    }
+}