Fix last token loading/saving.

Author: sebadoom

src/editor/index.js

@@ -1,4 +1,4 @@
-import { copyTextToClipboard, deferToNextLoop } from '../utils.js';
+import { copyTextToClipboard, deferToNextLoop, safeLocalStorageSetItem } from '../utils.js';
 import { downloadPublicKeyIfPossible } from './public-key-download.js';
 import { tooltipHandler } from './tooltip.js';
 import { tokenEditor, headerEditor, payloadEditor } from './instances.js';
@@ -178,6 +178,32 @@ function markAsInvalidWithElement(element, clearTokenEditor = true) {
   }
 }
 
+function saveAsLastToken() {
+  const token = getTrimmedValue(tokenEditor);
+  if(token && token.length > 0) {
+    safeLocalStorageSetItem('lastToken', token);
+  }
+
+  const publicKey = publicKeyTextArea.value;
+  if(publicKey && publicKey.length > 0) {
+    safeLocalStorageSetItem('lastPublicKey', publicKey);
+  }
+}
+
+function loadToken() {
+  const lastToken = localStorage.getItem('lastToken');
+  if(lastToken) {
+    setTokenEditorValue(lastToken);
+    
+    const lastPublicKey = localStorage.getItem('lastPublicKey');
+    if(lastPublicKey) {
+      publicKeyTextArea.value = lastPublicKey;
+    }
+  } else {
+    useDefaultToken('HS256');
+  }
+}
+
 function encodeToken() {
   deferToNextLoop(fixEditorHeight);
 
@@ -211,8 +237,10 @@ function encodeToken() {
           secretInput.value :
           privateKeyTextArea.value,
           secretBase64Checkbox.checked);
-
+          
       tokenEditor.setValue(encoded);
+
+      saveAsLastToken();
     } catch(e) {
       console.error('Failed to sign/encode token: ', e);      
       markAsInvalid();
@@ -247,6 +275,7 @@ function decodeToken() {
       if(decoded.errors) {
         markAsInvalidWithElement(editorElement, false);
       } else {
+        saveAsLastToken();
         verifyToken();
       }
     } catch(e) {
@@ -339,6 +368,6 @@ export function setTokenEditorValue(value) {
 export function setupTokenEditor() {
   setupEvents();
   selectAlgorithm('HS256');
-  useDefaultToken('HS256');
+  loadToken();
   fixEditorHeight();
 }

src/extension/index.js

@@ -1,26 +1,4 @@
-import {
-  setupTokenEditor,
-  setTokenEditorValue,
-  useDefaultToken
-} from '../editor';
-import { publicKeyTextArea } from './dom-elements.js';
-
-/* For initialization, look at the end of this file */
-
-function loadToken() {
-  const lastToken = localStorage.getItem('lastToken');
-  if(lastToken) {
-    setTokenEditorValue(value);
-    
-    const lastPublicKey = localStorage.getItem('lastPublicKey');
-    if(lastPublicKey) {
-      publicKeyTextArea.value = lastPublicKey;
-    }
-  } else {
-    useDefaultToken('HS256');
-  }
-}
+import { setupTokenEditor } from '../editor';
 
 // Initialization
 setupTokenEditor();
-loadToken();

src/utils.js

@@ -183,3 +183,13 @@ export function getParameterByName(name, url) {
 export function isWideScreen() {
   return window.matchMedia('(min-width: 768px)').matches;
 }
+
+export function safeLocalStorageSetItem(key, value) {
+  try {
+    localStorage.setItem(key, value);
+  } catch (e) {
+    console.log('Cannot save token to Local Storage ' + 
+                '(private browsing enabled?), ignoring...', e);
+    // Safari when in private browsing doesn't allow it
+  }
+}

src/website/index.js

@@ -1,11 +1,7 @@
 import { setupNavbar } from './navbar.js';
 import { setupExtensionButton } from './extension.js';
 import { setupLibraries } from './libraries.js';
-import {
-  setupTokenEditor,
-  setTokenEditorValue,
-  useDefaultToken
-} from '../editor';
+import { setupTokenEditor, setTokenEditorValue } from '../editor';
 import { setupJwtCounter } from './counter.js';
 import { setupSmoothScrolling } from './smooth-scrolling.js';
 import { setupHighlighting } from './highlighting.js';
@@ -44,20 +40,6 @@ function parseLocationQuery() {
   }
 }
 
-function loadToken() {
-  const lastToken = localStorage.getItem('lastToken');
-  if(lastToken) {
-    setTokenEditorValue(value);
-    
-    const lastPublicKey = localStorage.getItem('lastPublicKey');
-    if(lastPublicKey) {
-      publicKeyTextArea.value = lastPublicKey;
-    }
-  } else {
-    useDefaultToken('HS256');
-  }
-}
-
 function pickEbookOrExtensionBanner() {
   if(Math.random() >= 0.5) {
     extensionSection.style.display = 'block';
@@ -72,7 +54,6 @@ setupExtensionButton();
 setupSmoothScrolling();
 setupLibraries();
 setupTokenEditor();
-loadToken();
 parseLocationQuery();
 setupHighlighting();
 setupJwtCounter();

src/website/libraries.js

@@ -1,4 +1,4 @@
-import { safeLocalStorageSetItem } from './utils.js';
+import { safeLocalStorageSetItem } from '../utils.js';
 import { httpGet } from '../utils.js';
 import { 
   starsElements,

src/website/utils.js

@@ -1,12 +1,3 @@
-export function safeLocalStorageSetItem(key, value) {
-  try {
-    localStorage.setItem(key, value);
-  } catch (e) {
-    console.error(e);
-    // Safari when in private browsing doesn't allow it
-  }
-}
-
 export function getOffsetBoundingClientRect(element) {
   const rect = element.getBoundingClientRect();