Merge pull request #65 from smartdevicelink/develop

2.4.0
smartdevicelink · Jul 16, 2019 · e9cfc2f · e9cfc2f
2 parents 521d75f + b93190c
commit e9cfc2f
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 144 deletions.
diff --git a/api/v2/app/interfaces/job/manticore/index.js b/api/v2/app/interfaces/job/manticore/index.js
@@ -19,7 +19,7 @@ const HMI_HEALTH_TIME = 8000;
 
 const jobInfo = {
     core: {
-        versions: ["5.1.2"], //ex. 5.0.1, master, develop
+        versions: ["5.1.3"], //ex. 5.0.1, master, develop
         builds: ["default"]
     }, 
     hmis: [{
@@ -293,7 +293,7 @@ function formatAddresses (id, services) {
 function exampleJobOption () {
     return {
         core: {
-            version: "5.1.2",
+            version: "5.1.3",
             build: "default"
         },
         hmi: {

diff --git a/api/v2/app/listeners/job-cleanup/index.js b/api/v2/app/listeners/job-cleanup/index.js
@@ -16,6 +16,8 @@ module.exports = {
             data: {}
         };
         await websocket.send(id, JSON.stringify(msgObj));
+        //delete the passcode for this user
+        await websocket.deletePasscode(id);
         next();
     }
 }
diff --git a/api/v2/index.js b/api/v2/index.js
@@ -161,8 +161,6 @@ module.exports = app => {
         });
 
         ctx.websocket.on('close', async () => {
-            //reset the passcode for this user
-            await websocket.deletePasscode(id);
             logic.onDisconnection(id, ctx.websocket);
         });
 

diff --git a/build/package-lock.json b/build/package-lock.json