From c128b18418c4e724a7bc89e1dc69b2b9e2cebd58 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Sat, 26 Aug 2023 09:58:19 +0200
Subject: [PATCH] fix major bug in json db

---
 src/server/backend/db/data/db.json | 2 +-
 src/server/backend/db/jsondb.js    | 5 -----
 src/server/backend/userRoutes.js   | 8 ++++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/server/backend/db/data/db.json b/src/server/backend/db/data/db.json
index 9e26dfe..2bb9eda 100644
--- a/src/server/backend/db/data/db.json
+++ b/src/server/backend/db/data/db.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{"db":{"libreevent_temp":{},"libreevent_admin":{},"libreevent_orders":{},"libreevent_users":{"1":{"email":"info@janishutz.com","pass":"$2b$10$HeW7Z2q9kAKkzIsdsiIQ3ea9bUPiloENZXblBJQUJCE697iG/2n2e","first_name":"t","name":"t","two_fa":"","user_data":"{\"country\":\"t\"}","marketing":null,"mail_confirmed":"true"}}},"index":{"libreevent_temp":0,"libreevent_admin":0,"libreevent_orders":0,"libreevent_users":1}}
\ No newline at end of file
diff --git a/src/server/backend/db/jsondb.js b/src/server/backend/db/jsondb.js
index bb9a316..6c062cb 100644
--- a/src/server/backend/db/jsondb.js
+++ b/src/server/backend/db/jsondb.js
@@ -24,7 +24,6 @@ class JSONDB {
         this.dbIndex = data[ 'index' ] ?? { 'libreevent_temp': 0, 'libreevent_admin': 0, 'libreevent_orders': 0, 'libreevent_users': 0 };
         this.db[ 'libreevent_temp' ] = {};
         this.saveToDisk();
-        console.log( this.db );
         console.log( '[ JSON-DB ] Database initialized successfully' );
         return 'connection';
     }
@@ -42,8 +41,6 @@ class JSONDB {
         fs.writeFile( path.join( __dirname + '/data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ), ( err ) => {
             if ( err ) console.error( '[ JSON-DB ] An error occurred during saving: ' + err );
             this.isSaving = false;
-            console.log( 'afterSaving' );
-            console.log( this.db );
             if ( this.awaitingSaving ) {
                 this.saveToDisk();
             }
@@ -129,11 +126,9 @@ class JSONDB {
             } else if ( operation.command === 'updateData' ) {
                 if ( !operation.property || !operation.searchQuery ) reject( 'Refusing to run destructive command: Missing Constraints' );
                 else {
-                    console.log( operation );
                     for ( let entry in this.db[ table ] ) {
                         if ( this.db[ table ][ entry ][ operation.property ] == operation.searchQuery ) {
                             for ( let changed in operation.newValues ) {
-                                console.log( this.db[ table ][ entry ] );
                                 this.db[ table ][ entry ][ changed ] = operation.newValues[ changed ];
                             }
                         }
diff --git a/src/server/backend/userRoutes.js b/src/server/backend/userRoutes.js
index 77182c8..550b4ae 100644
--- a/src/server/backend/userRoutes.js
+++ b/src/server/backend/userRoutes.js
@@ -26,8 +26,12 @@ module.exports = ( app, settings ) => {
         if ( request.session.loggedInUser ) {
             db.getDataSimple( 'users', 'email', request.session.username ).then( data => {
                 if ( data[ 0 ] ) {
-                    let dat = data[ 0 ];
-                    delete dat[ 'pass' ];
+                    let dat = {};
+                    for ( let element in data[ 0 ] ) {
+                        if ( element === 'pass' ) {
+                            dat[ element ] = data[ 0 ][ element ];
+                        }
+                    }
                     response.send( { 'data': dat, 'status': true } );
                 } else {
                     response.status( 404 ).send( { 'data': 'This user does not exist', 'status': false } );