[김현창] 동적 뷰 개발

src/main/java/app/handler/HomeHandler.java

@@ -0,0 +1,20 @@
+package app.handler;
+
+import http.HttpMethod;
+import http.HttpStatus;
+import http.request.HttpRequest;
+import web.handler.SingleArgHandler;
+import web.response.DynamicViewResponse;
+import web.response.HandlerResponse;
+
+public class HomeHandler extends SingleArgHandler<HttpRequest> {
+
+    public HomeHandler() {
+        super(HttpMethod.GET, "/");
+    }
+
+    @Override
+    public HandlerResponse handle(HttpRequest request) {
+        return DynamicViewResponse.of(HttpStatus.OK, "/index.html");
+    }
+}

src/main/java/app/handler/LoginWithPost.java

@@ -39,16 +39,17 @@ public HandlerResponse handle(QueryParameters params) {
 
         SessionEntity session = sessionManager.create(
                 user.getUserId(),
-                user.getUserRole());
+                user.getUserRole(),
+                user.getNickname());
 
-        RedirectResponse res = RedirectResponse.to("/");
-        res.setCookie(
+        RedirectResponse response = RedirectResponse.to("/");
+        response.setCookie(
                 CookieBuilder.of("SID", session.getId())
                         .path("/")
                         .httpOnly()
                         .sameSite(CookieBuilder.SameSite.LAX)
                         .maxAge(VariableConfig.ABSOLUTE_MS)
         );
-        return res;
+        return response;
     }
 }

src/main/java/app/handler/LogoutWithPost.java

@@ -0,0 +1,28 @@
+package app.handler;
+
+import http.HttpMethod;
+import http.request.HttpRequest;
+import http.response.CookieBuilder;
+import web.handler.SingleArgHandler;
+import web.response.HandlerResponse;
+import web.response.RedirectResponse;
+import web.session.SessionStorage;
+
+public class LogoutWithPost extends SingleArgHandler<HttpRequest> {
+    private final SessionStorage sessionManager;
+
+    public LogoutWithPost(SessionStorage sessionManager) {
+        super(HttpMethod.POST, "/user/logout");
+        this.sessionManager = sessionManager;
+    }
+
+    @Override
+    public HandlerResponse handle(HttpRequest request) {
+        String sid = request.getCookieValue("SID").orElse(null);
+        if (sid != null) sessionManager.invalidate(sid);
+
+        RedirectResponse response = RedirectResponse.to("/");
+        response.setCookie(CookieBuilder.delete("SID").path("/"));
+        return response;
+    }
+}

src/main/java/app/handler/RegisterWithPost.java

@@ -11,7 +11,7 @@
 import web.filter.authentication.UserRole;
 import web.handler.SingleArgHandler;
 import web.response.HandlerResponse;
-import web.response.StaticViewResponse;
+import web.response.RedirectResponse;
 
 public class RegisterWithPost extends SingleArgHandler<QueryParameters> {
     private static final Logger log = LoggerFactory.getLogger(RegisterWithPost.class);
@@ -27,6 +27,6 @@ public HandlerResponse handle(QueryParameters params) {
         String password = params.getQueryValue("password").orElseThrow(()-> new ServiceException(ErrorCode.MISSING_REGISTER_TOKEN, "password required"));
         Database.addUser(new User(password, nickname, email, UserRole.MEMBER.toString()));
         log.info("Registered - password:{}, nickname:{}, email:{}", password, nickname, email);
-        return StaticViewResponse.of("/login");
+        return RedirectResponse.to("/login");
     }
 }

src/main/java/config/AppConfig.java

@@ -1,8 +1,6 @@
 package config;
 
-import app.handler.LoginWithPost;
-import app.handler.RegisterWithGet;
-import app.handler.RegisterWithPost;
+import app.handler.*;
 import exception.ExceptionHandlerMapping;
 import exception.handler.ErrorExceptionHandler;
 import exception.handler.ServiceExceptionHandler;
@@ -20,12 +18,17 @@
 import web.dispatch.argument.resolver.HttpRequestResolver;
 import web.dispatch.argument.resolver.QueryParamsResolver;
 import web.filter.*;
+import web.handler.DefaultViewHandler;
 import web.handler.StaticContentHandler;
 import web.handler.WebHandler;
+import web.renderer.DynamicViewRenderer;
 import web.renderer.HttpResponseRenderer;
 import web.renderer.RedirectRenderer;
 import web.renderer.StaticViewRenderer;
+import web.renderer.view.ExpressionResolver;
 import web.session.SessionStorage;
+import web.renderer.view.TemplateEngine;
+import web.renderer.view.TemplateLoader;
 
 import java.util.List;
 
@@ -84,8 +87,10 @@ public List<WebHandler> webHandlerList() {
                         staticContentHandler(),
                         registerWithGet(),
                         registerWithPost(),
-                        loginWithPost()
-                )
+                        loginWithPost(),
+                        logoutWithPost(),
+                        homeHandler(),
+                        defaultViewHandler())
         );
     }
 
@@ -96,6 +101,10 @@ public StaticContentHandler staticContentHandler() {
         );
     }
 
+    public DefaultViewHandler defaultViewHandler(){
+        return getOrCreate("defaultViewHandler", DefaultViewHandler::new);
+    }
+
     public RegisterWithGet registerWithGet() {
         return getOrCreate(
                 "registerWithGet",
@@ -115,13 +124,23 @@ public LoginWithPost loginWithPost() {
                 () -> new LoginWithPost(sessionStorage()));
     }
 
+    public LogoutWithPost logoutWithPost(){
+        return getOrCreate("logoutWithPost",
+                () -> new LogoutWithPost(sessionStorage()));
+    }
+
+    public HomeHandler homeHandler(){
+        return getOrCreate("homeHandler", HomeHandler::new);
+    }
+
     // ===== Renderer =====
     public List<HttpResponseRenderer> httpResponseRendererList() {
         return getOrCreate(
                 "httpResponseRendererList",
                 () -> List.of(
                         staticViewRenderer(),
-                        redirectRenderer()
+                        redirectRenderer(),
+                        dynamicViewRenderer()
                 )
         );
     }
@@ -137,6 +156,24 @@ public RedirectRenderer redirectRenderer() {
         return getOrCreate("redirectRenderer", RedirectRenderer::new);
     }
 
+    public DynamicViewRenderer dynamicViewRenderer() {
+        return getOrCreate("dynamicViewRenderer",
+                () -> new DynamicViewRenderer(templateEngine()));
+    }
+
+    // ===== ViewEngine =====
+    public TemplateEngine templateEngine() {
+        return getOrCreate("templateEngine",
+                () -> new TemplateEngine(templateLoader(), expressionResolver()));
+    }
+
+    public ExpressionResolver expressionResolver(){
+        return getOrCreate("expressResolver", ExpressionResolver::new);
+    }
+
+    public TemplateLoader templateLoader() {
+        return getOrCreate("templateLoader", TemplateLoader::new);
+    }
 
     // ===== Adapter =====
     public List<HandlerAdapter> handlerAdapterList() {
@@ -164,7 +201,6 @@ public DefaultHandlerAdapter defaultHandlerAdapter() {
                 DefaultHandlerAdapter::new
         );
     }
-
     // ===== Resolver =====
     public List<ArgumentResolver<?>> argumentResolverList() {
         return getOrCreate(

src/main/java/config/SecurityConfig.java

@@ -2,6 +2,8 @@
 
 import exception.ErrorException;
 
+import java.util.List;
+
 public class SecurityConfig extends SingletonContainer {
     private final AppConfig appConfig = new AppConfig();
     private int callCount;
@@ -15,9 +17,9 @@ public void config(){
     public void setPaths(){
         appConfig.filterChainContainer()
                 .addPath(FilterType.AUTHENTICATED, "/mypage/**")
-                .addPath(FilterType.LOG_IN, "/user/login")
-                .addPath(FilterType.ALL, "/user/**")
-                .addPath(FilterType.PUBLIC, "/**");
+                .addPaths(FilterType.LOG_IN, List.of("/user/login", "/login"))
+                .addPaths(FilterType.PUBLIC, List.of("/", "/home/*"))
+                .addPath(FilterType.ALL, "/**");
     }
 
 

src/main/java/config/VariableConfig.java

@@ -6,6 +6,9 @@ public class VariableConfig {
     public static final List<String> STATIC_RESOURCE_ROOTS = List.of(
             "./src/main/resources",
             "./src/main/resources/static");
+    public static final List<String> DYNAMIC_RESOURCE_ROOTS = List.of(
+            "./src/main/resources/templates"
+    );
 
     public static final long IDLE_MS = 30*60*100;
     public static final long ABSOLUTE_MS = 180*60*100;

src/main/java/exception/handler/ErrorExceptionHandler.java

@@ -15,7 +15,7 @@
 import java.time.format.DateTimeFormatter;
 
 public class ErrorExceptionHandler implements ExceptionHandler {
-    private final Logger logger = LoggerFactory.getLogger(ErrorException.class);
+    private final Logger logger = LoggerFactory.getLogger(ErrorExceptionHandler.class);
     @Override
     public boolean support(Throwable e) {
         return e instanceof ErrorException;

src/main/java/http/response/HttpResponse.java

@@ -75,6 +75,12 @@ public void setBody(File file, byte[] body) {
         setHeader("Content-Length", String.valueOf(body.length));
     }
 
+    public void redirectTo(String path){
+        setStatus(HttpStatus.FOUND);
+        setHeader("Location", path);
+        setHeader("Content-Length", "0");
+    }
+
     private String guessContentType(File file) {
         String byName = URLConnection.guessContentTypeFromName(file.getName());
         if (byName != null) return byName;

src/main/java/web/dispatch/Dispatcher.java

@@ -41,7 +41,7 @@ public HttpResponse handle(HttpRequest request, HttpResponse response){
         HandlerAdapter adapter = adapterList.stream().filter(ha -> ha.support(handler))
                 .findFirst().orElseThrow(() -> new ErrorException("DispatcherError: No adapter matched"));
 
-        HandlerResponse handlerResponse = adapter.handle(request, handler);
+        HandlerResponse handlerResponse = adapter.handle(request, handler).postHandling(request, response);
 
         HttpResponseRenderer responseHandler = responseHandlerList.stream()
                 .filter(rh -> rh.supports(handlerResponse))

src/main/java/web/filter/AccessLogFilter.java

@@ -12,6 +12,7 @@ public class AccessLogFilter implements ServletFilter {
 
     @Override
     public void runFilter(HttpRequest request, HttpResponse response, FilterChainContainer.FilterChainEngine chain) {
+        request.getOrGenerateRid();
         chain.doFilter();
         if(request.getAuthenticationInfo()!=null &&
                 request.getAuthenticationInfo().getRole().equals(UserRole.MEMBER)) {

src/main/java/web/filter/AuthenticationFilter.java

@@ -3,6 +3,7 @@
 import http.HttpStatus;
 import http.request.HttpRequest;
 import http.response.HttpResponse;
+import web.filter.authentication.AuthenticationInfo;
 import web.filter.authentication.UnanimousAuthentication;
 import web.filter.authentication.UserAuthentication;
 import web.filter.authentication.UserRole;
@@ -20,17 +21,17 @@ public AuthenticationFilter(SessionStorage sessionManager) {
     public void runFilter(HttpRequest request, HttpResponse response, FilterChainContainer.FilterChainEngine chain) {
         String sid = request.getCookieValue("SID").orElse(null);
         SessionEntity session = sessionManager.getValid(sid);
+        AuthenticationInfo authInfo;
 
         if (session == null) {
-            request.setAuthenticationInfo(
-                    UnanimousAuthentication.of());
+            authInfo = UnanimousAuthentication.of();
         } else{
-            request.setAuthenticationInfo(
-                    UserAuthentication.of(
-                            session.getUserId(),
-                            UserRole.valueOf(session.getUserRole())));
+            authInfo = UserAuthentication.of(
+                    session.getUserId(),
+                    UserRole.valueOf(session.getUserRole()));
+            authInfo.addAttribute("nickname",session.getNickname());
         }
-
+        request.setAuthenticationInfo(authInfo);
         chain.doFilter();
     }
 }

src/main/java/web/filter/MemberAuthorizationFilter.java

@@ -1,6 +1,5 @@
 package web.filter;
 
-import http.HttpStatus;
 import http.request.HttpRequest;
 import http.response.HttpResponse;
 import web.filter.authentication.UserRole;
@@ -13,9 +12,7 @@ public void runFilter(HttpRequest request, HttpResponse response, FilterChainCon
         if(request.getAuthenticationInfo().getRole().equals(UserRole.MEMBER)){
             chain.doFilter();
         } else {
-            response.setStatus(HttpStatus.FOUND);
-            response.setHeader("Location", "/login");
-            response.setHeader("Content-Length", "0");
+            response.redirectTo("/login");
         }
     }
 }

src/main/java/web/filter/authentication/AuthenticationInfo.java

@@ -4,5 +4,7 @@
 
 public interface AuthenticationInfo {
     Optional<Long> getUserId();
+    Optional<Object> getAttribute(String key);
+    void addAttribute(String key, Object value);
     UserRole getRole();
 }

src/main/java/web/filter/authentication/UnanimousAuthentication.java

@@ -1,19 +1,38 @@
 package web.filter.authentication;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 public class UnanimousAuthentication implements AuthenticationInfo {
     private final UserRole USER_ROLE = UserRole.UNANIMOUS;
 
+    public UnanimousAuthentication() {
+        this.attributes = new HashMap<>();
+    }
+
+    private final Map<String, Object> attributes;
+
     public static UnanimousAuthentication of(){
         return new UnanimousAuthentication();
     }
 
+    @Override
+    public void addAttribute(String key, Object value) {
+        attributes.put(key, value);
+    }
+
+    @Override
+    public Optional<Object> getAttribute(String key) {
+        return Optional.ofNullable(attributes.get(key));
+    }
+
     @Override
     public Optional<Long> getUserId() {
         return Optional.empty();
     }
 
+
     @Override
     public UserRole getRole() {
         return this.USER_ROLE;