[민석] 배민찬 3단계 (프로모션) 구현 완료

pom.xml

@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>kr.codesquad</groupId>
-	<artifactId>baeminchan</artifactId>
+	<artifactId>webApi</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
-	<name>baeminchan</name>
+	<name>webApi</name>
 	<description>배민찬 서비스</description>
 
 	<parent>

src/main/java/codesquad/configration/JpaEnableConfiguration.java → src/main/java/codesquad/configuration/JpaEnableConfiguration.java

@@ -1,4 +1,4 @@
-package codesquad.configration;
+package codesquad.configuration;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

src/main/java/codesquad/configration/WebMvcConfig.java → src/main/java/codesquad/configuration/WebMvcConfig.java

@@ -1,11 +1,13 @@
-package codesquad.configration;
+package codesquad.configuration;
 
 import codesquad.intercepter.AdminInterceptor;
 
-import codesquad.security.ManagerAccountHandlerMethodArgumentResolver;
+import codesquad.intercepter.BasicAuthInterceptor;
+import codesquad.security.AdminAccountHandlerMethodArgumentResolver;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -29,18 +31,38 @@ public PasswordEncoder passwordEncoder() {
     }
 
     @Bean
-    public ManagerAccountHandlerMethodArgumentResolver managerAccountHandlerMethodArgumentResolver() {
-        return new ManagerAccountHandlerMethodArgumentResolver();
+    public AdminAccountHandlerMethodArgumentResolver managerAccountHandlerMethodArgumentResolver() {
+        return new AdminAccountHandlerMethodArgumentResolver();
+    }
+
+    @Configuration
+    @Profile("test")
+    public class TestWebMvcConfig extends WebMvcConfig{
+
+        @Bean
+        public BasicAuthInterceptor basicAuthInterceptor(){
+            return new BasicAuthInterceptor();
+        }
+
+        @Override
+        public void addInterceptors(InterceptorRegistry registry) {
+            registry.addInterceptor(basicAuthInterceptor());
+        }
     }
 
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         argumentResolvers.add(managerAccountHandlerMethodArgumentResolver());
     }
 
+    @Bean
+    public AdminInterceptor adminInterceptor(){
+        return new AdminInterceptor();
+    }
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new AdminInterceptor())
+        registry.addInterceptor(adminInterceptor())
                 .addPathPatterns("/admin");
     }
 }

src/main/java/codesquad/domain/AccountType.java

@@ -2,15 +2,15 @@
 
 public enum AccountType {
     MEMBER(false),
-    MANAGER(true);
+    ADMIN(true);
 
-    boolean isManager;
+    boolean isAdmin;
 
-    AccountType(boolean isManager) {
-        this.isManager = isManager;
+    AccountType(boolean isAdmin) {
+        this.isAdmin = isAdmin;
     }
 
-    public boolean isManager() {
-        return isManager;
+    public boolean isAdmin() {
+        return isAdmin;
     }
 }

src/main/java/codesquad/intercepter/AdminInterceptor.java

@@ -20,7 +20,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         }
 
         Account account = (Account) loginAccount;
-        if (!account.getType().isManager()) {
+        if (!account.getType().isAdmin()) {
             throw new UnAuthorizedException("you're not manager");
         }
         return true;

src/main/java/codesquad/intercepter/BasicAuthInterceptor.java

@@ -0,0 +1,60 @@
+package codesquad.intercepter;
+
+import codesquad.domain.Account;
+import codesquad.domain.AccountRepository;
+import codesquad.exception.account.UnAuthenticationException;
+import codesquad.util.SessionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.nio.charset.Charset;
+import java.util.Base64;
+
+public class BasicAuthInterceptor extends HandlerInterceptorAdapter {
+    private static final Logger log = LoggerFactory.getLogger(BasicAuthInterceptor.class);
+
+    @Autowired
+    private AccountRepository accountRepository;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String base64Credentials;
+        try {
+            base64Credentials = getEncodedCredentials(request);
+            String[] credentialValues = getDecodedCredentials(base64Credentials);
+            String userId = credentialValues[0];
+            String password = credentialValues[1];
+            log.debug("userId : {}", userId);
+            log.debug("password : {}", password);
+            login(request, userId, password);
+            return true;
+        } catch (UnAuthenticationException e) {
+            return true;
+        }
+    }
+
+    public String getEncodedCredentials(HttpServletRequest request) {
+        String authorization = request.getHeader("Authorization");
+        if (authorization == null || !authorization.startsWith("Basic")) {
+            throw new UnAuthenticationException();
+        }
+        return authorization.substring("Basic".length()).trim();
+    }
+
+    public String[] getDecodedCredentials(String base64Credentials) {
+        String credentials = new String(Base64.getDecoder().decode(base64Credentials), Charset.forName("UTF-8"));
+        return credentials.split(":", 2);
+    }
+
+    public void login(HttpServletRequest request, String userId, String password) {
+        Account account = accountRepository.findByUserId(userId).orElseThrow(UnAuthenticationException::new);
+
+        if (account.matchPassword(password)) {
+            request.getSession().setAttribute(SessionUtils.USER_SESSION_KEY, account);
+        }
+    }
+}

src/main/java/codesquad/security/ManagerAccount.java → src/main/java/codesquad/security/AdminAccount.java

@@ -1,14 +1,12 @@
 package codesquad.security;
 
 
-import org.springframework.beans.factory.annotation.Required;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface ManagerAccount {
+public @interface AdminAccount {
 }

src/main/java/codesquad/security/ManagerAccountHandlerMethodArgumentResolver.java → src/main/java/codesquad/security/AdminAccountHandlerMethodArgumentResolver.java

@@ -9,10 +9,10 @@
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-public class ManagerAccountHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
+public class AdminAccountHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
     @Override
     public boolean supportsParameter(MethodParameter methodParameter) {
-        return methodParameter.hasParameterAnnotation(ManagerAccount.class);
+        return methodParameter.hasParameterAnnotation(AdminAccount.class);
     }
 
     @Override
@@ -21,7 +21,7 @@ public Object resolveArgument(MethodParameter methodParameter,
                                   NativeWebRequest nativeWebRequest,
                                   WebDataBinderFactory webDataBinderFactory) throws Exception {
         Account account = SessionUtils.getUserFromSession(nativeWebRequest);
-        if (!account.getType().isManager()) {
+        if (!account.getType().isAdmin()) {
             throw new UnAuthorizedException("You're not manager!");
         }
         return account;

src/main/java/codesquad/web/ApiMemberController.java

@@ -31,6 +31,7 @@ public class ApiMemberController {
     @PostMapping("")
     public ResponseEntity<Void> createMember(@Valid @RequestBody AccountRegistrationDTO accountRegistrationDTO) {
         accountService.save(accountRegistrationDTO);
+
         return makeDefaultResponseEntity("/login", HttpStatus.CREATED);
     }
 

src/main/java/codesquad/web/ApiMenuCategoryController.java

@@ -2,7 +2,7 @@
 
 import codesquad.domain.Account;
 import codesquad.domain.MenuCategory;
-import codesquad.security.ManagerAccount;
+import codesquad.security.AdminAccount;
 import codesquad.service.MenuCategoryService;
 import codesquad.web.dto.MenuCategoryDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,13 +26,13 @@ public List<MenuCategory> getCategories() {
     }
 
     @PostMapping("")
-    public ResponseEntity<MenuCategory> create(@ManagerAccount Account manager, @RequestBody MenuCategoryDTO menuCategoryDTO) {
+    public ResponseEntity<MenuCategory> create(@AdminAccount Account manager, @RequestBody MenuCategoryDTO menuCategoryDTO) {
         MenuCategory createdCategory = menuCategoryService.create(menuCategoryDTO);
         return makeCreatedResponseEntity(createdCategory);
     }
 
     @DeleteMapping("/{id}")
-    public MenuCategory delete(@ManagerAccount Account manager, @PathVariable Long id) {
+    public MenuCategory delete(@AdminAccount Account manager, @PathVariable Long id) {
         return menuCategoryService.deleteById(id);
     }
 }

src/main/java/support/domain/AbstractEntity.java

@@ -36,8 +36,10 @@ public AbstractEntity(Long id) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         AbstractEntity that = (AbstractEntity) o;
         return Objects.equals(id, that.id);
     }

src/main/resources/application-development.properties

@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:mysql://localhost:3306/springboot?useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=minseok
+spring.datasource.password=password
+
+server.port=80
+
+spring.jpa.hibernate.ddl-auto=validate
+
+logging.config=classpath:logback-${spring.profiles.active}.xml

src/main/resources/application-local.properties

@@ -0,0 +1,6 @@
+spring.jpa.hibernate.ddl-auto=create
+
+spring.jpa.show-sql=true 
+spring.jpa.properties.hibernate.format_sql=true
+logging.level.org.hibernate.type.descriptor.sql=trace
+

src/main/resources/application-prod.properties

@@ -0,0 +1,8 @@
+server.port=80
+
+spring.datasource.url=jdbc:mysql://localhost:3306/springboot?useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=minseok
+spring.datasource.password=password
+spring.jpa.hibernate.ddl-auto=validate
+
+logging.config=classpath:logback-${spring.profiles.active}.xml

src/main/resources/application.properties

@@ -1,15 +1,9 @@
+spring.profiles.active=local
+
+spring.autoconfigure.exclude= org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
+
 handlebars.suffix=.hbs
 handlebars.cache=false
 handlebars.expose-session-attributes=true
 
-spring.datasource.url=jdbc:mysql://localhost:3306/springboot?useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.username=minseok
-spring.datasource.password=password
-spring.jpa.hibernate.ddl-auto=create
-
-spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.format_sql=true
-logging.level.org.hibernate.type.descriptor.sql=trace
-log4j.logger.org.hibernate.type=debug
-
-spring.autoconfigure.exclude= org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
+logging.config=classpath:logback.xml

src/main/resources/import.sql

@@ -1,5 +1,5 @@
 INSERT INTO account (id, user_id, password, name, email, phone_number, type ,create_at) values (1, 'test@google.com', '$2a$10$75iOIZVohML12YADpMEqre39yvfFQWn8PkoCf0VMct6ItcVVb77B.', '자바지기', 'javajigi@slipp.net', '010-1111-1111', 'MEMBER', CURRENT_TIMESTAMP());
-INSERT INTO account (id, user_id, password, name, email, phone_number, type ,create_at) values (2, 'admin@admin.com', '$2a$10$75iOIZVohML12YADpMEqre39yvfFQWn8PkoCf0VMct6ItcVVb77B.', '관리자', 'admin@admin.com', '010-1111-1111', 'MANAGER', CURRENT_TIMESTAMP());
+INSERT INTO account (id, user_id, password, name, email, phone_number, type ,create_at) values (2, 'admin@admin.com', '$2a$10$75iOIZVohML12YADpMEqre39yvfFQWn8PkoCf0VMct6ItcVVb77B.', '관리자', 'admin@admin.com', '010-1111-1111', 'ADMIN', CURRENT_TIMESTAMP());
 
 INSERT INTO menu_category (name, parent_id, id, create_at) values ('밑반찬', NULL, 1, CURRENT_TIMESTAMP());
 INSERT INTO menu_category (name, parent_id, id, create_at) values ('무침', 1, 2, CURRENT_TIMESTAMP());

src/main/resources/logback-development.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <file>mylog.txt</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>mylog-%d{yyyy-MM-dd}.%i.txt</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- or whenever the file size reaches 100MB -->
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>[%-5level] %d{HH:mm:ss.SSS} %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="ROLLING"/>
+    </root>
+</configuration>

src/main/resources/logback-prod.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <file>mylog.txt</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>mylog-%d{yyyy-MM-dd}.%i.txt</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- or whenever the file size reaches 100MB -->
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>[%-5level] %d{HH:mm:ss.SSS} %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="ROLLING"/>
+    </root>
+</configuration>

src/main/resources/logback.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
+