Merge pull request #250 from ezzak/fix_framed_logged_out

Fix edge case with nested logged out frame on logged in document

Author: rich-hansen

src/js/background/tab_state_tracker/TabStateMachine.ts

@@ -61,11 +61,12 @@ export default class TabStateMachine extends StateMachine {
   }
 
   updateStateIfValid(newState: State) {
-    // Only update the tab's state to VALID if all of it's frames are VALID
+    // Only update the tab's state to VALID if all of it's frames are VALID or just starting
     if (
       newState === STATES.VALID &&
       !Object.values(this._frameStates).every(
-        fsm => fsm.getState() === STATES.VALID,
+        fsm =>
+          fsm.getState() === STATES.VALID || fsm.getState() === STATES.START,
       )
     ) {
       return;

src/js/contentUtils.ts

@@ -422,6 +422,7 @@ export const processFoundJS = async (version: string): Promise<void> => {
   window.setTimeout(() => processFoundJS(version), 3000);
 };
 
+let isUserLoggedIn = false;
 export function startFor(
   origin: Origin,
   excludedPathnames: Array<RegExp> = [],
@@ -441,7 +442,6 @@ export function startFor(
     updateCurrentState(STATES.IGNORE);
     return;
   }
-  let isUserLoggedIn = false;
   if (isFbMsgrOrIgOrigin(origin)) {
     // ds_user_id / c_user contains the user id of the user logged in
     const cookieName =
@@ -454,7 +454,7 @@ export function startFor(
       }
     });
   } else {
-    // only doing this check for FB and MSGR
+    // only doing this check for FB, MSGR, and IG
     isUserLoggedIn = true;
   }
   if (isUserLoggedIn) {
@@ -480,7 +480,7 @@ chrome.runtime.onMessage.addListener(request => {
       `Detected uncached script ${request.uncachedUrl}`,
     );
   } else if (request.greeting === 'checkIfScriptWasProcessed') {
-    if (!ALL_FOUND_SCRIPT_TAGS.has(request.response.url)) {
+    if (isUserLoggedIn && !ALL_FOUND_SCRIPT_TAGS.has(request.response.url)) {
       if (
         'serviceWorker' in navigator &&
         navigator.serviceWorker.controller?.scriptURL === request.response.url