From da4ccada1f4f009cefc7e2a97be8105b5c915661 Mon Sep 17 00:00:00 2001 From: jun02160 Date: Sat, 23 Mar 2024 20:43:51 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20bugfix:=20Apple=20Login=EC=9D=84?= =?UTF-8?q?=20=EC=9C=84=ED=95=9C=20FeignClient=20=EB=B9=88=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20#145=20=EA=B2=B0#=20=E2=9C=A8=20feat:=20=20=20=20?= =?UTF-8?q?=20=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 8 +++++++- motivoo-external/build.gradle | 8 +++++++- .../motivoo/external/client/auth/FeignClientConfig.java | 4 +++- .../client/auth/apple/service/AppleLoginService.java | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 7662ab6a..859f0873 100644 --- a/build.gradle +++ b/build.gradle @@ -143,7 +143,7 @@ subprojects { implementation 'org.springframework.boot:spring-boot-starter-data-redis' // Feign - implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + implementation "org.springframework.cloud:spring-cloud-starter-openfeign:4.0.3" // Firebase implementation "com.google.firebase:firebase-admin:9.1.1" @@ -158,6 +158,12 @@ subprojects { } + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.3" + } + } + test { useJUnitPlatform() } diff --git a/motivoo-external/build.gradle b/motivoo-external/build.gradle index 1e62b716..d6ac9e88 100644 --- a/motivoo-external/build.gradle +++ b/motivoo-external/build.gradle @@ -5,8 +5,14 @@ dependencies { implementation project(":motivoo-common") // Social Login - implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + implementation "org.springframework.cloud:spring-cloud-starter-openfeign:4.0.3" // for JsonIgnore implementation group: "io.jsonwebtoken", name: "jjwt-jackson", version: "0.11.2" +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.3" + } } \ No newline at end of file diff --git a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java index 142b0637..3dda3e23 100644 --- a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java +++ b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/FeignClientConfig.java @@ -2,8 +2,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; +import sopt.org.motivoo.external.MotivooExternalRoot; + @Configuration -@EnableFeignClients(basePackageClasses = FeignClientConfig.class) +@EnableFeignClients(basePackageClasses = MotivooExternalRoot.class) public class FeignClientConfig { } \ No newline at end of file diff --git a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java index 905d33fd..1476ac85 100644 --- a/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java +++ b/motivoo-external/src/main/java/sopt/org/motivoo/external/client/auth/apple/service/AppleLoginService.java @@ -21,7 +21,7 @@ @Service public class AppleLoginService { - private AppleClient appleClient; + private final AppleClient appleClient; private final AppleJwtParser appleJwtParser; private final PublicKeyGenerator publicKeyGenerator; private final AppleClaimsValidator appleClaimsValidator;