From 32599726a6a4db4b55780134872e1dcdd1baf227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=B2=AB=E8=8A=B1=E7=81=ABzzz=F0=9F=8C=99?=
 <xmcn@1l1.icu>
Date: Sat, 30 Nov 2024 10:16:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[*]=20Turnstile=20=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 |  5 ++--
 src/api/v2/auth/login.api.ts |  5 ++--
 src/views/auth/LoginView.vue | 57 +++++++++++++++---------------------
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/package.json b/package.json
index bbeb6da..c5f2097 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,11 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
+    "@vicons/fa": "^0.12.0",
+    "@vicons/fluent": "^0.12.0",
     "@vicons/ionicons4": "^0.12.0",
     "@vicons/ionicons5": "^0.12.0",
     "@vicons/material": "^0.12.0",
-    "@vicons/fa": "^0.12.0",
-    "@vicons/fluent": "^0.12.0",
     "axios": "^1.7.7",
     "highlight.js": "^11.10.0",
     "js-cookie": "^3.0.5",
@@ -33,6 +33,7 @@
     "vue-native-websocket": "^2.0.15",
     "vue-route": "^1.5.1",
     "vue-router": "^4.4.5",
+    "vue-turnstile": "^1.0.11",
     "vuex": "^4.1.0"
   },
   "devDependencies": {
diff --git a/src/api/v2/auth/login.api.ts b/src/api/v2/auth/login.api.ts
index 01748d2..fad0b8b 100644
--- a/src/api/v2/auth/login.api.ts
+++ b/src/api/v2/auth/login.api.ts
@@ -2,10 +2,11 @@
 import { post } from '@/utils/request'
 import base from '@/api/base'
 
-const login = async (username: string, password: string) => {
+const login = async (username: string, password: string, captcha_response_token: string) => {
   const rs = post(`${base.api_v2_url}/auth/login`, {
     username: username,
-    password: password
+    password: password,
+    captcha_response_token: captcha_response_token
   })
   return base.buildResponse(await rs)
 }
diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue
index d1c1412..03cb1ac 100644
--- a/src/views/auth/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -43,7 +43,18 @@
               >
                 没有账户？去注册
               </n-button>
-              <n-button type="primary" @click="login"> 登录</n-button>
+              <n-button type="primary" @click="showTurnstile = true"> 登录</n-button>
+              <!-- Turnstile -->
+              <n-modal
+                v-model:show="showTurnstile"
+                :mask-closable="false"
+                preset="card"
+                :closable="false"
+                title="请完成人机验证"
+                style="min-width: 300px; width: min-content"
+              >
+                <vue-turnstile site-key="0x4AAAAAAAEXAhvwOKerpBsb" v-model="token" />
+              </n-modal>
             </n-space>
           </n-space>
         </div>
@@ -53,7 +64,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 import { useLoadingBar, useMessage } from 'naive-ui'
 import router from '@router'
 import userData from '@/utils/stores/userData/store'
@@ -61,6 +72,7 @@ import { sendErrorMessage } from '@/utils/message'
 import logger from '@/utils/logger'
 import api from '@/api'
 import { getUrlKey } from '@/utils/request'
+import VueTurnstile from 'vue-turnstile';
 
 const formRef = ref(null)
 const message = useMessage()
@@ -68,6 +80,9 @@ const ldb = useLoadingBar()
 const qqLoginLoading = ref(false)
 // const oauthLogin_loading = ref(false)
 
+let token = ref('')
+const showTurnstile = ref(false)
+
 const model = ref([
   {
     username: '',
@@ -81,38 +96,14 @@ if (redirect !== null) {
   logger.info('Redirect after login: ' + redirect)
 }
 
-// if (token !== null) {
-//   onMounted(async () => {
-//     other_login.value = true
-//     let rs
-//     try {
-//       rs = await api.v2.auth.oauth.login.token(token)
-//     } catch (e) {
-//       sendErrorMessage('登录失败: ' + e)
-//       router.push('/auth/login')
-//     }
-//     if (!rs) return
-//     if (rs.status === 200) {
-//       message.success(rs.data.username + '，欢迎回来！')
-//       userData.commit('set_token', rs.data.token)
-//       userData.commit('set_user_info', rs.data)
-//       router.push(redirect || '/dashboard')
-//     }
-//   })
-// }
-
-// LoCyan OAuth 2.0
-// There is no need
-// function oauthLogin() {
-//   oauthLogin_loading.value = true
-//   window.location.href =
-//     'https://api-v2.locyanfrp.cn/api/v2/oauth/authorize?redirectUrl=http://' +
-//     window.location.host +
-//     '/auth/login'
-// }
+watch(token, (oldToken, newToken) => {
+  showTurnstile.value = false
+  console.log(newToken)
+  login(newToken)
+})
 
 // 登录
-async function login() {
+async function login(turnstileToken) {
   ldb.start()
   if (
     model.value.username === null ||
@@ -126,7 +117,7 @@ async function login() {
   }
   let rs
   try {
-    rs = await api.v2.auth.login(model.value.username, model.value.password)
+    rs = await api.v2.auth.login(model.value.username, model.value.password, turnstileToken)
   } catch (e) {
     sendErrorMessage('请求失败: ' + e)
   }

From fdd3c9eedd4314301cdcc33fbf6be0760ae592f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=B2=AB=E8=8A=B1=E7=81=ABzzz=F0=9F=8C=99?=
 <xmcn@1l1.icu>
Date: Sat, 30 Nov 2024 10:46:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[*]=20=E9=94=99=E8=AF=AF=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auth/LoginView.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue
index 03cb1ac..b6ab3b8 100644
--- a/src/views/auth/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -49,11 +49,18 @@
                 v-model:show="showTurnstile"
                 :mask-closable="false"
                 preset="card"
-                :closable="false"
                 title="请完成人机验证"
                 style="min-width: 300px; width: min-content"
               >
-                <vue-turnstile site-key="0x4AAAAAAAEXAhvwOKerpBsb" v-model="token" />
+                <vue-turnstile
+                  site-key="0x4AAAAAAAEXAhvwOKerpBsb"
+                  v-model="token"
+                  @error="(code) => {
+                    showTurnstile = false
+                    sendErrorMessage(`验证码加载失败，错误代码: ${code}`)
+                  }"
+                  @unsupported="sendErrorMessage('您的浏览器不支持加载验证码，请更换或升级浏览器后重试')"
+                />
               </n-modal>
             </n-space>
           </n-space>

From 8624625dab1ae74e5265c4a7a1ac36ff10f3c1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=B2=AB=E8=8A=B1=E7=81=ABzzz=F0=9F=8C=99?=
 <xmcn@1l1.icu>
Date: Mon, 2 Dec 2024 21:38:32 +0800
Subject: [PATCH 3/3] [*] Fix bug

---
 src/views/auth/LoginView.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue
index b6ab3b8..e9dd4d6 100644
--- a/src/views/auth/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -103,9 +103,8 @@ if (redirect !== null) {
   logger.info('Redirect after login: ' + redirect)
 }
 
-watch(token, (oldToken, newToken) => {
+watch(token, (newToken, _) => {
   showTurnstile.value = false
-  console.log(newToken)
   login(newToken)
 })