fix: token

bittorrent · Sep 3, 2024 · 133a16e · 133a16e
1 parent 8cb62ac
commit 133a16e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/src/APIClient/APIClient10.js b/src/APIClient/APIClient10.js
@@ -1,16 +1,20 @@
 import xhr from "axios/index";
 import { PRECISION_RATE } from "utils/constants";
+import Cookies from 'js-cookie';
+
 
 class APIClient10 {
     constructor() {
         this.apiUrl = localStorage.getItem('NODE_URL') ? localStorage.getItem('NODE_URL') : "http://localhost:5001";
         this.request = async (url, body, config) => {
             const isFormData = body instanceof FormData
+            const token = Cookies.get(this.apiUrl) || '';
+            const addToken = url.includes('?')? `&token=${token}` : `?token=${token}`
             return new Promise(async (resolve, reject) => {
                 try {
 
                     let {data} = await xhr.post(
-                        this.apiUrl + url,
+                        this.apiUrl + url + addToken,
                         isFormData?body:
                         {
                             ...body

diff --git a/src/components/Login/Endpoint.js b/src/components/Login/Endpoint.js
@@ -10,8 +10,6 @@ import { t } from 'utils/text.js';
 
 const Endpoint = ({ color }) => {
     const inputRef = useRef(null);
-
-
     const getEndpoint = ()=>{
         const NODE_URL = localStorage.getItem('NODE_URL');
         if(NODE_URL){
@@ -34,6 +32,7 @@ const Endpoint = ({ color }) => {
         e.preventDefault();
         e.stopPropagation();
         const node_url = getNodeUrl();
+        localStorage.setItem('NODE_URL', node_url);
         if (!node_url) return;
         Emitter.emit('handleEndpoint', node_url);
     };

diff --git a/src/components/Login/PasswordLogin.js b/src/components/Login/PasswordLogin.js
@@ -24,7 +24,7 @@ const PasswordLogin = ({ color, endpoint }) => {
         let psw = aseEncode(password, endpoint);
         let res = await login(psw);
         if (res && res.Success) {
-            Cookies.set(endpoint, res.Text, { expires: 1, domain: 'localhost' });
+            Cookies.set(endpoint, res.Text, { expires: 1 });
             history.push('/admin/settings');
         } else {
             setTimes(times + 1);

diff --git a/src/components/Login/SetPassword.js b/src/components/Login/SetPassword.js
@@ -53,7 +53,7 @@ const Endpoint = ({ endpoint, isReset }) => {
         try {
             let res = await login(password);
             if (res && res.Success) {
-                Cookies.set(endpoint, res.Text, { expires: 1, domain: 'localhost' });
+                Cookies.set(endpoint, res.Text, { expires: 1});
                 history.push('/admin/settings');
             } else {
                 Emitter.emit('showMessageAlert', { message: res.Text || 'error', status: 'error' });

diff --git a/src/services/login.js b/src/services/login.js
@@ -1,8 +1,14 @@
 import Client10 from "APIClient/APIClient10.js";
+import xhr from "axios/index";
 
-export const checkLoginPassword = async () => {
+
+
+export const checkLoginPassword = async (url) => {
     try {
-        let data = await Client10.checkLoginPassword();
+        let {data} = await xhr.post(url + '/api/v1/dashboard/check');
+        if(data){
+            localStorage.setItem('NODE_URL', url);
+        }
         return data;
     } catch (e) {
         console.log(e);

diff --git a/src/views/login/Login.js b/src/views/login/Login.js
@@ -27,18 +27,18 @@ export default function Login(props) {
     // }
 
     const endpointChange = async val => {
-        if(loading)return;
-        setLoading(true)
+        if (loading) return;
+        setLoading(true);
         try {
-            let res = await checkLoginPassword();
-            setLoading(false)
-            if(res.Type === 'error'){
+            let res = await checkLoginPassword(val);
+            setLoading(false);
+            if (res.Type === 'error') {
                 Emitter.emit('showMessageAlert', { message: res.Message || 'error', status: 'error' });
                 return;
             }
+            setEndpoint(val);
             if (res && res.Success) {
                 setHasPassword(true);
-                setEndpoint(val);
             } else if (res && !res.Success) {
                 setHasPassword(false);
             }
@@ -55,7 +55,7 @@ export default function Login(props) {
         Emitter.on('handleEndpoint', endpointChange);
         Emitter.on('handleLostPassword', lostPassword);
         document.documentElement.classList.remove('dark');
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
     return (