sa2kit 1.6.64 → 1.6.67

package/dist/auth/legacy/index.mjs

@@ -4,6 +4,14 @@ import { X, Phone, Lock, EyeOff, Eye, User, LogOut, LogIn } from 'lucide-react';
 
 // src/auth/legacy/components/AuthGuard.tsx
 var AuthContext = createContext(void 0);
+function extractUser(data) {
+  return data?.user ?? data?.data?.user ?? null;
+}
+function extractValid(data) {
+  if (typeof data?.valid === "boolean") return data.valid;
+  if (typeof data?.data?.valid === "boolean") return data.data.valid;
+  return false;
+}
 function AuthProvider({ children }) {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);
@@ -21,10 +29,12 @@ function AuthProvider({ children }) {
       console.log("\u{1F4E1} [AuthContext] \u4F1A\u8BDD\u9A8C\u8BC1\u54CD\u5E94\u72B6\u6001:", response.status);
       const data = await response.json();
       console.log("\u{1F4C4} [AuthContext] \u4F1A\u8BDD\u9A8C\u8BC1\u54CD\u5E94\u6570\u636E:", data);
+      const resolvedUser = extractUser(data);
+      const resolvedValid = extractValid(data);
       safeSetState(() => {
-        if (data.valid && data.user) {
-          console.log("\u2705 [AuthContext] \u4F1A\u8BDD\u9A8C\u8BC1\u6210\u529F, \u7528\u6237:", data.user);
-          setUser(data.user);
+        if (resolvedValid && resolvedUser) {
+          console.log("\u2705 [AuthContext] \u4F1A\u8BDD\u9A8C\u8BC1\u6210\u529F, \u7528\u6237:", resolvedUser);
+          setUser(resolvedUser);
           setIsAuthenticated(true);
         } else {
           console.log("\u274C [AuthContext] \u4F1A\u8BDD\u9A8C\u8BC1\u5931\u8D25:", data.message);
@@ -55,9 +65,10 @@ function AuthProvider({ children }) {
       console.log("\u{1F4E1} [AuthContext] \u6536\u5230\u54CD\u5E94\uFF0C\u72B6\u6001\u7801:", response.status);
       const data = await response.json();
       console.log("\u{1F4C4} [AuthContext] \u54CD\u5E94\u6570\u636E:", data);
-      if (data.success && data.user) {
+      const resolvedUser = extractUser(data);
+      if (data.success && resolvedUser) {
         console.log("\u2705 [AuthContext] \u767B\u5F55\u6210\u529F, \u5F00\u59CB\u66F4\u65B0\u5168\u5C40\u72B6\u6001");
-        console.log("\u{1F464} [AuthContext] \u7528\u6237\u6570\u636E:", data.user);
+        console.log("\u{1F464} [AuthContext] \u7528\u6237\u6570\u636E:", resolvedUser);
         console.log("\u{1F4CA} [AuthContext] \u66F4\u65B0\u524D\u72B6\u6001:", {
           currentUser: user ? `${user.name || "\u672A\u8BBE\u7F6E"} (${user.phone})` : null,
           currentIsAuthenticated: isAuthenticated,
@@ -65,8 +76,8 @@ function AuthProvider({ children }) {
         });
         console.log("\u{1F504} [AuthContext] \u6267\u884C\u5168\u5C40\u72B6\u6001\u66F4\u65B0...");
         safeSetState(() => {
-          console.log("\u{1F504} [AuthContext] \u6B63\u5728\u8BBE\u7F6E\u7528\u6237:", data.user);
-          setUser(data.user);
+          console.log("\u{1F504} [AuthContext] \u6B63\u5728\u8BBE\u7F6E\u7528\u6237:", resolvedUser);
+          setUser(resolvedUser);
           console.log("\u{1F504} [AuthContext] \u6B63\u5728\u8BBE\u7F6E\u8BA4\u8BC1\u72B6\u6001: true");
           setIsAuthenticated(true);
           console.log("\u{1F504} [AuthContext] \u6B63\u5728\u8BBE\u7F6E\u52A0\u8F7D\u72B6\u6001: false");
@@ -75,12 +86,12 @@ function AuthProvider({ children }) {
         });
         setTimeout(() => {
           console.log("\u{1F389} [AuthContext] \u5EF6\u8FDF\u786E\u8BA4 - \u5168\u5C40\u767B\u5F55\u72B6\u6001\u5E94\u8BE5\u5DF2\u66F4\u65B0:", {
-            user: data.user,
+            user: resolvedUser,
             isAuthenticated: true
           });
         }, 0);
         console.log("\u{1F680} [AuthContext] \u8FD4\u56DE\u6210\u529F\u7ED3\u679C");
-        return { success: true, user: data.user };
+        return { success: true, user: resolvedUser };
       } else {
         console.log("\u274C [AuthContext] \u767B\u5F55\u5931\u8D25:", data.message);
         return { success: false, message: data.message };
@@ -100,15 +111,16 @@ function AuthProvider({ children }) {
       });
       const data = await response.json();
       console.log("\u{1F4E1} [AuthContext] \u6CE8\u518C\u54CD\u5E94:", data);
-      if (data.success && data.user) {
+      const resolvedUser = extractUser(data);
+      if (data.success && resolvedUser) {
         console.log("\u2705 [AuthContext] \u6CE8\u518C\u6210\u529F, \u7ACB\u5373\u66F4\u65B0\u5168\u5C40\u72B6\u6001");
         safeSetState(() => {
-          setUser(data.user);
+          setUser(resolvedUser);
           setIsAuthenticated(true);
           setLoading(false);
         });
         console.log("\u{1F680} [AuthContext] \u8FD4\u56DE\u6CE8\u518C\u6210\u529F\u7ED3\u679C");
-        return { success: true, user: data.user };
+        return { success: true, user: resolvedUser };
       } else {
         console.log("\u274C [AuthContext] \u6CE8\u518C\u5931\u8D25:", data.message);
         return { success: false, message: data.message };
@@ -560,6 +572,7 @@ function LoginModal({ isOpen, onClose, onSuccess, onSwitchToRegister }) {
           id: "phone",
           name: "phone",
           type: "tel",
+          autoComplete: "tel",
           value: formData.phone,
           onChange: handleInputChange,
           placeholder: "\u8BF7\u8F93\u5165\u624B\u673A\u53F7",
@@ -572,6 +585,7 @@ function LoginModal({ isOpen, onClose, onSuccess, onSwitchToRegister }) {
           id: "password",
           name: "password",
           type: showPassword ? "text" : "password",
+          autoComplete: "current-password",
           value: formData.password,
           onChange: handleInputChange,
           placeholder: "\u8BF7\u8F93\u5165\u5BC6\u7801",
@@ -800,6 +814,7 @@ function RegisterModal({ isOpen, onClose, onSuccess, onSwitchToLogin }) {
           id: "phone",
           name: "phone",
           type: "tel",
+          autoComplete: "tel",
           value: formData.phone,
           onChange: handleInputChange,
           placeholder: "\u8BF7\u8F93\u5165\u624B\u673A\u53F7",
@@ -812,6 +827,7 @@ function RegisterModal({ isOpen, onClose, onSuccess, onSwitchToLogin }) {
           id: "name",
           name: "name",
           type: "text",
+          autoComplete: "name",
           value: formData.name,
           onChange: handleInputChange,
           placeholder: "\u8BF7\u8F93\u5165\u59D3\u540D\uFF08\u53EF\u9009\uFF09",
@@ -824,6 +840,7 @@ function RegisterModal({ isOpen, onClose, onSuccess, onSwitchToLogin }) {
           id: "password",
           name: "password",
           type: showPassword ? "text" : "password",
+          autoComplete: "new-password",
           value: formData.password,
           onChange: handleInputChange,
           placeholder: "\u8BF7\u8F93\u5165\u5BC6\u7801\uFF08\u81F3\u5C116\u4F4D\uFF09",
@@ -845,6 +862,7 @@ function RegisterModal({ isOpen, onClose, onSuccess, onSwitchToLogin }) {
           id: "confirmPassword",
           name: "confirmPassword",
           type: showConfirmPassword ? "text" : "password",
+          autoComplete: "new-password",
           value: formData.confirmPassword,
           onChange: handleInputChange,
           placeholder: "\u8BF7\u518D\u6B21\u8F93\u5165\u5BC6\u7801",