✨ 完善账号功能

Author: zty012

app/src/core/service/User.tsx renamed to app/src/core/service/UserState.tsx

@@ -2,14 +2,14 @@ import { Store } from "@tauri-apps/plugin-store";
 import { createStore } from "../../utils/store";
 import { FeatureFlags } from "./FeatureFlags";
 
-export namespace User {
+export namespace UserState {
   let store: Store;
 
   export async function init() {
     if (!FeatureFlags.USER) {
       return;
     }
-    store = await createStore("user");
+    store = await createStore("user.json");
   }
 
   export async function getToken() {

app/src/main.tsx

@@ -6,13 +6,16 @@ import { createRoot } from "react-dom/client";
 import { initReactI18next } from "react-i18next";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 import { runCli } from "./cli";
+import { Dialog } from "./components/dialog";
 import { UserScriptsManager } from "./core/plugin/UserScriptsManager";
 import { EdgeRenderer } from "./core/render/canvas2d/entityRenderer/edge/EdgeRenderer";
 import { Renderer } from "./core/render/canvas2d/renderer";
 import { InputElement } from "./core/render/domElement/inputElement";
 import { KeyboardOnlyEngine } from "./core/service/controlService/keyboardOnlyEngine/keyboardOnlyEngine";
 import { MouseLocation } from "./core/service/controlService/MouseLocation";
 import { KeyBinds } from "./core/service/controlService/shortcutKeysEngine/KeyBinds";
+import { ShortcutKeysRegister } from "./core/service/controlService/shortcutKeysEngine/shortcutKeysRegister";
+import { FileLoader } from "./core/service/dataFileService/fileLoader";
 import { RecentFileManager } from "./core/service/dataFileService/RecentFileManager";
 import { StartFilesManager } from "./core/service/dataFileService/StartFilesManager";
 import { ColorManager } from "./core/service/feedbackService/ColorManager";
@@ -22,6 +25,7 @@ import { StageStyleManager } from "./core/service/feedbackService/stageStyle/Sta
 import { LastLaunch } from "./core/service/LastLaunch";
 import { Settings } from "./core/service/Settings";
 import { Tourials } from "./core/service/Tourials";
+import { UserState } from "./core/service/UserState";
 import { Camera } from "./core/stage/Camera";
 import { Stage } from "./core/stage/Stage";
 import { StageLoader } from "./core/stage/StageLoader";
@@ -33,9 +37,6 @@ import "./polyfills/roundRect";
 import { exists } from "./utils/fs";
 import { exit, writeStderr } from "./utils/otherApi";
 import { getCurrentWindow, isDesktop, isFrame, isWeb, isWindows } from "./utils/platform";
-import { ShortcutKeysRegister } from "./core/service/controlService/shortcutKeysEngine/shortcutKeysRegister";
-import { FileLoader } from "./core/service/dataFileService/fileLoader";
-import { Dialog } from "./components/dialog";
 
 const router = createMemoryRouter(routes);
 const Routes = () => <RouterProvider router={router} />;
@@ -56,6 +57,7 @@ const el = document.getElementById("root")!;
     ColorManager.init(),
     Tourials.init(),
     UserScriptsManager.init(),
+    UserState.init(),
   ]);
   // 这些东西依赖上面的东西，所以单独一个Promise.all
   await Promise.all([loadLanguageFiles(), loadSyncModules(), loadStartFile(), ShortcutKeysRegister.registerKeyBinds()]);

app/src/pages/user/login.tsx

@@ -1,18 +1,20 @@
-import { Turnstile } from "@marsidev/react-turnstile";
+import { Turnstile, TurnstileInstance } from "@marsidev/react-turnstile";
 import { fetch } from "@tauri-apps/plugin-http";
 import { Check, Key, User } from "lucide-react";
-import { useState } from "react";
+import { useRef, useState } from "react";
 import Button from "../../components/Button";
 import { Dialog } from "../../components/dialog";
 import Input from "../../components/Input";
 import { Settings } from "../../core/service/Settings";
 import { Themes } from "../../core/service/Themes";
+import { UserState } from "../../core/service/UserState";
 
 export default function LoginPage() {
   const [theme] = Settings.use("theme");
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
   const [turnstileToken, setTurnstileToken] = useState("");
+  const turnstileInstance = useRef<TurnstileInstance>(null);
 
   const login = async () => {
     const resp = await fetch(`${import.meta.env.LR_API_BASE_URL}/user/login`, {
@@ -27,6 +29,7 @@ export default function LoginPage() {
       }),
     });
     if (resp.status === 200) {
+      await UserState.setToken((await resp.json()).token);
       Dialog.show({
         type: "success",
         title: "登录",
@@ -39,6 +42,7 @@ export default function LoginPage() {
         content: (await resp.json()).msg,
       });
     }
+    turnstileInstance.current?.reset();
   };
 
   return (
@@ -54,6 +58,7 @@ export default function LoginPage() {
       </div>
       <Turnstile
         siteKey={import.meta.env.LR_TURNSTILE_SITE_KEY ?? ""}
+        ref={turnstileInstance}
         onSuccess={setTurnstileToken}
         options={{
           theme: Themes.getThemeById(theme)?.metadata.type,

app/src/pages/user/register.tsx

@@ -1,8 +1,8 @@
-import { Turnstile } from "@marsidev/react-turnstile";
+import { Turnstile, TurnstileInstance } from "@marsidev/react-turnstile";
 import { fetch } from "@tauri-apps/plugin-http";
 import { open } from "@tauri-apps/plugin-shell";
 import { Check, Key, Ticket, User } from "lucide-react";
-import { useState } from "react";
+import { useRef, useState } from "react";
 import Button from "../../components/Button";
 import { Dialog } from "../../components/dialog";
 import Input from "../../components/Input";
@@ -16,6 +16,7 @@ export default function LoginPage() {
   const [passwordConfirm, setPasswordConfirm] = useState("");
   const [inviteCode, setInviteCode] = useState("");
   const [turnstileToken, setTurnstileToken] = useState("");
+  const turnstileInstance = useRef<TurnstileInstance>(null);
 
   const register = async () => {
     if (password !== passwordConfirm) {
@@ -50,6 +51,7 @@ export default function LoginPage() {
         content: (await resp.json()).msg,
       });
     }
+    turnstileInstance.current?.reset();
   };
 
   return (
@@ -80,6 +82,7 @@ export default function LoginPage() {
       </Button>
       <Turnstile
         siteKey={import.meta.env.LR_TURNSTILE_SITE_KEY ?? ""}
+        ref={turnstileInstance}
         onSuccess={setTurnstileToken}
         options={{
           theme: Themes.getThemeById(theme)?.metadata.type,