@@ -9,6 +9,7 @@ const mongoose = require('mongoose');
9
9
// const db = require('../databases/mongo')
10
10
11
11
const MONGO_URI = ''
12
+
12
13
mongoose . connect ( MONGO_URI , {
13
14
useNewUrlParser : true ,
14
15
useUnifiedtopology : true ,
@@ -39,14 +40,19 @@ function hashPassword(password: string) {
39
40
const salt = bcrypt . genSaltSync ( saltRounds ) ;
40
41
return bcrypt . hashSync ( password , salt ) ;
41
42
}
43
+
44
+ // function checkUser(username): any {
45
+ // const userExist = User.findOne({ username })
46
+ // .then((data) => {
47
+ // console.log('User found', data);
48
+ // return true;
49
+ // })
50
+ // .catch((error) => {
51
+ // console.log(`checkUser failed : ${error}`)
52
+ // // return false;
53
+ // })
54
+ // // console.log('heeeeere', userExist)
42
55
// }
43
- function checkUser ( username ) {
44
- const userExist = User . findOne ( { username } )
45
- . then ( ( ) => console . log ( 'heeere' , userExist ) )
46
- . catch ( ( error ) => console . log ( 'checkUser failed' ) )
47
- // console.log('heeeeere', userExist)
48
- // return userExist ? true : false;
49
- }
50
56
51
57
function addUser ( username , password , email ) {
52
58
console . log ( 'inside addUser' , username )
@@ -196,12 +202,33 @@ ipcMain.handle(
196
202
console . log ( 'in ipcMainhandle' , user )
197
203
198
204
// Verify that username and email have not been taken
199
- const settings = JSON . parse ( fs . readFileSync ( settingsLocation ) . toString ( 'utf8' ) ) ;
200
- if ( settings [ username ] ) {
201
- message . returnValue = false ;
202
- return message . returnValue ;
203
- }
205
+ // const settings = JSON.parse(fs.readFileSync(settingsLocation).toString('utf8'));
206
+ // if (settings[username]) {
207
+ // message.returnValue = false;
208
+ // return message.returnValue;
209
+ // }
210
+
211
+
212
+ // checks if username exist in DB, if not, addUser is invoked
213
+ return User . findOne ( { username :username } )
214
+ . then ( ( data ) => {
215
+ console . log ( 'User found' , data ) ;
216
+ if ( data ) {
217
+ message . returnValue = false ;
218
+ return message . returnValue ;
219
+ } else {
220
+ addUser ( username , password , email )
221
+ message . returnValue = true ;
222
+ return message . returnValue ;
223
+ }
224
+ } )
225
+ . catch ( ( error ) => {
226
+ console . log ( `checkUser failed : ${ error } ` )
227
+ // return false;
228
+ } )
229
+
204
230
// if (checkUser(username) === true) {
231
+ // console.log('checkUser invoked', checkUser(username))
205
232
// message.returnValue = false;
206
233
// return message.returnValue;
207
234
// }
@@ -215,11 +242,12 @@ ipcMain.handle(
215
242
// message.returnValue = true;
216
243
// return message.returnValue;
217
244
// }
218
- else {
219
- addUser ( username , password , email )
220
- message . returnValue = true ;
221
- return message . returnValue ;
222
- }
245
+ // if (!checkUser(username)) {
246
+ // addUser(username, password, email)
247
+ // message.returnValue = true;
248
+ // return message.returnValue;
249
+ // }
250
+ // return false;
223
251
}
224
252
) ;
225
253
0 commit comments