decrypt all cryptedData

Author: johannesloetzsch

packages/import/features/Import.tsx

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 
 import { useAppSelector, useAppDispatch, setRowData } from 'state';
 import { selectJsonSchema, selectCryptedData, setCryptedData, selectUiSchema, setJsonSchema, setUiSchema, CryptedData } from 'project-state';
-import { PGPProvider, decryptUsingContext } from 'pgp-provider';
+import { PGPProvider, useDecryptUsingContext } from 'pgp-provider';
 import { api } from '@formswizard/api';
 
 function useFormId() {
@@ -15,30 +15,28 @@ function useFormId() {
 export function DecryptAndImportLastNewSubmission() {
   const dispatch = useAppDispatch();
   const formId = useFormId();
-  const jsonSchema = useAppSelector(selectJsonSchema);
 
   const cryptedData = useAppSelector(selectCryptedData);
   useEffect( () => {
     async function loadCryptedData() {
       const { cryptedData } = await api.getProjectStateCryptedData(formId);
-      const latestCryptedDatum = cryptedData?.length && cryptedData[cryptedData.length-1];
-      latestCryptedDatum && dispatch(setCryptedData(latestCryptedDatum));
+      cryptedData?.map( cryptedDatum => {
+        dispatch(setCryptedData(cryptedDatum));  // TODO use a setter for all cryptedData at the same time
+      });
     }
-    console.log({cryptedData})
     cryptedData.length || loadCryptedData()
   }, [cryptedData])
 
-  /** TODO: Delete decrypted dataset after import and loop over submissions **/
-
-  const cryptedDatum = cryptedData[cryptedData.length-1] || {} as CryptedData;
-  const { id, data, keyId, armoredPublicKey } = cryptedDatum
-  const decrypted_str = decryptUsingContext(data);
-  const decrypted = decrypted_str && JSON.parse(decrypted_str);
-
+  const decrypt = useDecryptUsingContext();
   useEffect( () => {
-    const row = { ...decrypted, id, keyId, armoredPublicKey }
-    decrypted && dispatch(setRowData({row}));
-  }, [decrypted]);
+    cryptedData.map( async cryptedDatum => {
+      const { id, data, keyId, armoredPublicKey } = cryptedDatum
+      const decrypted_str = await decrypt(data);
+      const decrypted = decrypted_str && JSON.parse(decrypted_str);
+      const row = { ...decrypted, id, keyId, armoredPublicKey }
+      decrypted && dispatch(setRowData({row}));
+    })
+  }, [cryptedData]);
 
   return <></>
 }

packages/pgp-provider/PGPProvider.tsx

@@ -98,22 +98,35 @@ export function encryptUsingContext(text: string, armoredPubKeys?: string[]) {
   return encrypted;
 };
 
-export function decryptUsingContext(armoredMessage?: string) {
+export function useDecryptUsingContext() {
   const {privateKey: decryptionKeys} = useKeyContext();
+
+  async function decrypt(armoredMessage: string) {
+    if(decryptionKeys) {
+      const message = await readMessage({ armoredMessage });
+      const decrypted = (await pgp_decrypt({ message, decryptionKeys })
+                               .catch(e => { console.error('Decryption failed. Do you have a correct privateKey?')
+                                             console.warn(e) })
+			)?.data.toString()
+      return decrypted
+    }
+  };
+  return decrypt
+}
+
+export function decryptUsingContext(armoredMessage?: string) {
+  const decrypt = useDecryptUsingContext();
   const [decrypted, setDecrypted] = useState<string>();
 
   useEffect(() => {
     const asyncEffect = async () => {
-      if(decryptionKeys && armoredMessage) {
-        const message = await readMessage({ armoredMessage });
-        pgp_decrypt({ message, decryptionKeys })
-	.then(x => setDecrypted(x.data.toString()))
-	.catch(e => { console.error('Decryption failed. Do you have a correct privateKey?')
-                      console.warn(e) })
+      if(armoredMessage) {
+	const decrypted = await decrypt(armoredMessage);
+	decrypted && setDecrypted(decrypted)
       }
     };
     asyncEffect();
-  }, [armoredMessage, decryptionKeys, setDecrypted]);
+  }, [armoredMessage, setDecrypted]);
 
   return decrypted;
 };