testConnection ipc module renamed to connect

APixelVisuals · Mar 23, 2020 · dc13ca9 · dc13ca9
1 parent 435fd7d
commit dc13ca9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/ipc.js b/ipc.js
@@ -2,15 +2,26 @@ module.exports = () => {
 
     //Modules
     const { ipcMain: ipc } = require("electron-better-ipc");
-    const testConnection = require("./ipc/testConnection");
     const keytar = require("./ipc/keytar");
+    const connect = require("./ipc/connect");
+
+    //Define client
+    let client;
 
     //Is Dev
     ipc.answerRenderer("isDev", () => process.env.DEV === "true");
 
-    //Test Connection
-    ipc.answerRenderer("testConnection", async data => await testConnection(data));
-
     //Keytar
     ipc.answerRenderer("keytar", async data => await keytar(data));
+
+    //Connect
+    ipc.answerRenderer("connect", async data => {
+
+        const result = await connect(data);
+
+        if (!data.testConnection) client = result.client;
+
+        delete result.client;
+        return result;
+    });
 };
diff --git a/ipc/testConnection.js → ipc/connect.js b/ipc/testConnection.js → ipc/connect.js
@@ -1,4 +1,4 @@
-module.exports = async ({ hostname, port, srv, authenticationEnabled, username, password, authenticationDatabase }) => {
+module.exports = async ({ hostname, port, srv, authenticationEnabled, username, password, authenticationDatabase, testConnection }) => {
 
     //Modules
     const { MongoClient } = require("mongodb");
@@ -11,10 +11,11 @@ module.exports = async ({ hostname, port, srv, authenticationEnabled, username,
     await client.connect().catch(err => connectionError = err);
 
     //Close connection
-    client.close();
+    if (testConnection) client.close();
 
     //Return
     return {
+        client,
         success: !connectionError,
         error: connectionError && connectionError.toString()
     };

diff --git a/src/pages/edit-connection.jsx b/src/pages/edit-connection.jsx
@@ -188,14 +188,15 @@ export default class EditConnection extends React.Component {
         await this.setState({ testingConnection: true, testingConnectionID });
 
         //Test connection
-        const result = await ipc.callMain("testConnection", {
+        const result = await ipc.callMain("connect", {
             hostname: this.state.hostname,
             port: this.state.port,
             srv: this.state.srv,
             authenticationEnabled: this.state.authenticationEnabled,
             username: this.state.username,
             password: this.state.password,
-            authenticationDatabase: this.state.authenticationDatabase
+            authenticationDatabase: this.state.authenticationDatabase,
+            testConnection: true
         });
 
         //Set testing connection result

diff --git a/src/pages/new-connection.jsx b/src/pages/new-connection.jsx
@@ -174,14 +174,15 @@ export default class NewConnection extends React.Component {
         await this.setState({ testingConnection: true, testingConnectionID });
 
         //Test connection
-        const result = await ipc.callMain("testConnection", {
+        const result = await ipc.callMain("connect", {
             hostname: this.state.hostname,
             port: this.state.port,
             srv: this.state.srv,
             authenticationEnabled: this.state.authenticationEnabled,
             username: this.state.username,
             password: this.state.password,
-            authenticationDatabase: this.state.authenticationDatabase
+            authenticationDatabase: this.state.authenticationDatabase,
+            testConnection: true
         });
 
         //Set testing connection result