4 week mission

4Week_Mission/.gitignore

@@ -41,4 +41,5 @@ application.yml
 application-dev.yml
 application-prod.yml
 application-test.yml
+application-base-addi.yml
 application-API-KEY.properties

4Week_Mission/build.gradle

@@ -49,6 +49,10 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-batch'
 
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
     testImplementation 'org.springframework.batch:spring-batch-test'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/api/controller/ApiController.java

@@ -0,0 +1,92 @@
+package com.ll.exam.ebooks.app.api.controller;
+
+import com.ll.exam.ebooks.app.base.dto.RsData;
+import com.ll.exam.ebooks.app.base.rq.Rq;
+import com.ll.exam.ebooks.app.member.entity.Member;
+import com.ll.exam.ebooks.app.member.form.LoginForm;
+import com.ll.exam.ebooks.app.member.service.MemberService;
+import com.ll.exam.ebooks.app.myBook.entity.MyBook;
+import com.ll.exam.ebooks.app.myBook.service.MyBookService;
+import com.ll.exam.ebooks.app.security.dto.MemberContext;
+import com.ll.exam.ebooks.util.Ut;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1")
+@RequiredArgsConstructor
+@Slf4j
+public class ApiController {
+
+    private final MemberService memberService;
+    private final MyBookService myBookService;
+
+    @PostMapping("/member/login")
+    public ResponseEntity<RsData> login(@RequestBody LoginForm loginForm) {
+        Member member = memberService.findByUsername(loginForm.getUsername());
+
+        if (member == null) {
+            return Ut.spring.responseEntityOf(RsData.of("F-1", "일치하는 회원이 존재하지 않습니다."));
+        }
+
+        String accessToken = memberService.genAccessToken(member);
+
+        return Ut.spring.responseEntityOf(
+                RsData.of(
+                        "S-1",
+                        "로그인 성공, Access Token을 발급합니다.",
+                        Ut.mapOf(
+                                "accessToken", accessToken
+                        )
+                ),
+                Ut.spring.httpHeadersOf("Authentication", accessToken)
+        );
+    }
+
+    @GetMapping("/member/me")
+    public ResponseEntity<RsData> me(@AuthenticationPrincipal MemberContext memberContext) {
+        if (memberContext == null) { // 임시코드, 나중에는 시프링 시큐리티를 이용해서 로그인을 안했다면, 아예 여기로 못 들어오도록
+            return Ut.spring.responseEntityOf(RsData.failOf(null));
+        }
+
+        return Ut.spring.responseEntityOf(RsData.successOf(memberContext.getMember()));
+    }
+
+    @GetMapping("/myBooks")
+    public ResponseEntity<RsData> myBooks(@AuthenticationPrincipal MemberContext memberContext) {
+        Member member = memberContext.getMember();
+
+        log.debug("member: " + member.getId());
+
+        if (member == null) {
+            return Ut.spring.responseEntityOf(
+                    RsData.of(
+                            "F-1",
+                            "조회 권한이 없습니다."
+                    )
+            );
+        }
+
+        List<MyBook> myBooks = myBookService.findAllByOwnerId(member.getId());
+
+        log.debug("myBooks: " + myBooks);
+
+        return Ut.spring.responseEntityOf(
+                RsData.successOf(
+                        Ut.mapOf(
+                                "myBooks", myBooks
+                        )
+                )
+        );
+    }
+
+}

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/base/dto/RsData.java

@@ -0,0 +1,36 @@
+package com.ll.exam.ebooks.app.base.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class RsData<T> {
+    private String resultCode;
+    private String msg;
+    private T data;
+
+    public static <T> RsData<T> of(String resultCode, String msg, T data) {
+        return new RsData<>(resultCode, msg, data);
+    }
+
+    public static <T> RsData<T> of(String resultCode, String msg) {
+        return of(resultCode, msg, null);
+    }
+
+    public static <T> RsData<T> successOf(T data) {
+        return of("S-1", "성공", data);
+    }
+
+    public static <T> RsData<T> failOf(T data) {
+        return of("F-1", "실패", data);
+    }
+
+    public boolean isSuccess() {
+        return resultCode.startsWith("S-1");
+    }
+
+    public boolean isFail() {
+        return isSuccess() == false;
+    }
+}

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/member/entity/Member.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ll.exam.ebooks.app.base.entity.BaseEntity;
+import com.ll.exam.ebooks.util.Ut;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,6 +17,7 @@
 import javax.persistence.Entity;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Entity
 @Getter
@@ -36,10 +38,13 @@ public class Member extends BaseEntity {
 
     private String nickname;
 
+    @JsonIgnore
     private int authLevel;
 
+    @JsonIgnore
     private long restCash; // 예치금
 
+    @JsonIgnore
     public String getName() {
         if (nickname == null) {
             return username;
@@ -51,6 +56,7 @@ public Member(long id) {
         super(id);
     }
 
+    @JsonIgnore
     public List<GrantedAuthority> getAuthorities() {
         List<GrantedAuthority> authorities = new ArrayList<>();
         authorities.add(new SimpleGrantedAuthority("MEMBER"));
@@ -65,4 +71,17 @@ public List<GrantedAuthority> getAuthorities() {
 
         return authorities;
     }
+
+    @JsonIgnore
+    public Map<String, Object> getAccessTokenClaims() {
+        return Ut.mapOf(
+                "id", getId(),
+                "createDate", getCreateDate(),
+                "modifyDate", getModifyDate(),
+                "username", getUsername(),
+                "email", getEmail(),
+                "authLevel", getAuthLevel(),
+                "authorities", getAuthorities()
+        );
+    }
 }

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/member/form/LoginForm.java

@@ -0,0 +1,20 @@
+package com.ll.exam.ebooks.app.member.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginForm {
+    @NotEmpty
+    private String username;
+
+    @NotEmpty
+    private String password;
+}

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/member/service/MemberService.java

@@ -9,6 +9,7 @@
 import com.ll.exam.ebooks.app.member.exception.MemberNotFoundException;
 import com.ll.exam.ebooks.app.member.repository.MemberRepository;
 import com.ll.exam.ebooks.app.security.dto.MemberContext;
+import com.ll.exam.ebooks.app.security.jwt.JwtProvider;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContext;
@@ -28,6 +29,7 @@ public class MemberService {
     private final PasswordEncoder passwordEncoder;
     private final MailService mailService;
     private final CashService cashService;
+    private final JwtProvider jwtProvider;
 
 
     @Transactional
@@ -74,6 +76,10 @@ public Member adminJoin(JoinForm joinForm) {
         return member;
     }
 
+    public String genAccessToken(Member member) {
+        return jwtProvider.generatedAccessToken(member.getAccessTokenClaims(), 60 * 60 * 24 * 90);
+    }
+
     public Member findByEmail(String email) {
         return memberRepository.findByEmail(email).orElse(null);
     }
@@ -132,7 +138,7 @@ public boolean beAuthor(Member member, String nickname) {
     }
 
     private void forceAuthentication(Member member) {
-        MemberContext memberContext = new MemberContext(member, member.getAuthorities());
+        MemberContext memberContext = new MemberContext(member);
 
         UsernamePasswordAuthenticationToken authentication =
                 UsernamePasswordAuthenticationToken.authenticated(

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/myBook/repository/MyBookRepository.java

@@ -3,6 +3,10 @@
 import com.ll.exam.ebooks.app.myBook.entity.MyBook;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface MyBookRepository extends JpaRepository<MyBook, Long> {
     void deleteByProductIdAndOwnerId(Long productId, Long ownerId);
+
+    List<MyBook> findAllByOwnerId(Long ownerId);
 }

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/myBook/service/MyBookService.java

@@ -12,6 +12,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
@@ -35,4 +37,8 @@ public void remove(Order order) {
                 .stream()
                 .forEach(orderItem -> myBookRepository.deleteByProductIdAndOwnerId(orderItem.getProduct().getId(), order.getBuyer().getId()));
     }
+
+    public List<MyBook> findAllByOwnerId(Long OwnerId) {
+        return myBookRepository.findAllByOwnerId(OwnerId);
+    }
 }

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/product/repository/ProductRepository.java

@@ -7,5 +7,4 @@
 
 public interface ProductRepository extends JpaRepository<Product, Long> {
     List<Product> findAllByOrderByIdDesc();
-
 }

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/security/SecurityConfig.java

@@ -1,6 +1,6 @@
 package com.ll.exam.ebooks.app.security;
 
-import com.ll.exam.ebooks.app.security.service.CustomUserDetailsService;
+import com.ll.exam.ebooks.app.security.filter.JwtAuthorizationFilter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,19 +12,19 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @RequiredArgsConstructor
 public class SecurityConfig {
 
-    private final CustomUserDetailsService customUserDetailsService;
-
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
-                .csrf().disable()
+                .cors().disable() // 타 도메인에서 API 호출 가능
+                .csrf().disable() // CSRF 토큰 끄기
                 .formLogin(
                         formLogin -> formLogin
                                 .loginPage("/member/login")

4Week_Mission/src/main/java/com/ll/exam/ebooks/app/security/dto/MemberContext.java

@@ -1,5 +1,6 @@
 package com.ll.exam.ebooks.app.security.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.ll.exam.ebooks.app.member.entity.Member;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,27 +9,28 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Getter
+@JsonIgnoreProperties({"id", "createDate", "modifyDate", "username", "email", "nickname"})
 public class MemberContext extends User {
     private final Long id;
     private final String username;
-    @Setter
-    private String email;
-    @Setter
-    private String nickname;
+    private final String email;
+    private final String nickname;
     private final LocalDateTime createDate;
-    @Setter
-    private LocalDateTime modifyDate;
-
-    public MemberContext(Member member, List<GrantedAuthority> authorities) {
-        super(member.getUsername(), member.getPassword(), authorities);
-        this.id = member.getId();
-        this.username = member.getUsername();
-        this.email = member.getEmail();
-        this.nickname = member.getNickname();
-        this.createDate = member.getCreateDate();
-        this.modifyDate = member.getModifyDate();
+    private final LocalDateTime modifyDate;
+
+    public MemberContext(Member member) {
+        super(member.getUsername(), "", member.getAuthorities());
+
+        id = member.getId();
+        username = member.getUsername();
+        email = member.getEmail();
+        nickname = member.getNickname();
+        createDate = member.getCreateDate();
+        modifyDate = member.getModifyDate();
     }
 
     public Member getMember() {