Merge branch 'main' into buffer-fix

apps/passport-client/components/modals/PrivacyNoticeModal.tsx

@@ -30,7 +30,7 @@ export function PrivacyNoticeModal(): JSX.Element {
       });
     } else {
       // Persist to local storage and sync this later
-      savePrivacyNoticeAgreed(LATEST_PRIVACY_NOTICE);
+      await savePrivacyNoticeAgreed(LATEST_PRIVACY_NOTICE);
       dispatch({
         type: "handle-agreed-privacy-notice",
         version: LATEST_PRIVACY_NOTICE

apps/passport-client/new-components/screens/NewUpdatedTermsScreen.tsx

@@ -34,7 +34,7 @@ export const NewUpdatedTermsScreen = (): JSX.Element => {
       });
     } else {
       // Persist to local storage and sync this later
-      savePrivacyNoticeAgreed(LATEST_PRIVACY_NOTICE);
+      await savePrivacyNoticeAgreed(LATEST_PRIVACY_NOTICE);
       dispatch({
         type: "handle-agreed-privacy-notice",
         version: LATEST_PRIVACY_NOTICE

apps/passport-client/new-components/shared/Modals/ChangePasswordModal.tsx

@@ -71,7 +71,7 @@ export const ChangePasswordModal = (): JSX.Element | null => {
     try {
       let currentEncryptionKey: HexString;
       if (!hasSetupPassword) {
-        currentEncryptionKey = loadEncryptionKey() as string;
+        currentEncryptionKey = (await loadEncryptionKey()) as string;
       } else {
         const saltResult = await requestPasswordSalt(
           appConfig.zupassServer,

apps/passport-client/package.json

@@ -86,6 +86,7 @@
     "handlebars": "^4.7.7",
     "isomorphic-timers-promises": "^1.0.1",
     "js-sha256": "^0.11.0",
+    "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "nanoevents": "^9.0.0",
     "pretty-ms": "^8.0.0",

apps/passport-client/pages/index.tsx

@@ -38,6 +38,7 @@ import { LocalStorageNotAccessibleScreen } from "../components/screens/LocalStor
 import { MissingScreen } from "../components/screens/MissingScreen";
 import { NoWASMScreen } from "../components/screens/NoWASMScreen";
 // import { RemoveEmailScreen } from "../components/screens/RemoveEmailScreen";
+import * as localForage from "localforage";
 import styled from "styled-components";
 import { ProveScreen } from "../components/screens/ProveScreen/ProveScreen";
 import { PodboxScannedTicketScreen } from "../components/screens/ScannedTicketScreens/PodboxScannedTicketScreen/PodboxScannedTicketScreen";
@@ -87,13 +88,15 @@ if (typeof window !== "undefined") {
   const params = new URLSearchParams(window.location.search);
   if (params.has("forceNewSession")) {
     localStorage.clear();
-    const newParams = new URLSearchParams(window.location.search);
-    newParams.delete("forceNewSession");
-    const newSearch = newParams.toString();
-    const newPath = `${window.location.pathname}${
-      newSearch ? `?${newSearch}` : ""
-    }${window.location.hash}`;
-    window.location.replace(newPath);
+    localForage.clear().then(() => {
+      const newParams = new URLSearchParams(window.location.search);
+      newParams.delete("forceNewSession");
+      const newSearch = newParams.toString();
+      const newPath = `${window.location.pathname}${
+        newSearch ? `?${newSearch}` : ""
+      }${window.location.hash}`;
+      window.location.replace(newPath);
+    });
   }
 }
 

apps/passport-client/src/appHooks.ts

@@ -305,7 +305,8 @@ export function useHasSetupPassword(): boolean {
 export function useLaserScannerKeystrokeInput(): string {
   const [typedText, setTypedText] = useState("");
   const nav = useNavigate();
-  const usingLaserScanner = loadUsingLaserScanner();
+  const [usingLaserScanner, setUsingLaserScanner] = useState(false);
+  loadUsingLaserScanner().then((value) => setUsingLaserScanner(value));
 
   useEffect(() => {
     function handleKeyDown(event: KeyboardEvent): void {

apps/passport-client/src/backgroundJobs.ts

@@ -129,8 +129,9 @@ export function useBackgroundJobs(): void {
     };
 
     setupBroadcastChannel(dispatch);
-    setupUsingLaserScanning();
-    startBackgroundJobs();
+    setupUsingLaserScanning().then(() => {
+      startBackgroundJobs();
+    });
 
     return () => {
       closeBroadcastChannel();
@@ -143,13 +144,13 @@ export function useBackgroundJobs(): void {
  * on the scan screen so the laser scanner can be used. This flag will be
  * exclusively used on the Devconnect laser scanning devices.
  */
-function setupUsingLaserScanning(): void {
+async function setupUsingLaserScanning(): Promise<void> {
   const queryParams = new URLSearchParams(window.location.search.slice(1));
   const laserQueryParam = queryParams.get("laser");
   if (laserQueryParam === "true") {
-    saveUsingLaserScanner(true);
+    await saveUsingLaserScanner(true);
   } else if (laserQueryParam === "false") {
     // We may want to use this to forcibly make this state false
-    saveUsingLaserScanner(false);
+    await saveUsingLaserScanner(false);
   }
 }

apps/passport-client/src/dispatch.ts

@@ -42,6 +42,7 @@ import {
 import { assertUnreachable, sleep } from "@pcd/util";
 import { Identity } from "@semaphore-protocol/identity";
 import { Buffer } from "buffer";
+import * as localForage from "localforage";
 import _ from "lodash";
 import { createContext } from "react";
 import { appConfig } from "./appConfig";
@@ -418,7 +419,7 @@ async function oneClickLogin(
 
   const crypto = await PCDCrypto.newInstance();
   const encryptionKey = crypto.generateRandomKey();
-  saveEncryptionKey(encryptionKey);
+  await saveEncryptionKey(encryptionKey);
 
   update({
     encryptionKey
@@ -446,7 +447,7 @@ async function oneClickLogin(
 
     // User has encryption key
     if (oneClickLoginResult.value.encryptionKey) {
-      saveEncryptionKey(oneClickLoginResult.value.encryptionKey);
+      await saveEncryptionKey(oneClickLoginResult.value.encryptionKey);
       update({
         encryptionKey: oneClickLoginResult.value.encryptionKey
       });
@@ -515,7 +516,7 @@ async function createNewUserSkipPassword(
 
   const crypto = await PCDCrypto.newInstance();
   const encryptionKey = crypto.generateRandomKey();
-  saveEncryptionKey(encryptionKey);
+  await saveEncryptionKey(encryptionKey);
 
   update({
     encryptionKey
@@ -561,7 +562,7 @@ async function createNewUserWithPassword(
   const { salt: newSalt, key: encryptionKey } =
     crypto.generateSaltAndEncryptionKey(password);
 
-  saveEncryptionKey(encryptionKey);
+  await saveEncryptionKey(encryptionKey);
 
   update({
     encryptionKey
@@ -733,7 +734,7 @@ async function setSelf(
     return;
   }
 
-  saveSelf(self); // Save to local storage.
+  await saveSelf(self); // Save to local storage.
   update({ self }); // Update in-memory state.
 }
 
@@ -755,6 +756,7 @@ async function resetPassport(
     commitment: state.self?.commitment
   });
   // Clear saved state.
+  await localForage.clear();
   window.localStorage.clear();
   // Clear in-memory state
   update({
@@ -908,13 +910,13 @@ async function loadAfterLogin(
   console.log(`[SYNC] saving state at login: revision ${storage.revision}`);
   await savePCDs(pcds);
   await saveSubscriptions(subscriptions);
-  savePersistentSyncStatus({
+  await savePersistentSyncStatus({
     serverStorageRevision: storage.revision,
     serverStorageHash: storageHash
   });
-  saveEncryptionKey(encryptionKey);
-  saveSelf(self);
-  saveIdentity(identityPCD.claim.identityV3);
+  await saveEncryptionKey(encryptionKey);
+  await saveSelf(self);
+  await saveIdentity(identityPCD.claim.identityV3);
 
   update({
     encryptionKey,
@@ -940,8 +942,8 @@ async function loadAfterLogin(
 
 // Update `self` and `encryptionKey` in-memory fields from their saved values in localStorage
 async function handlePasswordChangeOnOtherTab(update: ZuUpdate): Promise<void> {
-  const self = loadSelf();
-  const encryptionKey = loadEncryptionKey();
+  const self = await loadSelf();
+  const encryptionKey = await loadEncryptionKey();
   return update({
     self,
     encryptionKey,
@@ -962,8 +964,8 @@ async function saveNewPasswordAndBroadcast(
 ): Promise<void> {
   if (state.self) {
     const newSelf = { ...state.self, salt: newSalt };
-    saveSelf(newSelf);
-    saveEncryptionKey(newEncryptionKey);
+    await saveSelf(newSelf);
+    await saveEncryptionKey(newEncryptionKey);
     notifyPasswordChangeToOtherTabs();
     update({
       encryptionKey: newEncryptionKey,
@@ -1013,13 +1015,13 @@ async function sync(state: AppState, update: ZuUpdate): Promise<void> {
 
       // sync() is triggered via dispatch on any update, so if we make changes
       // we know we'll be called again the latest AppState snapshot.  If we
-      // have no changes, we can force another sync via and empty update, to
-      // ensure we didn't miss any important states.
+      // have no changes, we can force another sync via dispatch, to ensure we
+      // didn't miss any important states.
       if (stateChanges) {
         update(stateChanges);
       } else if (skippedSyncUpdates > 0) {
         console.log("[SYNC] running an extra sync in case of missed updates");
-        update({});
+        window.setTimeout(() => dispatch({ type: "sync" }, state, update), 0);
       }
       skippedSyncUpdates = 0;
     } finally {
@@ -1062,7 +1064,7 @@ async function doSync(
     console.log("[SYNC] no user available to sync");
     return undefined;
   }
-  if (!loadEncryptionKey()) {
+  if (!(await loadEncryptionKey())) {
     console.log("[SYNC] no encryption key, can't sync");
     return undefined;
   }
@@ -1416,7 +1418,7 @@ async function handleAgreedPrivacyNotice(
   version: number
 ): Promise<void> {
   if (state.self) {
-    saveSelf({ ...state.self, terms_agreed: version });
+    await saveSelf({ ...state.self, terms_agreed: version });
     window.location.hash = "#/";
   }
 }
@@ -1428,7 +1430,7 @@ async function handleAgreedPrivacyNotice(
  * un-dismissable modal.
  */
 async function promptToAgreePrivacyNotice(state: AppState): Promise<void> {
-  const cachedTerms = loadPrivacyNoticeAgreed();
+  const cachedTerms = await loadPrivacyNoticeAgreed();
   if (cachedTerms === LATEST_PRIVACY_NOTICE) {
     // sync to server
     await agreeTerms(

apps/passport-client/src/loadInitialState.ts

@@ -23,26 +23,26 @@ import { AppState } from "./state";
 import { validateAndLogInitialAppState } from "./validateState";
 
 export async function loadInitialState(): Promise<AppState> {
-  let identityV3 = loadIdentity();
+  let identityV3 = await loadIdentity();
 
   if (!identityV3) {
     console.log("Generating a new Semaphore identity...");
     identityV3 = new Identity();
-    saveIdentity(identityV3);
+    await saveIdentity(identityV3);
   }
 
-  const self = loadSelf();
+  const self = await loadSelf();
 
   const pcds = await loadPCDs(self);
 
-  const encryptionKey = loadEncryptionKey();
+  const encryptionKey = await loadEncryptionKey();
   const subscriptions = await loadSubscriptions();
 
   const modal = { modalType: "none" } as AppState["modal"];
 
   const credentialCache = createStorageBackedCredentialCache();
 
-  const persistentSyncStatus = loadPersistentSyncStatus();
+  const persistentSyncStatus = await loadPersistentSyncStatus();
 
   const state: AppState = {
     self,
@@ -100,7 +100,7 @@ export async function loadInitialState(): Promise<AppState> {
 
       if (newSelfResponse.success) {
         state.self = newSelfResponse.value;
-        saveSelf(newSelfResponse.value);
+        await saveSelf(newSelfResponse.value);
       } else {
         // proceed to the next step anyway, since we don't have any other option
       }