From c7aab5853881909d3a5a6c75d781a8bd7fed1587 Mon Sep 17 00:00:00 2001
From: Bradley Erickson <bbwe24@gmail.com>
Date: Tue, 10 Dec 2024 15:58:52 -0500
Subject: [PATCH 1/3] fixed bug with inject.js that caused issues with the
 google CSP

---
 VERSION                                 |  1 +
 extension/writing-process/src/inject.js | 19 -------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 create mode 100644 VERSION
 delete mode 100644 extension/writing-process/src/inject.js

diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..7d5555de9
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2024-12-10-15:58:52.933-aabd8078-berickson/202412-extension-fixes
diff --git a/extension/writing-process/src/inject.js b/extension/writing-process/src/inject.js
deleted file mode 100644
index 613429ba3..000000000
--- a/extension/writing-process/src/inject.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-   Inject script. This is a web_accessible_resources used to pass the id 
-   of the document as a globally accessible variable to the extension.
-   It is called by the injectScript function in writing.js to make the result 
-   accessible using an event listener.
-
-   TODO:
-   * We don't really understand this code. It should be commented
-   * In particular, why are we using an IIFE (immediately invoked function
-     expression) rather than just the code?
-
-     If this is a relic, it should be cleaned up. If this has a
-     reason, it should be documented.
-*/
-
-(function() {
-    const result = JSON.stringify(_docs_flag_initialData.info_params.token);
-    window.postMessage({ from: 'inject.js', data: result });
-})();

From b49ac2f6e3fe344d38c4f0fc2f8d73be47750e6a Mon Sep 17 00:00:00 2001
From: Bradley Erickson <bbwe24@gmail.com>
Date: Tue, 10 Dec 2024 16:00:00 -0500
Subject: [PATCH 2/3] added the files this time

---
 VERSION                                     |  1 -
 extension/writing-process/src/manifest.json |  5 --
 extension/writing-process/src/writing.js    | 84 ++++++++++-----------
 3 files changed, 42 insertions(+), 48 deletions(-)
 delete mode 100644 VERSION

diff --git a/VERSION b/VERSION
deleted file mode 100644
index 7d5555de9..000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2024-12-10-15:58:52.933-aabd8078-berickson/202412-extension-fixes
diff --git a/extension/writing-process/src/manifest.json b/extension/writing-process/src/manifest.json
index 9d26efaa6..f663bf58f 100644
--- a/extension/writing-process/src/manifest.json
+++ b/extension/writing-process/src/manifest.json
@@ -36,11 +36,6 @@
         "matches": ["*://docs.google.com/document/*"],
 	    "js": ["3rdparty/sha256.js", "writing_common.js", "writing.js"]
     }],
-    "web_accessible_resources": [{
-        "resources": ["inject.js"],
-        "matches": ["*://docs.google.com/*"],
-        "use_dynamic_url": true
-    }],
     "host_permissions": [
         "*://docs.google.com/document/*"
     ],
diff --git a/extension/writing-process/src/writing.js b/extension/writing-process/src/writing.js
index 1367e8a81..6a8cbc2ce 100644
--- a/extension/writing-process/src/writing.js
+++ b/extension/writing-process/src/writing.js
@@ -3,7 +3,7 @@
 */
 
 /* For debugging purposes: we know the extension is active */
-document.body.style.border = "5px solid blue";
+// document.body.style.border = "1px solid blue";
 
 import { googledocs_id_from_url, treeget } from './writing_common';
 /*
@@ -142,29 +142,31 @@ function is_string(myVar) {
     }
 }
 
-function injectScript(file_path, tag) {
-    /* 
-        This function is to inject a script from 'file_path' 
-        into a specific DOM tag passed in as 'tag'
-    */
-    var node = document.getElementsByTagName(tag)[0];
-    var script = document.createElement('script');
-    script.setAttribute('type', 'text/javascript');
-    script.setAttribute('src', file_path);
-    node.appendChild(script);
-}
-
-function execute_on_page_space(code){
-    /* This is from
-       https://stackoverflow.com/questions/9602022/chrome-extension-retrieving-global-variable-from-webpage
-
-       It is used to run code outside of the extension isolation box,
-       for example to access page JavaScript variables.
+function extractDocsToken() {
+    /**
+     * We need the doc token to be able to fetch the document
+     * history. This token is provided via a <script> tag within
+     * the `_docs_flag_initialData` value. This code iterates
+     * over all the scripts on the page, finds the appropriate
+     * one and extracts the `info_params.token` from it.
      */
-
-    if (!document.getElementById('tmpScript')) {
-        injectScript(chrome.runtime.getURL('inject.js'), 'body');
+    const scripts = document.querySelectorAll('script');
+
+    for (const script of scripts) {
+        if (script.textContent.includes('_docs_flag_initialData')) {
+            try {
+                // Use a regex to extract the JSON structure
+                const match = script.textContent.match(/_docs_flag_initialData\s*=\s*(\{.*?\});/);
+                if (match && match[1]) {
+                    const data = JSON.parse(match[1]); // Parse the JSON string
+                    return data.info_params.token;
+                }
+            } catch (error) {
+                console.error('Error parsing _docs_flag_initialData:', error);
+            }
+        }
     }
+    return null;
 }
 
 function google_docs_version_history(token) {
@@ -719,16 +721,10 @@ function writing_onload() {
         log_event("document_loaded", {
             "partial_text": google_docs_partial_text()
         });
-        execute_on_page_space("_docs_flag_initialData.info_params.token");
-        const handleFromWeb = async (event) => {
-            if (event.data.from && event.data.from === "inject.js") {
-                const data = event.data.data;
-                var token = JSON.parse(data);
-                google_docs_version_history(token);
-            }
-        };
-    
-        window.addEventListener('message', handleFromWeb);
+        const docsToken = extractDocsToken();
+        if (docsToken) {
+            google_docs_version_history(docsToken);
+        }
     }
 }
 
@@ -739,17 +735,21 @@ AJAX responses.
 This is impossible to do directly from within an extension.
 
 This is currently unused.
+
+We get `SyntaxError: Invalid or unexpected token` for the end of the
+first line commented out immediately below. Since this code is not
+used, we commented it out instead of fixing.
 */
-const LOG_AJAX = "\n\
-const WO_XHR = XMLHttpRequest.prototype;\n\
-const wo_send = WO_XHR.send;\n\
-\n\
-\n\
-WO_XHR.send = function () {\n\
-    this.addEventListener('load', function () {\n\
-        console.log(this); console.log(this.getAllResponseHeaders());\n\
-    }); return wo_send.apply(this, arguments); }\n\
-"
+// const LOG_AJAX = "\n\
+// const WO_XHR = XMLHttpRequest.prototype;\n\
+// const wo_send = WO_XHR.send;\n\
+// \n\
+// \n\
+// WO_XHR.send = function () {\n\
+//     this.addEventListener('load', function () {\n\
+//         console.log(this); console.log(this.getAllResponseHeaders());\n\
+//     }); return wo_send.apply(this, arguments); }\n\
+// "
 
 window.addEventListener("load", writing_onload);
 

From 42fc3b1165e05d03658e342e64306f3784558fcd Mon Sep 17 00:00:00 2001
From: Bradley Erickson <bbwe24@gmail.com>
Date: Fri, 13 Dec 2024 10:01:51 -0500
Subject: [PATCH 3/3] pr feedback

---
 extension/writing-process/src/writing.js    | 45 ++++++++++-----------
 extension/writing-process/webpack.config.js |  1 -
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/extension/writing-process/src/writing.js b/extension/writing-process/src/writing.js
index 6a8cbc2ce..f318f404d 100644
--- a/extension/writing-process/src/writing.js
+++ b/extension/writing-process/src/writing.js
@@ -162,11 +162,11 @@ function extractDocsToken() {
                     return data.info_params.token;
                 }
             } catch (error) {
-                console.error('Error parsing _docs_flag_initialData:', error);
+                throw new Error('Error parsing _docs_flag_initialData: ' + error);
             }
         }
     }
-    return null;
+    throw new Error('Unable to find document token used for extracting additional data.');
 }
 
 function google_docs_version_history(token) {
@@ -182,32 +182,22 @@ function google_docs_version_history(token) {
 
       It also lets us debug the system.
 
-      NOTE (CL) in past cases use of the execute on page space by itself triggered
-      an error.  If it creates excessive delays or error due to history use the
-      following code block in lieu of the next call. 
-
-      try {
-        var token = executeOnPageSpace("_docs_flag_initialData.info_params.token");
-      } catch (error) {
-     	log_event("Error on Page History.", {"ERROR" : error})
- 	return -1;
-      }
+      TODO the following code ought to be refactored into more atomic
+      functions
     */
 
     const metainfo_url = "https://docs.google.com/document/d/"+doc_id()+"/revisions/tiles?id="+doc_id()+"&start=1&showDetailedRevisions=false&filterNamed=false&token="+token+"&includes_info_params=true";
 
-    fetch(metainfo_url).then(function(response) {
-        response.text().then(function(text) {
+    return fetch(metainfo_url).then(function(response) {
+        return response.text().then(function(text) {
             const tiles = JSON.parse(text.substring(5)); // Google adds a header to prevent JavaScript injection. This removes it.
             var first_revision = tiles.firstRev;
             var last_revision = tiles.tileInfo[tiles.tileInfo.length - 1].end;
             const version_history_url = "https://docs.google.com/document/d/"+doc_id()+"/revisions/load?id="+doc_id()+"&start="+first_revision+"&end="+last_revision;
-            fetch(version_history_url).then(function(history_response) {
-                history_response.text().then(function(history_text) {
-                    log_event(
-                        "document_history",
-                        {'history': JSON.parse(history_text.substring(4))}
-                    );
+            return fetch(version_history_url).then(function(history_response) {
+                return history_response.text().then(function(history_text) {
+                    const output = JSON.parse(history_text.substring(4));
+                    return output;
                 });
             });
         });
@@ -721,9 +711,18 @@ function writing_onload() {
         log_event("document_loaded", {
             "partial_text": google_docs_partial_text()
         });
-        const docsToken = extractDocsToken();
-        if (docsToken) {
-            google_docs_version_history(docsToken);
+        try {
+            const docsToken = extractDocsToken();
+            if (!docsToken) {
+                throw new Error(`Document token is missing or invalid: ${docsToken}`)
+            }
+            google_docs_version_history(docsToken).then(function (history) {
+                log_event('document_history', {'history': history});
+            }).catch(function (error) {
+                throw error;
+            });
+        } catch (error) {
+            log_event('google_document_history_error', {'error': error})
         }
     }
 }
diff --git a/extension/writing-process/webpack.config.js b/extension/writing-process/webpack.config.js
index 3ad13a6bd..b4a086d29 100644
--- a/extension/writing-process/webpack.config.js
+++ b/extension/writing-process/webpack.config.js
@@ -6,7 +6,6 @@ module.exports = {
         service_worker: path.join(__dirname, 'src', 'service_worker.js'),
         writing_common: path.join(__dirname, 'src', 'writing_common.js'),
         writing: path.join(__dirname, 'src', 'writing.js'),
-        inject: path.join(__dirname, 'src', 'inject.js'),
     },
     output: {
         path: path.join(__dirname, 'src'),