Adds some fixes to the setup process

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: KSJaay

app/components/setup/index.jsx

@@ -35,6 +35,11 @@ const SetupForm = () => {
         return navigate('/home');
       } catch (error) {
         if (error?.response?.data) {
+          console.log(error?.response?.data?.errorType);
+
+          if (error?.response?.data?.errorType === 'ownerExists') {
+            return navigate('/login');
+          }
           return setErrors(error?.response?.data);
         }
 

app/components/setup/type.jsx

@@ -10,9 +10,15 @@ const SetupTypeForm = () => {
   const handleSubmit = async () => {
     try {
       await submitSetup(setErrors, 'basic', inputs);
+
       return navigate('/home');
     } catch (error) {
       if (error?.response?.data) {
+        console.log(error?.response?.data?.errorType);
+        if (error?.response?.data?.errorType === 'ownerExists') {
+          return navigate('/login');
+        }
+
         return setErrors(error?.response?.data);
       }
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "lunalytics",
-  "version": "0.9.7",
+  "version": "0.9.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "lunalytics",
-      "version": "0.9.7",
+      "version": "0.9.10",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@lunalytics/ui": "^0.1.12",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunalytics",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Open source Node.js server/website monitoring tool",
   "private": true,
   "author": "KSJaay <ksjaay@gmail.com>",

server/middleware/auth/setup.js

@@ -107,7 +107,15 @@ const setupMiddleware = async (request, response) => {
     }
 
     if (config.get('database')?.name) {
-      return response.status(400).send({ general: 'Database already exists' });
+      const exists = await ownerExists().catch(() => false);
+
+      if (exists) {
+        return response.status(400).send({
+          general:
+            'Owner already exists, please delete the current database and try again.',
+          errorType: 'ownerExists',
+        });
+      }
     }
 
     const keys = getSetupKeys(type, request.body.databaseType);
@@ -145,7 +153,8 @@ const setupMiddleware = async (request, response) => {
     if (query) {
       return response.status(400).send({
         general:
-          'Owner already exists, please delete the current database and try again.',
+          'Owner already exists, please delete the current database and try again or login to your account.',
+        errorType: 'ownerExists',
       });
     }