From 15abfe6c4577f18939ca3cd5eed3c052ed9eba6d Mon Sep 17 00:00:00 2001
From: Josepablo C <jcruzbaas@gmail.com>
Date: Mon, 5 Aug 2024 23:35:15 -0600
Subject: [PATCH] fix: Make v2 JWT incompatible with v1

 - fix(Proposals): Populating driver data.
 - fix(Account): Make v1 and v2 JWT secret incompatible.
---
 v1/src/apps/private/account/routes.js         | 14 ++++-----
 v1/src/apps/private/account/services.js       | 30 +++++++++----------
 v1/src/apps/private/proposals/services.js     |  1 +
 v2/server/config/apiConfig.json               |  6 ++--
 .../Account/Repository/Objection/index.js     | 12 ++++++--
 5 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/v1/src/apps/private/account/routes.js b/v1/src/apps/private/account/routes.js
index 0fe9370..de57c84 100644
--- a/v1/src/apps/private/account/routes.js
+++ b/v1/src/apps/private/account/routes.js
@@ -1,7 +1,7 @@
-'use strict';
-const router = require('express').Router();
-const services= require('./services.js');
-
-router.post('/register', services.register);
-
-module.exports = router;
+'use strict';
+const router = require('express').Router();
+const services= require('./services.js');
+
+router.post('/register', services.register);
+
+module.exports = router;
diff --git a/v1/src/apps/private/account/services.js b/v1/src/apps/private/account/services.js
index f88f021..5074261 100644
--- a/v1/src/apps/private/account/services.js
+++ b/v1/src/apps/private/account/services.js
@@ -1,15 +1,15 @@
-"use strict";
-const { ROOT_PATH, HANDLERS_PATH } = process.env;
-const { complete_register } = require( `${ROOT_PATH}/${HANDLERS_PATH}/Account` );
-
-const register = async( req, res ) => {
-    try{
-        const result = await complete_register( req.context.userId ,  req.body );
-        return res.send( result );
-    }catch( error ){
-        console.error( error );
-        return res.status( 500 ).send({ error });
-    }
-}
-
-module.exports = { register };
+"use strict";
+const { ROOT_PATH, HANDLERS_PATH } = process.env;
+const { complete_register } = require( `${ROOT_PATH}/${HANDLERS_PATH}/Account` );
+
+const register = async( req, res ) => {
+    try{
+        const result = await complete_register( req.context.userId ,  req.body );
+        return res.send( result );
+    }catch( error ){
+        console.error( error );
+        return res.status( 500 ).send({ error });
+    }
+}
+
+module.exports = { register };
diff --git a/v1/src/apps/private/proposals/services.js b/v1/src/apps/private/proposals/services.js
index 0d0efe5..c8f500d 100644
--- a/v1/src/apps/private/proposals/services.js
+++ b/v1/src/apps/private/proposals/services.js
@@ -12,6 +12,7 @@ const populate_list = [
     'shipper',
     'carrier',
     'vehicle',
+    { path:'vehicle' , populate : { path : 'driver' } },
     'bidder',
     'accepted_by'
 ];
diff --git a/v2/server/config/apiConfig.json b/v2/server/config/apiConfig.json
index 606c680..19544da 100644
--- a/v2/server/config/apiConfig.json
+++ b/v2/server/config/apiConfig.json
@@ -1,7 +1,7 @@
 {
     "authentication": {
         "pwdSecret":"Nx2g_IWo2Zt_LS$+",
-        "jwtSecret":"9o3BBz0EsrwXliwEJ/SFuywZoN8=",
+        "jwtSecret":"9o3BBz0EsrwXXiwEJ/SFuywZoN8=",
         "jwtTimeout":24,
         "jwtRenewalTimeout":720,
         "tokenSecret":"9Z'jMt|(h_f(&/S+zv.K",
@@ -16,9 +16,9 @@
         }
     },
     "version" : {
-        "version" : "1.1.1",
+        "version" : "2.0.0",
         "name": "ETA Beta",
-        "date":"03/2024"
+        "date":"08/2024"
     },
     "S3" : {
         "accessKeyId": "AKIAXTQEUF6MLCHTUIKW",
diff --git a/v2/server/src/Apps/Account/Repository/Objection/index.js b/v2/server/src/Apps/Account/Repository/Objection/index.js
index 18a3b0b..14ebf19 100644
--- a/v2/server/src/Apps/Account/Repository/Objection/index.js
+++ b/v2/server/src/Apps/Account/Repository/Objection/index.js
@@ -41,7 +41,11 @@ class SpecificModelRepository{
         .where("email","=",email)
         .where("password","=",safe_password)
         .first();
-        return await this.populate( user );
+        if( user ){
+            return await this.populate( user );
+        }else{
+            return null;
+        }
     }
 
     async updateSessionToken( old_token, token, expiration ){
@@ -81,7 +85,11 @@ class SpecificModelRepository{
     async findBySessionToken( token ){
         const session = await Sessions.query().select("*").where("token","=",token).first();
         const user = await Users.query().findById( session.user_id );
-        return await this.populate( user );
+        if( user ){
+            return await this.populate( user );
+        }else{
+            return null;
+        }
     }
 
 }