Login data to mongoDB + extra (read comment)

Co-authored-by: Jon Cruz
[email protected]
Co-authored-by: Elena Atencio
[email protected]
Co-authored-by: John Donato
[email protected]

Author: wiris316

app/components/Login.tsx

@@ -23,7 +23,8 @@ const Login = React.memo(() => {
     // eslint-disable-next-line no-return-assign
     // inputFields.forEach(input => (input.value = ''));
     const response: boolean | string = ipcRenderer.sendSync('login', { username, password });
-    if (typeof(response) === 'string') {
+    if (typeof (response) === 'string') {
+      console.log('response', response)
       setUser(username);
       setMode(response);
       navigate('/');

electron/databases/mongo.ts

@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 // import { MongoError } from 'mongodb';
 
 // Mongoose connection wrapped in function that takes the index of the selected database as the parameter. This index is used to target the correct database for querying.
-const connectMongoose = async (URI: string) => {
+const connectMongoose = async (i:number, URI: string) => {
   try {
     await mongoose.connection.close();
     const db = await mongoose.connect(URI);

electron/routes/dashboard.ts

@@ -8,7 +8,7 @@ const User = require('../models/UserModel')
 const mongoose = require('mongoose');
 // const db = require('../databases/mongo')
 
-const MONGO_URI = ''
+const MONGO_URI = 'mongodb+srv://wiris316:[email protected]/?retryWrites=true&w=majority'
 
 mongoose.connect(MONGO_URI, {
   useNewUrlParser: true, 
@@ -141,7 +141,8 @@ ipcMain.on('addAwsApp', (message: IpcMainEvent, application: any) => {
 ipcMain.on('getApps', (message: IpcMainEvent) => {
   // Retrieves file contents from settings.json for current Apps
   const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
-  const services: string[][] = settings[currentUser].services;
+  // const services: string[][] = settings[currentUser].services;
+  const services: string[][] = settings['guest'].services; // temporarily set to guests at every login attempt
 
   // Return an array of arrays that is a subset of the full services array
   const dashboardList: string[][] = services.map((arr: string[]) => [
@@ -255,15 +256,44 @@ ipcMain.on('login', (message: IpcMainEvent, user: { username: string; password:
   const { username, password } = user;
 
   // Load in the stored users
-  const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
-  if (username in settings && bcrypt.compareSync(password, settings[username].password)) {
-    currentUser = username;
-    message.returnValue = settings[username].mode;
-    return;
-  } else {
-    message.returnValue = false;
-    return;
-  }
+  // const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
+  // if (username in settings && bcrypt.compareSync(password, settings[username].password)) {
+  //   currentUser = username;
+  //   message.returnValue = settings[username].mode;
+  //   return;
+  // } else {
+  //   message.returnValue = false;
+  //   return;
+  // }
+  console.log('in login')
+
+  return User.findOne({ username : username })
+    .then((data) => {
+    console.log('data', data)
+    if (data !== null && bcrypt.compareSync(password, data.password)) {
+      console.log('User found');
+      // console.log('found data', data.mode)
+      currentUser = username
+      message.returnValue = data.mode
+      return message.returnValue;
+    } else {
+      message.returnValue = false; 
+      return message.returnValue;
+    }
+  })
+  .catch((error) => {
+    console.log(`checkUser failed : ${error}`)
+    // return false;
+  })
+
+
+
+
+
+
+
+
+
 });
 
 ipcMain.on('signOut', (message: IpcMainEvent) => {

electron/routes/data.ts

@@ -47,7 +47,7 @@ ipcMain.on('connect', async (message: Electron.IpcMainEvent, username: string, i
     const [databaseType, URI] = [userDatabase[1], userDatabase[2]];
 
     // Connect to the proper database
-    if (databaseType === 'MongoDB') await connectMongo(URI);
+    if (databaseType === 'MongoDB') await connectMongo(index,URI);
     if (databaseType === 'SQL') pool = await connectPostgres(index, URI);
 
     // Currently set to a global variable