From 930e536fe3af403dc30ce5252c016445e8f8138c Mon Sep 17 00:00:00 2001
From: Ray Hao <1490493387@qq.com>
Date: Sat, 24 Feb 2024 20:35:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20OAuth2=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oauth2/CaptchaAuthenticationTests.java    | 47 -------------------
 .../oauth2/PasswordAuthenticationTests.java   |  3 ++
 ...Tests.java => SmsAuthenticationTests.java} |  2 +-
 3 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 youlai-auth/src/test/java/com/youlai/auth/oauth2/CaptchaAuthenticationTests.java
 rename youlai-auth/src/test/java/com/youlai/auth/oauth2/{SmsCodeAuthenticationTests.java => SmsAuthenticationTests.java} (97%)

diff --git a/youlai-auth/src/test/java/com/youlai/auth/oauth2/CaptchaAuthenticationTests.java b/youlai-auth/src/test/java/com/youlai/auth/oauth2/CaptchaAuthenticationTests.java
deleted file mode 100644
index e35effc9..00000000
--- a/youlai-auth/src/test/java/com/youlai/auth/oauth2/CaptchaAuthenticationTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.youlai.auth.oauth2;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpHeaders;
-import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
-import org.springframework.test.web.servlet.MockMvc;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-@SpringBootTest
-@AutoConfigureMockMvc
-@Slf4j
-public class CaptchaAuthenticationTests {
-
-    @Autowired
-    private MockMvc mvc;
-
-
-    @Test
-    void testPasswordAuthentication() throws Exception {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setBasicAuth("mall-admin", "123456");
-
-        // @formatter:off
-        this.mvc.perform(post("/oauth2/token")
-                        .param(OAuth2ParameterNames.GRANT_TYPE, "captcha")
-                        .param(OAuth2ParameterNames.USERNAME, "admin")
-                        .param(OAuth2ParameterNames.PASSWORD, "123456")
-                        .param(CaptchaParameterNames.CODE, "123456")
-                        .param(CaptchaParameterNames.KEY, "123456")
-                        .headers(headers))
-                .andDo(print())
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.access_token").isNotEmpty());
-        // @formatter:on
-    }
-
-
-}
\ No newline at end of file
diff --git a/youlai-auth/src/test/java/com/youlai/auth/oauth2/PasswordAuthenticationTests.java b/youlai-auth/src/test/java/com/youlai/auth/oauth2/PasswordAuthenticationTests.java
index cf05f5ef..84f1c037 100644
--- a/youlai-auth/src/test/java/com/youlai/auth/oauth2/PasswordAuthenticationTests.java
+++ b/youlai-auth/src/test/java/com/youlai/auth/oauth2/PasswordAuthenticationTests.java
@@ -1,5 +1,6 @@
 package com.youlai.auth.oauth2;
 
+import com.youlai.common.constant.OAuth2Constants;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,8 @@ public class PasswordAuthenticationTests {
                         .param(OAuth2ParameterNames.GRANT_TYPE, "password") // 密码模式
                         .param(OAuth2ParameterNames.USERNAME, "admin") // 用户名
                         .param(OAuth2ParameterNames.PASSWORD, "123456") // 密码
+                        .param(  OAuth2Constants.CAPTCHA_ID, "******") // 密码
+                        .param(OAuth2Constants.CAPTCHA_CODE, "******") // 密码
                         .headers(headers))
                 .andDo(print())
                 .andExpect(status().isOk())
diff --git a/youlai-auth/src/test/java/com/youlai/auth/oauth2/SmsCodeAuthenticationTests.java b/youlai-auth/src/test/java/com/youlai/auth/oauth2/SmsAuthenticationTests.java
similarity index 97%
rename from youlai-auth/src/test/java/com/youlai/auth/oauth2/SmsCodeAuthenticationTests.java
rename to youlai-auth/src/test/java/com/youlai/auth/oauth2/SmsAuthenticationTests.java
index 078e122f..a23d803f 100644
--- a/youlai-auth/src/test/java/com/youlai/auth/oauth2/SmsCodeAuthenticationTests.java
+++ b/youlai-auth/src/test/java/com/youlai/auth/oauth2/SmsAuthenticationTests.java
@@ -18,7 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @SpringBootTest
 @AutoConfigureMockMvc
 @Slf4j
-public class SmsCodeAuthenticationTests {
+public class SmsAuthenticationTests {
 
 
     @Autowired
-- 
GitLab