set proxy access in each request

mindsdb · Jan 26, 2023 · a95e3ad · a95e3ad
1 parent 278f5fc
commit a95e3ad
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 172 deletions.
diff --git a/lib/connect/index.js b/lib/connect/index.js
@@ -1,60 +1,69 @@
 import axios from 'axios';
 import localStorage from 'localStorage';
 
-export const connect = async (userData, env = 'https://alpha.mindsdb.com') => {
-
-    const { email, password } = userData;
-    if (!email || !password) {
-        return {
-            error: true,
-            message: 'Please add email or password',
-        };
-    }
-
-    try {
-        const loginResponse = await axios.post(`${env}/cloud/login`, userData);
-        const requestCookie = loginResponse.headers['set-cookie'];
-        const statusResponse = await axios.get(`${env}/cloud/status`, {
-            headers: {
-                Cookie: requestCookie,
-            },
-        });
-
-        localStorage.setItem('auth', JSON.stringify(loginResponse.data));
-        localStorage.setItem('requestCookie', requestCookie[4]);
-
-        // console.log(
-        //     JSON.stringify({
-        //         Cookie: requestCookie,
-        //     })
-        // );
-        return statusResponse.data;
-    } catch (error) {
-        console.log(error);
-    }
-
-    // const loginResponse = await axios
-    //     .post(`${env}/cloud/login`, userData)
-
-    //     .then((response) => {
-    //         localStorage.setItem("auth", JSON.stringify(response.data));
-    //         console.log("loginResponse =>", response);
-    //         console.log("pos", localStorage.getItem("auth"));
-    //         return response.data;
-    //     })
-    //     .catch((err) => {
-    //         console.log(JSON.stringify(err)); // Error handler
-    //     });
+export const connect = async (userData) => {
+  const { email, password } = userData;
 
-    // return await axios
-    //     .get(`${env}/cloud/status`, {
-    //         withCredentials: true,
-    //     })
-    //     .then((response) => {
-    //         console.log("pos", localStorage.getItem("auth"));
-    //         return response;
+  if (!email || !password) {
+    return {
+      error: true,
+      message: 'Please add email or password',
+    };
+  }
+
+  try {
+    const loginResponse = await axios.post(`/cloud/login`, userData, {
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Headers': '*',
+        'Access-Control-Allow-Credentials': 'true',
+      },
+    });
+    const requestCookie = loginResponse.headers['set-cookie'];
+    const statusResponse = await axios.get(`/cloud/status`, {
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Headers': '*',
+        'Access-Control-Allow-Credentials': 'true',
+        Cookie: requestCookie,
+      },
+    });
+
+    localStorage.setItem('auth', JSON.stringify(loginResponse.data));
+    localStorage.setItem('requestCookie', requestCookie[4]);
+
+    // console.log(
+    //     JSON.stringify({
+    //         Cookie: requestCookie,
     //     })
-    //     .catch((err) => {
-    //         console.log(JSON.stringify(err)); // Error handler
-    //     });
+    // );
+    return statusResponse.data;
+  } catch (error) {
+    console.log(error);
+  }
+
+  // const loginResponse = await axios
+  //     .post(`${env}/cloud/login`, userData)
+
+  //     .then((response) => {
+  //         localStorage.setItem("auth", JSON.stringify(response.data));
+  //         console.log("loginResponse =>", response);
+  //         console.log("pos", localStorage.getItem("auth"));
+  //         return response.data;
+  //     })
+  //     .catch((err) => {
+  //         console.log(JSON.stringify(err)); // Error handler
+  //     });
+
+  // return await axios
+  //     .get(`${env}/cloud/status`, {
+  //         withCredentials: true,
+  //     })
+  //     .then((response) => {
+  //         console.log("pos", localStorage.getItem("auth"));
+  //         return response;
+  //     })
+  //     .catch((err) => {
+  //         console.log(JSON.stringify(err)); // Error handler
+  //     });
 };
diff --git a/lib/getFiles/index.js b/lib/getFiles/index.js
@@ -2,30 +2,27 @@ import axios from 'axios';
 import localStorage from 'localStorage';
 
 export const getFiles = async () => {
-    const env = 'https://alpha.mindsdb.com';
-    const queryRequest = {
-        query: 'SHOW TABLES FROM files;',
-        context: {
-            db: 'mindsdb',
-        },
-    };
-    try {
-        const requestCookie = localStorage.getItem('requestCookie');
-        // console.log("pos", localStorage.getItem("requestCookie"));
-        const getFilesResponse = await axios.post(
-            `${env}/api/sql/query`,
-            queryRequest,
-            {
-                withCredentials: true,
-                headers: {
-                    Cookie: requestCookie,
-                },
-            }
-        );
-        // console.log(getFilesResponse)
+  const queryRequest = {
+    query: 'SHOW TABLES FROM files;',
+    context: {
+      db: 'mindsdb',
+    },
+  };
+  try {
+    const requestCookie = localStorage.getItem('requestCookie');
+    // console.log("pos", localStorage.getItem("requestCookie"));
+    const getFilesResponse = await axios.post(`/api/sql/query`, queryRequest, {
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Headers': '*',
+        'Access-Control-Allow-Credentials': 'true',
+        Cookie: requestCookie,
+      },
+    });
+    // console.log(getFilesResponse)
 
-        return getFilesResponse.data;
-    } catch (error) {
-        console.log(error);
-    }
+    return getFilesResponse.data;
+  } catch (error) {
+    console.log(error);
+  }
 };
diff --git a/lib/setQuery/index.js b/lib/setQuery/index.js
@@ -2,31 +2,28 @@ import axios from 'axios';
 import localStorage from 'localStorage';
 
 export const setQuery = async (query = '') => {
-    const env = 'https://alpha.mindsdb.com';
-    const queryRequest = {
-        query,
-        context: {
-            db: 'mindsdb',
-        },
-    };
+  const queryRequest = {
+    query,
+    context: {
+      db: 'mindsdb',
+    },
+  };
 
-    try {
-        const requestCookie = localStorage.getItem('requestCookie');
-        // console.log("pos", localStorage.getItem("requestCookie"));
-        const getFilesResponse = await axios.post(
-            `${env}/api/sql/query`,
-            queryRequest,
-            {
-                withCredentials: true,
-                headers: {
-                    Cookie: requestCookie,
-                },
-            }
-        );
-        // console.log(getFilesResponse)
+  try {
+    const requestCookie = localStorage.getItem('requestCookie');
+    // console.log("pos", localStorage.getItem("requestCookie"));
+    const getFilesResponse = await axios.post(`/api/sql/query`, queryRequest, {
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Headers': '*',
+        'Access-Control-Allow-Credentials': 'true',
+        Cookie: requestCookie,
+      },
+    });
+    // console.log(getFilesResponse)
 
-        return getFilesResponse.data;
-    } catch (error) {
-        console.log(error);
-    }
+    return getFilesResponse.data;
+  } catch (error) {
+    console.log(error);
+  }
 };
diff --git a/lib/status/index.js b/lib/status/index.js
@@ -1,10 +1,10 @@
 import localStorage from 'localStorage';
 
 export const getStatus = async () => {
-    try {
-        console.log('post', localStorage.getItem('requestCookie'));
-        return localStorage.getItem('requestCookie');
-    } catch (error) {
-        console.log(error);
-    }
+  try {
+    console.log('post', localStorage.getItem('requestCookie'));
+    return localStorage.getItem('requestCookie');
+  } catch (error) {
+    console.log(error);
+  }
 };
diff --git a/lib/utils/saveData.js b/lib/utils/saveData.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "mindsdb-js-sdk",
   "author": "MindsDB",
   "license": "MIT",
-  "version": "1.0.12",
+  "version": "1.0.18",
   "type": "module",
   "files": [
     "dist"

diff --git a/test/index.js b/test/index.js
@@ -1,9 +1,9 @@
 import MindsDB from '../lib/main.js';
 
 /*
-* @email  MindsDB user
-* @password  MindsDB password
-*/
+ * @email  MindsDB user
+ * @password  MindsDB password
+ */
 const connectData = {
   email: '',
   password: '',

diff --git a/vite.config.js b/vite.config.js
@@ -3,15 +3,31 @@ import { resolve } from 'path';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
-    build: {
-        sourcemap: false,
-        manifest: true,
-        minify: true,
-        reportCompressedSize: true,
-        lib: {
-            entry: resolve(__dirname, 'lib/main.js'),
-            name: 'MindsDB-SDK',
-            fileName: 'mindsdb-js-sdk',
-        },
+  server: {
+    proxy: {
+      '/api': {
+        target: 'https://alpha.mindsdb.com',
+        changeOrigin: true,
+        secure: false,
+        rewrite: (path) => path.replace(/^\/api/, ''),
+      },
+      '/cloud': {
+        target: 'https://alpha.mindsdb.com',
+        changeOrigin: true,
+        secure: false,
+        rewrite: (path) => path.replace(/^\/cloud/, ''),
+      },
     },
+  },
+  build: {
+    sourcemap: false,
+    manifest: true,
+    minify: true,
+    reportCompressedSize: true,
+    lib: {
+      entry: resolve(__dirname, 'lib/main.js'),
+      name: 'MindsDB-SDK',
+      fileName: 'mindsdb-js-sdk',
+    },
+  },
 });