use base64 for all prefill queries, such as duplicates

DA0-DA0 · Apr 6, 2024 · 15d73f7 · 15d73f7
1 parent 1927671
commit 15d73f7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 18 deletions.
diff --git a/packages/stateful/components/dao/CreateDaoProposal.tsx b/packages/stateful/components/dao/CreateDaoProposal.tsx
@@ -185,24 +185,24 @@ const InnerCreateDaoProposal = ({
       return
     }
 
-    const potentialDefaultValue = router.query.prefill
-    if (typeof potentialDefaultValue !== 'string' || !potentialDefaultValue) {
+    const potentialPrefill = router.query.prefill
+    if (typeof potentialPrefill !== 'string' || !potentialPrefill) {
       setPrefillChecked(true)
       return
     }
 
     // Try to parse as JSON.
     let prefillData
     try {
-      prefillData = JSON.parse(potentialDefaultValue)
+      prefillData = JSON.parse(potentialPrefill)
     } catch (error) {
       console.error(error)
     }
 
     // Try to parse as base64.
     if (!prefillData) {
       try {
-        prefillData = decodeJsonFromBase64(potentialDefaultValue)
+        prefillData = decodeJsonFromBase64(potentialPrefill)
       } catch (error) {
         console.error(error)
       }

diff --git a/packages/stateful/components/dao/DaoPreProposeApprovalProposalContentDisplay.tsx b/packages/stateful/components/dao/DaoPreProposeApprovalProposalContentDisplay.tsx
@@ -13,7 +13,7 @@ import {
   CommonProposalInfo,
   ProposalPrefill,
 } from '@dao-dao/types'
-import { keyFromPreProposeStatus } from '@dao-dao/utils'
+import { encodeJsonToBase64, keyFromPreProposeStatus } from '@dao-dao/utils'
 
 import { useActionsForMatching } from '../../actions'
 import { useEntity } from '../../hooks'
@@ -61,7 +61,7 @@ export const DaoPreProposeApprovalProposalContentDisplay = ({
   // duplicate button remains hidden until the form data is loaded.
   const duplicateUrl = duplicateFormData
     ? getDaoProposalPath(coreAddress, 'create', {
-        prefill: JSON.stringify(prefill),
+        prefill: encodeJsonToBase64(prefill),
       })
     : undefined
 

diff --git a/packages/stateful/components/dao/DaoProposalContentDisplay.tsx b/packages/stateful/components/dao/DaoProposalContentDisplay.tsx
@@ -10,6 +10,7 @@ import {
   PreProposeModuleType,
   ProposalPrefill,
 } from '@dao-dao/types'
+import { encodeJsonToBase64 } from '@dao-dao/utils'
 
 import { useActionsForMatching } from '../../actions'
 import { useEntity } from '../../hooks'
@@ -59,7 +60,7 @@ export const DaoProposalContentDisplay = ({
   // duplicate button remains hidden until the form data is loaded.
   const duplicateUrl = duplicateFormData
     ? getDaoProposalPath(coreAddress, 'create', {
-        prefill: JSON.stringify(prefill),
+        prefill: encodeJsonToBase64(prefill),
       })
     : undefined
 

diff --git a/packages/stateful/components/gov/NewGovProposal.tsx b/packages/stateful/components/gov/NewGovProposal.tsx
@@ -145,24 +145,24 @@ export const NewGovProposal = (innerProps: NewGovProposalProps) => {
       return
     }
 
-    const potentialDefaultValue = router.query.prefill
-    if (typeof potentialDefaultValue !== 'string' || !potentialDefaultValue) {
+    const potentialPrefill = router.query.prefill
+    if (typeof potentialPrefill !== 'string' || !potentialPrefill) {
       setPrefillChecked(true)
       return
     }
 
     // Try to parse as JSON.
     let prefillData
     try {
-      prefillData = JSON.parse(potentialDefaultValue)
+      prefillData = JSON.parse(potentialPrefill)
     } catch (error) {
       console.error(error)
     }
 
     // Try to parse as base64.
     if (!prefillData) {
       try {
-        prefillData = decodeJsonFromBase64(potentialDefaultValue)
+        prefillData = decodeJsonFromBase64(potentialPrefill)
       } catch (error) {
         console.error(error)
       }

diff --git a/packages/stateful/components/profile/ProfileActions.tsx b/packages/stateful/components/profile/ProfileActions.tsx
@@ -25,8 +25,10 @@ import {
   CHAIN_GAS_MULTIPLIER,
   KVPK_API_BASE,
   ME_SAVED_TX_PREFIX,
+  decodeJsonFromBase64,
   getRpcForChainId,
   getSignerOptions,
+  objectMatchesStructure,
   processError,
 } from '@dao-dao/utils'
 
@@ -73,14 +75,36 @@ export const ProfileActions = () => {
   // Load from prefill query.
   const router = useRouter()
   useEffect(() => {
-    if (router.query.prefill) {
+    const potentialPrefill = router.query.prefill
+    if (typeof potentialPrefill !== 'string' || !potentialPrefill) {
+      return
+    }
+
+    // Try to parse as JSON.
+    let prefillData
+    try {
+      prefillData = JSON.parse(potentialPrefill)
+    } catch (error) {
+      console.error(error)
+    }
+
+    // Try to parse as base64.
+    if (!prefillData) {
       try {
-        const prefill = JSON.parse(router.query.prefill as string)
-        formMethods.reset(prefill)
-      } catch (err) {
-        console.error(err)
+        prefillData = decodeJsonFromBase64(potentialPrefill)
+      } catch (error) {
+        console.error(error)
       }
     }
+
+    // If prefillData looks valid, use it.
+    if (
+      objectMatchesStructure(prefillData, {
+        actions: {},
+      })
+    ) {
+      formMethods.reset(prefillData)
+    }
   }, [formMethods, router.query])
 
   const meTransaction = formMethods.watch()

diff --git a/packages/utils/url.ts b/packages/utils/url.ts
@@ -3,6 +3,7 @@ import queryString from 'query-string'
 import { ActionKeyAndDataNoId, DaoPageMode, DaoTabId } from '@dao-dao/types'
 
 import { DaoProposalSingleAdapterId } from './constants/adapters'
+import { encodeJsonToBase64 } from './messages'
 
 // Create a path to a DAO page based on the app's page mode.
 export const getDaoPath = (
@@ -77,7 +78,7 @@ export const getAccountPath = (
 export const getMeTxPrefillPath = (actions: ActionKeyAndDataNoId[]) => {
   const base = '/me/actions'
   const query = `?${queryString.stringify({
-    prefill: JSON.stringify({
+    prefill: encodeJsonToBase64({
       actions: actions.map((action, index) => ({
         _id: index.toString(),
         ...action,
@@ -98,7 +99,7 @@ export const getDaoProposalSinglePrefill = ({
   title?: string
   description?: string
 }): string =>
-  JSON.stringify({
+  encodeJsonToBase64({
     id: DaoProposalSingleAdapterId,
     data: {
       title,