Merge branch 'master' into nathan-starter

1 files changed, 11 insertions, 11 deletions

diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index a26b81bdf..38134f2c1 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -1,22 +1,21 @@
 import { blue } from 'colors';
-import * as express from 'express';
 import { createServer } from 'https';
-import { Server, Socket } from '../../node_modules/socket.io/dist/index';
+import * as _ from 'lodash';
 import { networkInterfaces } from 'os';
+import { Server, Socket } from 'socket.io';
 import { Utils } from '../Utils';
 import { logPort } from './ActionUtilities';
 import { timeMap } from './ApiManagers/UserManager';
-import { GoogleCredentialsLoader, SSL } from './apis/google/CredentialsLoader';
-import YoutubeApi from './apis/youtube/youtubeApiSample';
-import { initializeGuest } from './authentication/DashUserModel';
 import { Client } from './Client';
 import { DashStats } from './DashStats';
-import { Database } from './database';
 import { DocumentsCollection } from './IDatabase';
 import { Diff, GestureContent, MessageStore, MobileDocumentUploadContent, MobileInkOverlayContent, Transferable, Types, UpdateMobileInkOverlayPositionContent, YoutubeQueryInput, YoutubeQueryTypes } from './Message';
 import { Search } from './Search';
+import { GoogleCredentialsLoader } from './apis/google/CredentialsLoader';
+import YoutubeApi from './apis/youtube/youtubeApiSample';
+import { initializeGuest } from './authentication/DashUserModel';
+import { Database } from './database';
 import { resolvedPorts } from './server_Initialization';
-import * as _ from 'lodash';
 
 export namespace WebSocket {
     export let _socket: Socket;
@@ -25,15 +24,16 @@ export namespace WebSocket {
     export const userOperations = new Map<string, number>();
     export let disconnect: Function;
 
-    export async function initialize(isRelease: boolean, app: express.Express) {
+    export async function initialize(isRelease: boolean, credentials:any) {
         let io: Server;
         if (isRelease) {
             const { socketPort } = process.env;
             if (socketPort) {
                 resolvedPorts.socket = Number(socketPort);
-            }
-            io = new Server(createServer(SSL.Credentials, app), SSL.Credentials as any);
-            io.listen(resolvedPorts.socket);
+            } 
+            const httpsServer = createServer(credentials);
+            io = new Server(httpsServer, {})
+            httpsServer.listen(resolvedPorts.socket);
         } else {
             io = new Server();
             io.listen(resolvedPorts.socket);