Fix opening socket when not signed in

CompuIves · CompuIves · commit cc24d0f183d1 · 2020-03-02T19:53:49.000-08:00
diff --git a/packages/app/src/app/overmind/dependencies/overmind-graphql.ts b/packages/app/src/app/overmind/dependencies/overmind-graphql.ts
@@ -38,12 +38,7 @@ type Http = {
   options?: Options;
 };
 
-type Ws =
-  | {
-      endpoint: string;
-      params?: () => { [key: string]: string | number | boolean };
-    }
-  | PhoenixSocket;
+type Ws = PhoenixSocket | null;
 
 type Queries = {
   queries?: {
@@ -128,12 +123,14 @@ export const graphql: <T extends Queries>(
     return null;
   }
 
+  let wsClient: PhoenixSocket | null = null;
   function getWsClient(): PhoenixSocket | null {
-    if (_ws) {
-      return withAbsintheSocket.create(_ws);
+    if (_ws && !wsClient) {
+      wsClient = withAbsintheSocket.create(_ws);
+      return wsClient;
     }
 
-    return null;
+    return wsClient;
   }
 
   const evaluatedQueries = {
diff --git a/packages/app/src/app/overmind/namespaces/editor/actions.ts b/packages/app/src/app/overmind/namespaces/editor/actions.ts
@@ -1060,6 +1060,10 @@ export const listenToSandboxChanges: AsyncAction<{
 }> = async ({ state, actions, effects }, { sandboxId }) => {
   effects.gql.subscriptions.onSandboxChangged.dispose();
 
+  if (!state.isLoggedIn) {
+    return;
+  }
+
   effects.gql.subscriptions.onSandboxChangged({ sandboxId }, result => {
     const sandbox = state.editor.sandboxes[sandboxId];
 
@@ -1084,7 +1088,7 @@ export const loadCollaborators: AsyncAction<{ sandboxId: string }> = async (
   { state, effects },
   { sandboxId }
 ) => {
-  if (!state.editor.currentSandbox) {
+  if (!state.editor.currentSandbox || !state.isLoggedIn) {
     return;
   }
 
diff --git a/packages/app/src/app/overmind/onInitialize.ts b/packages/app/src/app/overmind/onInitialize.ts
@@ -33,7 +33,9 @@ export const onInitialize: OnInitialize = async (
         Authorization: `Bearer ${state.jwt}`,
       }),
     },
-    effects.live.getSocket()
+    // TODO(@christianalfoni): we need to make this dynamic, but overmind devtools can't serialize a socket with one channel.
+    // Because of this the app crashes if we want to provide it with a function
+    effects.jwt.get() ? effects.live.getSocket() : null
   );
 
   effects.notifications.initialize({
