Fix classroom quirks with autorization

Author: CompuIves

packages/app/src/app/overmind/namespaces/editor/internalActions.ts

@@ -64,7 +64,16 @@ export const initializeLiveSandbox: AsyncAction<Sandbox> = async (
       return;
     }
 
-    await actions.live.internal.disconnect();
+    if (
+      // If the joinSource is /live/ and the user is only a viewer,
+      // we won't get the roomId and the user will disconnect automatically,
+      // we want to prevent this by only re-initializing the live session on joinSource === 'sandbox'. Because
+      // for joinSource === 'sandbox' we know for sure that the user will get a roomId if they have permissions
+      // to join
+      state.live.joinSource === 'sandbox'
+    ) {
+      await actions.live.internal.disconnect();
+    }
   }
 
   if (sandbox.roomId) {

packages/app/src/app/overmind/namespaces/live/actions.ts

@@ -63,6 +63,8 @@ export const roomJoined: AsyncAction<{
   await effects.vscode.initialized;
   await effects.vscode.closeAllTabs();
 
+  state.live.joinSource = 'live';
+
   if (state.live.isLive) {
     actions.live.internal.disconnect();
   }
@@ -81,6 +83,7 @@ export const roomJoined: AsyncAction<{
 
   await actions.internal.setCurrentSandbox(sandbox);
 
+  actions.editor.listenToSandboxChanges({ sandboxId: sandbox.id });
   const items = getItems(state);
   const defaultItem = items.find(i => i.defaultOpen) || items[0];
 

packages/app/src/app/overmind/namespaces/live/internalActions.ts

@@ -43,6 +43,7 @@ export const reset: Action = ({ state, actions, effects }) => {
   state.live.error = null;
   state.live.isLoading = false;
   state.live.roomInfo = null;
+  state.live.joinSource = 'sandbox';
   effects.live.resetClients();
 };
 

packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts

@@ -535,14 +535,15 @@ export const onLiveAddEditor: Operator<LiveMessage<{
 
 export const onLiveRemoveEditor: Operator<LiveMessage<{
   editor_user_id: string;
-}>> = mutate(({ state }, { _isOwnMessage, data }) => {
+}>> = mutate(({ state, actions }, { _isOwnMessage, data }) => {
   if (!state.live.roomInfo) {
     return;
   }
 
-  if (!_isOwnMessage) {
-    const userId = data.editor_user_id;
+  const userId = data.editor_user_id;
+  actions.live.internal.clearUserSelections(userId);
 
+  if (!_isOwnMessage) {
     const editors = state.live.roomInfo.editorIds;
     const newEditors = editors.filter(id => id !== userId);
 

packages/app/src/app/overmind/namespaces/live/state.ts

@@ -16,6 +16,10 @@ type State = {
   followingUserId: string | null;
   liveUserId: string | null;
   roomInfo: RoomInfo | null;
+  /**
+   * Whether we joined from /s/ or from /live/
+   */
+  joinSource: 'sandbox' | 'live';
   currentSelection: UserSelection | null;
   currentViewRange: UserViewRange | null;
   liveUser: Derive<State, LiveUser | null>;
@@ -42,6 +46,7 @@ export const state: State = {
   roomInfo: null,
   currentSelection: null,
   currentViewRange: null,
+  joinSource: 'sandbox',
   liveUser: currentState =>
     currentState.roomInfo?.users.find(u => u.id === currentState.liveUserId) ||
     null,