Merge remote-tracking branch 'origin/develop'

# Conflicts: # build.gradle # src/main/java/com/first/flash/account/member/application/MemberService.java # src/main/resources/application.properties
SWM-Flash · Sep 13, 2024 · b40e9b1 · b40e9b1
2 parents 504d3b1 + eb94e67
commit b40e9b1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -52,6 +52,16 @@ dependencies {
     // Swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
 
+    // jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+
+    // security
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    testImplementation 'org.springframework.security:spring-security-test'
+
+
 	// sentry
 	implementation 'io.sentry:sentry-spring-boot-starter-jakarta:7.9.0'
 

diff --git a/src/main/java/com/first/flash/account/member/application/MemberService.java b/src/main/java/com/first/flash/account/member/application/MemberService.java
@@ -82,7 +82,6 @@ public ManageConsentResponse manageMarketingConsent(final ManageConsentRequest r
 
     private Member findMemberByAuthInfo() {
         UUID id = AuthUtil.getId();
-        Member member = findById(id);
-        return MemberInfoResponse.toDto(member);
+        return findById(id);
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -20,6 +20,9 @@ scheduler.pool.size=5
 scheduler.threadNamePrefix=Scheduler-
 scheduler.awaitTerminationSeconds=30
 scheduler.waitForTasksToCompleteOnShutdown=true
+# JWT
+auth.jwt.secret=${JWT_SECRET}
+auth.jwt.expiration=${JWT_EXPIRATION}
 # Sentry
 sentry.dsn=${SENTRY_DSN}
 sentry.exception-resolver-order=-2147483647