ETA/ETAApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Make v2 JWT incompatible with v1

Browse Source 
- fix(Proposals): Populating driver data.
 - fix(Account): Make v1 and v2 JWT secret incompatible.
This commit is contained in:
Josepablo C
2024-08-05 23:35:15 -06:00
parent c3f0b08cb7
commit 15abfe6c45
5 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
v1/src/apps/private/proposals/services.js
View File

@@ -12,6 +12,7 @@ const populate_list = [
'shipper', 'shipper',
'carrier', 'carrier',
'vehicle', 'vehicle',
{ path:'vehicle' , populate : { path : 'driver' } },
'bidder', 'bidder',
'accepted_by' 'accepted_by'
]; ];

6
v2/server/config/apiConfig.json
View File

@@ -1,7 +1,7 @@
{ {
"authentication": { "authentication": {
"pwdSecret":"Nx2g_IWo2Zt_LS$+", "pwdSecret":"Nx2g_IWo2Zt_LS$+",
"jwtSecret":"9o3BBz0EsrwXliwEJ/SFuywZoN8=", "jwtSecret":"9o3BBz0EsrwXXiwEJ/SFuywZoN8=",
"jwtTimeout":24, "jwtTimeout":24,
"jwtRenewalTimeout":720, "jwtRenewalTimeout":720,
"tokenSecret":"9Z'jMt|(h_f(&/S+zv.K", "tokenSecret":"9Z'jMt|(h_f(&/S+zv.K",
@@ -16,9 +16,9 @@
} }
}, },
"version" : { "version" : {
"version" : "1.1.1", "version" : "2.0.0",
"name": "ETA Beta", "name": "ETA Beta",
"date":"03/2024" "date":"08/2024"
}, },
"S3" : { "S3" : {
"accessKeyId": "AKIAXTQEUF6MLCHTUIKW", "accessKeyId": "AKIAXTQEUF6MLCHTUIKW",

8
v2/server/src/Apps/Account/Repository/Objection/index.js
View File

@@ -41,7 +41,11 @@ class SpecificModelRepository{
.where("email","=",email) .where("email","=",email)
.where("password","=",safe_password) .where("password","=",safe_password)
.first(); .first();
if( user ){
return await this.populate( user ); return await this.populate( user );
}else{
return null;
}
} }
async updateSessionToken( old_token, token, expiration ){ async updateSessionToken( old_token, token, expiration ){
@@ -81,7 +85,11 @@ class SpecificModelRepository{
async findBySessionToken( token ){ async findBySessionToken( token ){
const session = await Sessions.query().select("*").where("token","=",token).first(); const session = await Sessions.query().select("*").where("token","=",token).first();
const user = await Users.query().findById( session.user_id ); const user = await Users.query().findById( session.user_id );
if( user ){
return await this.populate( user ); return await this.populate( user );
}else{
return null;
}
} }
} }