Fix initial annotations sync

lindylearn · Apr 21, 2022 · 6c1e980 · 6c1e980
1 parent 208cf94
commit 6c1e980
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/source/common/annotations/storage.ts b/source/common/annotations/storage.ts
@@ -15,18 +15,23 @@ export async function getUserInfo() {
     ]);
 }
 
+// validate token and save if valid
 export async function validateSaveToken(token, forceSave = false) {
     const userName = await validateApiToken(token);
-    if (!userName && !forceSave) {
+    if (userName === null && !forceSave) {
         return false;
     }
 
+    await saveToken(token, userName);
+
+    return userName !== null;
+}
+
+export async function saveToken(token: string, userName: string) {
     await browser.storage.sync.set({
         "hypothesis-api-token": token,
         "hypothesis-username": userName,
     });
-
-    return true;
 }
 
 export async function validateApiToken(apiToken) {

diff --git a/source/settings-page/HypothesisConfig.tsx b/source/settings-page/HypothesisConfig.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import {
     getHypothesisToken,
-    validateApiToken,
     validateSaveToken,
 } from "../common/annotations/storage";
 import { createRemoteAnnotation } from "../sidebar/common/api";
@@ -23,12 +22,8 @@ export default function HypothesisConfig() {
             return;
         }
 
-        const tokenValid = (await validateApiToken(token)) !== null;
+        const tokenValid = await validateSaveToken(token, true);
         setTokenValid(tokenValid);
-
-        if (tokenValid) {
-            await validateSaveToken(token, true);
-        }
     }, [token]);
 
     // if this renders, the user has enabled the hypothesis sync
@@ -71,9 +66,7 @@ export default function HypothesisConfig() {
                     "flex-grow bg-gray-100 dark:bg-gray-800 shadow-inner py-1 px-2 outline-none rounded border-2 " +
                     (tokenValid
                         ? "border-green-300 dark:border-green-500"
-                        : token === ""
-                        ? "border-red-300 dark:border-red-500"
-                        : "border-white")
+                        : "border-red-300 dark:border-red-500")
                 }
                 placeholder="Hypothes.is API token"
                 spellCheck="false"

diff --git a/source/settings-page/Options.tsx b/source/settings-page/Options.tsx
@@ -96,7 +96,16 @@ function OptionsPage({}) {
                     >
                         Hypothes.is
                     </a>{" "}
-                    account
+                    account (
+                    <a
+                        href="https://github.com/lindylearn/unclutter/blob/main/docs/annotations.md"
+                        className="underline"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                    >
+                        why
+                    </a>
+                    )
                 </FeatureFlagSwitch>
                 {hypothesisEnabled && <HypothesisConfig />}