fix(socket): fix build permissions on new triggered build appearing on UI

Author: jkuri

package-lock.json

@@ -101,6 +101,7 @@
     "@types/temp": "^0.8.31",
     "@types/uuid": "^3.4.3",
     "@types/webpack-dev-server": "^2.9.1",
+    "@types/ws": "^3.2.1",
     "@types/yamljs": "^0.2.30",
     "add-asset-html-webpack-plugin": "^2.1.2",
     "angular2-jwt": "^0.2.3",
@@ -179,6 +180,7 @@
     "webpack-dev-server": "^2.9.4",
     "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
     "webpack-merge": "^4.1.1",
+    "ws": "^3.3.2",
     "xterm": "2.9.2",
     "yamljs": "^0.3.0",
     "zone.js": "0.8.18"

package.json

@@ -495,14 +495,13 @@ export function startBuild(data: any, buildConfig?: any): Promise<any> {
           }).then(() => queueJob(dataJob.id));
         }));
     })
-    .then(() => getLastBuild(null))
     .then(lastBuild => {
       jobEvents.next({
         type: 'process',
         build_id: data.build_id,
         repository_id: repoId,
         data: 'build added',
-        additionalData: lastBuild
+        additionalData: null
       });
     })
     .then(() => getDepracatedBuilds(buildData))

src/api/process-manager.ts

@@ -25,6 +25,7 @@ import { sessionParser } from './server';
 import { IMemoryData, memory } from './stats/memory';
 import { ICpuData, cpu } from './stats/cpu';
 import { decodeJwt } from './security';
+import { getLastBuild } from './db/build';
 
 export interface ISocketServerOptions {
   app: express.Application;
@@ -112,6 +113,19 @@ export class SocketServer {
       };
       this.addClient(client);
 
+      client.send({ type: 'time', data: new Date().getTime() });
+      jobEvents.subscribe(event => {
+        if (event.data === 'build added') {
+          getLastBuild(client.session.userId)
+            .then(lastBuild => {
+              event.additionalData = lastBuild;
+              client.send(event);
+            });
+        } else {
+          client.send(event);
+        }
+      });
+
       socket.on('message', event => this.handleEvent(JSON.parse(event), client));
       socket.on('close', (code, message) => this.removeClient(socket));
     });

src/api/socket.ts

@@ -26,7 +26,7 @@ describe('Socket Security', () => {
       .then(() => process.chdir(join(__dirname, '../')))
       .then(() => {
         tempRoot = temp.mkdirSync('abstruse-socket-tests');
-        console.log(`Using "${tempRoot}" as temporary directory for e2e protractor tests.`);
+        console.log(`Using "${tempRoot}" as temporary directory for socket unit tests.`);
       })
       .then(() => abstruse(tempRoot, false))
       .then(() => sendRequest(registerData, 'api/user/create'));
@@ -35,7 +35,7 @@ describe('Socket Security', () => {
   after(() => killAllProcesses());
 
   it(`should receive initial 'time' event after connected to socket server`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -47,7 +47,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger build image on 'buildImage' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -66,7 +66,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -83,7 +83,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'subscribeToImageBuilder' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -104,7 +104,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -121,7 +121,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'stopBuild' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -140,7 +140,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -157,7 +157,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'restartBuild' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -176,7 +176,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -193,7 +193,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'restartJob' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -212,7 +212,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -229,7 +229,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'stopJob' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -248,7 +248,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -265,7 +265,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'debugJob' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -285,7 +285,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -302,7 +302,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'subscribeToLogs' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -321,7 +321,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);
@@ -338,7 +338,7 @@ describe('Socket Security', () => {
   });
 
   it(`should not have permissions to trigger 'subscribeToNotifications' event`, (done) => {
-    socket = new ws('ws://localhost:6500', null);
+    socket = new ws('ws://localhost:6500');
 
     socket.on('message', (data: any) => {
       data = JSON.parse(data);
@@ -358,7 +358,7 @@ describe('Socket Security', () => {
 
     sendRequest(loginData, 'api/user/login')
       .then((jwt: any) => {
-        socket = new ws('ws://localhost:6500', jwt.data);
+        socket = new ws('ws://localhost:6500/?token=' + jwt.data);
 
         socket.on('message', (data: any) => {
           data = JSON.parse(data);