Fix Github PAT saving (#331)

* ♻  refactor: Clearer control flow

* 🐛 fix: Error in options to `createGistWithFile`

was providing `filename` instead of `file` (#323)

* 🐛 fix: Clean `__syncId` from papers

And make `cleanPapers` generally handle private keys starting with `__`

* ♻  refactor: Refactor & improve clarity

* 🏗  build: gulp build

Author: vict0rsch

src/background/background.js

@@ -278,10 +278,13 @@ const pullSyncPapers = async () => {
         });
         const remoteSyncId = global.state.gistData["__syncId"];
         delete global.state.gistData["__syncId"];
-        const remotePapers =
-            remoteSyncId === localSyncID
-                ? (await getStorage("papers")) ?? {}
-                : global.state.gistData;
+
+        let remotePapers;
+        if (remoteSyncId === localSyncID) {
+            remotePapers = (await getStorage("papers")) ?? {};
+        } else {
+            remotePapers = global.state.gistData;
+        }
         if (remoteSyncId === localSyncID) {
             warn("Pulled sync data from same device, ignoring.");
         }

src/shared/js/utils/functions.js

@@ -199,7 +199,11 @@ function delay(fn, ms) {
  */
 const cleanPapers = (papers) => {
     let cleaned = { ...papers };
-    delete cleaned["__dataVersion"];
+    Object.keys(cleaned).forEach((k) => {
+        if (k.startsWith("__")) {
+            delete cleaned[k];
+        }
+    });
     return cleaned;
 };
 

src/shared/js/utils/sync.js

@@ -31,11 +31,7 @@ const getIdentifier = async () => {
  * @param {boolean} options.patError - Whether to raise an error if no PAT
  * @returns {Promise<{ ok: boolean, payload: { file: { filename: string, raw_url: string, content: object }, pat: string, gistId: string } }>}
  */
-const getGist = async (options) => {
-    options = options ?? {};
-    let pat = options.pat;
-    let store = options.store ?? true;
-    let patError = options.patError ?? true;
+const getGist = async ({ pat, store = true, patError = true }) => {
     try {
         if (!pat) pat = await getPat(patError);
 
@@ -61,7 +57,7 @@ const getGist = async (options) => {
             info("No Gist found. Creating new one...");
             const papers = await getStorage("papers");
             gist = await createGistWithFile({
-                filename,
+                file: filename,
                 pat,
                 description,
                 content: papers,
@@ -246,9 +242,9 @@ const initSyncAndState = async ({
     stateIsReady = () => {},
     remoteIsReady = () => {},
 } = {}) => {
-    (!global.state.dataVersion || forceInit) &&
-        (await initState({ papers, isContentScript }));
-
+    if (!global.state.dataVersion || forceInit) {
+        await initState({ papers, isContentScript });
+    }
     stateIsReady();
 
     if (!(await shouldSync())) {