Merge pull request #169 from UMC-Plantory/develop

[Main Merge] Plantory-V1

Author: iseevict

.github/workflows/dev_deploy.yml

@@ -24,6 +24,18 @@ jobs:
           echo "${{ secrets.APPLICATION_YML }}" > ./application.yml
         shell: bash
 
+      - name: Create Firebase JSON  # Firebase 서비스 계정 JSON 생성
+        run: |
+          mkdir -p src/main/resources/security/server-security/fcm
+          echo "${{ secrets.FIREBASE_JSON }}" > src/main/resources/security/server-security/fcm/plantory-firebase-adminsdk.json
+        shell: bash
+
+      - name: Create Apple Auth Key  # apple auth key 생성
+        run: |
+          mkdir -p src/main/resources/security/server-security/apple
+          echo "${{ secrets.APPLE_AUTH_KEY_P8 }}" > src/main/resources/security/server-security/apple/plantory-auth-key.p8
+        shell: bash
+
       - name: Grant execute permission for gradlew  # gradlew 실행 권한 부여
         run: chmod +x gradlew
 

.gitignore

@@ -38,4 +38,6 @@ out/
 .vscode/
 
 /src/main/resources/*.yml
-.DS_Store
+.DS_Store
+/src/main/resources/security/Server-Security/fcm/plantory-firebase-adminsdk.json
+/src/main/resources/security/Server-Security/apple/plantory-auth-key.p8

build.gradle

@@ -71,6 +71,9 @@ dependencies {
 	// JTokkit
 	implementation 'com.knuddels:jtokkit:1.1.0'
 
+	// firebase
+	implementation "com.google.firebase:firebase-admin:9.3.0"
+
 }
 
 tasks.named('test') {

src/main/java/umc/plantory/domain/apple/entity/AppleAuthData.java

@@ -0,0 +1,33 @@
+package umc.plantory.domain.apple.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import umc.plantory.global.baseEntity.BaseEntity;
+
+@Entity
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Getter
+@DynamicInsert
+@DynamicUpdate
+public class AppleAuthData extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "apple_auth_data_id")
+    private Long id;
+
+    @Column(length = 255)
+    private String clientSecret;
+
+    @Column(length = 10, nullable = false)
+    @ColumnDefault("'plantory'")
+    private String tag;
+
+    public void updateClientSecret(String newClientSecret) {
+        this.clientSecret = newClientSecret;
+    }
+}

src/main/java/umc/plantory/domain/apple/repository/AppleAuthDataRepository.java

@@ -0,0 +1,10 @@
+package umc.plantory.domain.apple.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import umc.plantory.domain.apple.entity.AppleAuthData;
+
+import java.util.Optional;
+
+public interface AppleAuthDataRepository extends JpaRepository<AppleAuthData, Long> {
+    Optional<AppleAuthData> findByTag (String tag);
+}

src/main/java/umc/plantory/domain/apple/sevice/AppleOidcService.java

@@ -2,27 +2,40 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.JwtParser;
-import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
 import umc.plantory.domain.apple.converter.AppleConverter;
 import umc.plantory.domain.member.dto.MemberDataDTO;
 import umc.plantory.domain.member.dto.MemberRequestDTO;
 import umc.plantory.global.apiPayload.code.status.ErrorStatus;
 import umc.plantory.global.apiPayload.exception.handler.AppleHandler;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.RSAPublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.RSAPublicKeySpec;
+import java.time.Instant;
 import java.util.Base64;
 import java.net.URL;
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -33,8 +46,20 @@ public class AppleOidcService {
     private static final String JWK_URL = "https://appleid.apple.com/auth/keys";
     // iss 검증 값
     private static final String ISSUER = "https://appleid.apple.com";
+    // 약 30일
+    private static final long MAX_EXP_SECONDS = 60L * 60L * 24L * 30L;
+
+    private final WebClient webClient;
+
     @Value("${apple.bundle-id}")
     private String BUNDLE_ID;
+    @Value("${apple.p8.location:}")
+    private Resource p8Resource;
+    @Value("${apple.key-id}")
+    private String KEY_ID;
+    @Value("${apple.team-id}")
+    private String TEAM_ID;
+
 
     /**
      * identity_token을 검증하고 담겨있는 멤버 데이터 추출
@@ -97,4 +122,89 @@ public MemberDataDTO.MemberData verifyAndParseIdToken(MemberRequestDTO.AppleOAut
             throw new AppleHandler(ErrorStatus.ERROR_ON_VERIFYING);
         }
     }
+
+    /**
+     * Authorization Code 를 통해 apple refresh_token 값을 받아오는 메서드
+     */
+    public String createAppleRefreshToken(String authorizationCode, String clientSecret) {
+        return webClient.post()
+                .uri("https://appleid.apple.com/auth/token")
+                .header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8")
+                .body(BodyInserters.fromFormData("grant_type", "authorization_code")
+                        .with("code", authorizationCode)
+                        .with("client_id", BUNDLE_ID)
+                        .with("client_secret", clientSecret))
+                .retrieve()
+                .bodyToMono(String.class)
+                .doOnNext(System.out::println)
+                .block();
+    }
+
+    /**
+     * Apple Client_Secret 생성 메서드
+     */
+    public String createAppleClientSecret() {
+        try {
+            ECPrivateKey privateKey = (ECPrivateKey) loadPrivateKeyFromPem();
+
+            Date iat = Date.from(Instant.now());
+            Date exp = Date.from(Instant.now().plusSeconds(MAX_EXP_SECONDS));
+
+            String jwt = Jwts.builder()
+                    .setHeaderParam("kid", KEY_ID)
+                    .setIssuer(TEAM_ID)
+                    .setSubject(BUNDLE_ID)
+                    .setAudience(ISSUER)
+                    .setIssuedAt(iat)
+                    .setExpiration(exp)
+                    .signWith(privateKey, SignatureAlgorithm.ES256)
+                    .compact();
+
+            return jwt;
+        } catch (Exception e) {
+            log.error("Failed to Refresh Apple Client_Secret", e);
+            throw new RuntimeException("Failed to Refresh Apple Client_Secret", e);
+        }
+    }
+
+    /**
+     * pem 파일에 적힌 privateKey 읽어오는 메서드
+     */
+    private PrivateKey loadPrivateKeyFromPem() throws Exception {
+        String pem;
+        if (p8Resource != null && p8Resource.exists()) {
+            try (BufferedReader br = new BufferedReader(new InputStreamReader(p8Resource.getInputStream(), StandardCharsets.UTF_8))) {
+                pem = br.lines().collect(Collectors.joining("\n"));
+            }
+        } else {
+            throw new AppleHandler(ErrorStatus._INTERNAL_SERVER_ERROR);
+        }
+
+        String normalized = pem
+                .replace("-----BEGIN PRIVATE KEY-----", "")
+                .replace("-----END PRIVATE KEY-----", "")
+                .replaceAll("\\s", "");
+
+        byte[] der = Base64.getDecoder().decode(normalized);
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(der);
+        KeyFactory kf = KeyFactory.getInstance("EC");
+        return kf.generatePrivate(keySpec);
+    }
+
+    /**
+     * 플랜토리 - 애플 연동 해제 메서드
+     */
+    public void unlinkUser(String refreshToken, String clientSecret) {
+        webClient.post()
+                .uri("https://appleid.apple.com/auth/revoke")
+                .header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8")
+                .body(BodyInserters.fromFormData("token_type_hint", "refresh_token")
+                        .with("token", refreshToken)
+                        .with("client_id", BUNDLE_ID)
+                        .with("client_secret", clientSecret))
+                .retrieve()
+                .bodyToMono(String.class)
+                .doOnNext(System.out::println)
+                .block();
+    }
 }

src/main/java/umc/plantory/domain/chat/controller/ChatRestController.java

@@ -69,4 +69,37 @@ public ResponseEntity<ApiResponse<ChatResponseDTO.ChatsResponse>> getChats(
         ChatResponseDTO.ChatsResponse chatList = chatQueryUseCase.findChatList(authorization, cursor, size);
         return ResponseEntity.ok(ApiResponse.onSuccess(chatList));
     }
+
+    @DeleteMapping
+    @Operation(
+            summary = "채팅창 초기화",
+            description = "지금까지의 채팅 내역을 초기화"
+    )
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "MEMBER4001", description = "존재하지 않는 회원입니다", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ResponseEntity<ApiResponse<Void>> deleteChats(
+            @RequestHeader(value = "Authorization", required = false) String authorization
+    ) {
+        chatCommandUseCase.delete(authorization);
+        return ResponseEntity.ok(ApiResponse.onSuccess(null));
+    };
+
+    @GetMapping("/search")
+    @Operation(
+            summary = "채팅 검색",
+            description = "입력한 단어의 채팅 검색")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "MEMBER4001", description = "존재하지 않는 회원입니다", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "CHAT4008", description = "해당 키워드를 포함하는 채팅이 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ResponseEntity<ApiResponse<ChatResponseDTO.ChatIdsResponse>> searchChatIdsByKeyword(
+            @RequestHeader(value = "Authorization", required = false) String authorization,
+            @RequestParam(value = "keyword") String keyword
+    ) {
+        ChatResponseDTO.ChatIdsResponse result = chatQueryUseCase.searchChatIdsByKeyword(authorization, keyword);
+        return ResponseEntity.ok(ApiResponse.onSuccess(result));
+    }
 }

src/main/java/umc/plantory/domain/chat/converter/ChatConverter.java

@@ -45,4 +45,10 @@ public static ChatResponseDTO.ChatResponse toChatResponseDTO(String response, Lo
                 .isMember(isMember)
                 .build();
     }
+
+    public static ChatResponseDTO.ChatIdsResponse toChatIdsResponse(List<Long> chatIdList) {
+        return ChatResponseDTO.ChatIdsResponse.builder()
+                .chatIdList(chatIdList)
+                .build();
+    }
 }

src/main/java/umc/plantory/domain/chat/dto/ChatResponseDTO.java

@@ -50,4 +50,13 @@ public static class ChatResponse {
         @Schema(description = "사용자 요청인지 챗봇 응답인지", example = "false")
         private Boolean isMember;
     }
+
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ChatIdsResponse {
+        @Schema(description = "채팅 아이디", example = "[14, 13, 12]")
+        private List<Long> chatIdList;
+    }
 }

src/main/java/umc/plantory/domain/chat/repository/ChatRepository.java

@@ -2,6 +2,12 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import umc.plantory.domain.chat.entity.Chat;
+import umc.plantory.domain.member.entity.Member;
+
+import java.util.List;
 
 public interface ChatRepository extends JpaRepository<Chat, Long> {
+    void deleteByMember(Member member);
+    void deleteAllByMember(Member member);
+    List<Chat> findByMemberAndContentContainingIgnoreCaseOrderByCreatedAtDesc(Member member, String keyword);
 }