From 9cf683ea75f2a672d6bc1b0b102078488f97a138 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jaredevantabor@gmail.com>
Date: Wed, 13 Sep 2017 17:53:06 -0700
Subject: [PATCH] move socketPromise.resolve() until handshake message is
 received

instead of happening after the socket.onopen event.
---
 awx/ui/client/src/shared/socket/socket.service.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index d7fe283391..dec682a488 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -34,7 +34,6 @@ export default
 
                     self.socket.onopen = function () {
                         $log.debug("Websocket connection opened.");
-                        socketPromise.resolve();
                         self.checkStatus();
                         if(needsResubscribing){
                             self.subscribe(self.getLast());
@@ -76,6 +75,10 @@ export default
                 $log.debug('Received From Server: ' + e.data);
 
                 var data = JSON.parse(e.data), str = "";
+                if(_.has(data, "accept") && data.accept === true){
+                    socketPromise.resolve();
+                    return;
+                }
                 if(data.group_name==="jobs" && !('status' in data)){
                     // we know that this must have been a
                     // summary complete message b/c status is missing.