Fetch google email to use as gpmdp_connect id

MarshallOfSound · Nov 13, 2016 · a74879b · a74879b
1 parent dd8a2ce
commit a74879b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/features/core/websocketAPI.js b/src/main/features/core/websocketAPI.js
@@ -192,24 +192,27 @@ const handleWSMessage = (ws) =>
 
 if (Settings.get('__gpmdp_connect__')) {
   const reconnectConnectClient = () => {
+    const email = Settings.get('gpmdp_connect_email');
+    if (!email) return;
+    if (connectClient) {
+      connectClient.close();
+      connectClient = null;
+    }
     connectClient = new WebSocket('wss://connect.gpmdp.xyz');
     addWSPrototypes(connectClient);
     connectClient.on('open', () => {
-      connectClient.json({
-        type: 'connect',
-        email: 'samuel.r.attard@gmail.com',
-        clientType: 'player',
-      });
+      connectClient.json({ type: 'connect', email, clientType: 'player' });
       connectClient.on('message', handleWSMessage(connectClient));
     });
     connectClient.on('error', () => {});
     connectClient.on('close', () => {
       if (connectClientShouldReconnect) {
-        Logger.warn('Attempting to reconnect to connect.gpmdp.xyz');
+        Logger.warn('Attempting to reconnect to wss://connect.gpmdp.xyz');
         setTimeout(() => reconnectConnectClient(), 500);
       }
     });
   };
+  Settings.onChange('gpmdp_connect_email', reconnectConnectClient);
   reconnectConnectClient();
 }
 

diff --git a/src/renderer/windows/GPMWebView/index.js b/src/renderer/windows/GPMWebView/index.js
@@ -66,5 +66,6 @@ const waitForExternal = setInterval(() => {
         Logger.error('Emitter fn() threw exception.', e.stack);
       }
     });
+    Settings.set('gpmdp_connect_email', window.gbar._CONFIG[0][10][5]);
   }
 }, 10);