Merge remote-tracking branch 'origin/fix/jwt' into fix/jwt

asowjdan · asowjdan · commit fd89cb72ce49 · 2025-10-01T11:02:54.000+09:00
# Conflicts:
#	backend/src/test/java/com/ai/lawyer/domain/member/controller/MemberControllerTest.java
diff --git a/backend/src/test/java/com/ai/lawyer/domain/member/controller/MemberControllerTest.java b/backend/src/test/java/com/ai/lawyer/domain/member/controller/MemberControllerTest.java
@@ -517,7 +517,7 @@ void resetPassword_Success_WithLoginIdInBody() throws Exception {
                 .andExpect(jsonPath("$.success").value(true));
 
         verify(memberService).resetPassword("test@example.com", "newPassword123", true);
-        verify(memberService).logout(eq("test@example.com"), any());
+        verify(memberService).logout("test@example.com", any());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ void resetPassword_Success_WithLoginIdInBody() throws Exception {`
`517`	`517`	`.andExpect(jsonPath("$.success").value(true));`
`518`	`518`
`519`	`519`	`verify(memberService).resetPassword("[email protected]", "newPassword123", true);`
`520`		`- verify(memberService).logout(eq("[email protected]"), any());`
	`520`	`+ verify(memberService).logout("[email protected]", any());`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`@Test`