fix: delete config route (#82)

* move delete config to separate route

Author: DarianM

backend/src/controllers/tools.ts

@@ -232,6 +232,50 @@ export const getUserConfigByTag = async (req: Request, res: Response) => {
   }
 }
 
+export const deleteUserConfigVersion = async (req: Request, res: Response) => {
+  try {
+    const { walletAddress, version } = req.params
+    const cookieHeader = req.headers.cookie
+    const session = await getSession(cookieHeader)
+
+    const validForWallet = session?.get('validForWallet')
+    if (!walletAddress) {
+      throw 'Wallet address is required'
+    }
+    if (!session || validForWallet !== walletAddress) {
+      throw 'Grant confirmation is required'
+    }
+    if (version === 'default') {
+      throw 'Cannot delete default version'
+    }
+
+    const { s3, params } = getS3AndParams(walletAddress)
+
+    const existingData = await s3.send(new GetObjectCommand(params))
+    const existingContentString = await streamToString(
+      existingData.Body as NodeJS.ReadableStream
+    )
+    const existingConfig: ConfigVersions = JSON.parse(existingContentString)
+
+    if (existingConfig[version]) {
+      delete existingConfig[version]
+
+      const fileContent = JSON.stringify(existingConfig)
+      const extendedParams = { ...params, Body: fileContent }
+      await s3.send(new PutObjectCommand(extendedParams))
+    }
+
+    res.status(200).send(existingConfig)
+  } catch (err) {
+    console.log(err)
+    const message =
+      err === 'Cannot delete default version'
+        ? err
+        : 'An error occurred when deleting config version'
+    res.status(500).send(message)
+  }
+}
+
 const sanitizeConfigFields = <T extends Partial<SanitizedFields>>(
   config: T
 ): T => {

backend/src/routes/tools.ts

@@ -4,7 +4,8 @@ import {
   getUserConfig,
   createUserConfig,
   saveUserConfig,
-  getUserConfigByTag
+  getUserConfigByTag,
+  deleteUserConfigVersion
 } from '../controllers/tools.js'
 
 const userRoutes = (router: Router) => {
@@ -13,6 +14,7 @@ const userRoutes = (router: Router) => {
   router.get('/tools/:id/:tag', getUserConfigByTag)
   router.post('/tools', createUserConfig)
   router.put('/tools', saveUserConfig)
+  router.delete('/tools/:walletAddress/:version', deleteUserConfigVersion)
 
   return router
 }

frontend/app/lib/apiClient.ts

@@ -132,4 +132,31 @@ export class ApiClient {
       }
     }
   }
+
+  public static async deleteConfigVersion(
+    walletAddress: string,
+    version: string,
+    cookieHeader: string
+  ): Promise<ApiResponse> {
+    const wa = encodeURIComponent(walletAddress)
+    const response = await axios.delete(`${apiUrl}tools/${wa}/${version}`, {
+      httpsAgent,
+      withCredentials: true,
+      headers: {
+        Cookie: cookieHeader
+      }
+    })
+
+    if (response.status === 200) {
+      return {
+        isFailure: false,
+        payload: response.data
+      }
+    } else {
+      return {
+        errors: [`status ${response.status}: ${response.statusText}`],
+        isFailure: true
+      }
+    }
+  }
 }

frontend/app/routes/create.$type.tsx

@@ -162,20 +162,10 @@ export default function Create() {
 
   const onConfirmRemove = () => {
     if (fullConfig) {
-      const { [selectedVersion]: _, ...rest } = fullConfig
-      setFullConfig(rest)
-      const config = fullConfig['default']
-      setToolConfig(config)
-
-      const filteredOptions = versionOptions.filter(
-        (ver) => ver.value != selectedVersion
-      )
-      setVersionOptions(filteredOptions)
-      setSelectedVersion('default')
-      setModalOpen(undefined)
-
-      const formData = getFormData(rest, 'remove', 'default')
+      // only create and submit form data
+      const formData = getFormData(fullConfig, 'remove', selectedVersion)
       submitForm(formData, { method: 'post' })
+      setModalOpen(undefined)
     }
   }
 
@@ -243,30 +233,29 @@ export default function Create() {
   useEffect(() => {
     const errors = Object.keys(response?.errors?.fieldErrors || {})
 
-    if (response && !errors.length && response.displayScript) {
-      setModalOpen('script')
-    } else if (response && response.grantRequired) {
-      setModalOpen('wallet-ownership')
-    } else if (
-      response &&
-      response.apiResponse &&
-      response.apiResponse.newversion
-    ) {
-      const newVersion = response.apiResponse.newversion
-      const userFullconfig = response.apiResponse?.payload
-
-      setConfigs(userFullconfig, newVersion)
-      setModalOpen('info')
-    } else if (
-      response &&
-      response.apiResponse &&
-      response.apiResponse.isFailure == false
-    ) {
-      setConfigs(response.apiResponse?.payload, 'default')
-
-      setModalOpen(undefined)
-      if (response.intent != 'remove') {
-        setModalOpen('info')
+    if (response && !errors.length) {
+      if (response.displayScript) {
+        setModalOpen('script')
+      } else if (response.grantRequired) {
+        setModalOpen('wallet-ownership')
+      } else if (response.apiResponse?.isFailure === false) {
+        if (response.intent === 'remove') {
+          // update state only after successful deletion
+          const { [selectedVersion]: _, ...rest } = fullConfig || {}
+          setFullConfig(rest)
+          setToolConfig(rest['default'])
+
+          const filteredOptions = versionOptions.filter(
+            (ver) => ver.value !== selectedVersion
+          )
+          setVersionOptions(filteredOptions)
+          setSelectedVersion('default')
+        } else {
+          setConfigs(response.apiResponse?.payload, 'default')
+          if (response.intent !== 'remove') {
+            setModalOpen('info')
+          }
+        }
       }
     }
   }, [response])
@@ -510,6 +499,20 @@ export async function action({ request, params }: ActionFunctionArgs) {
     )
     apiResponse.newversion = versionName
 
+    actionResponse.apiResponse = apiResponse
+    return json(actionResponse, {
+      status: 200,
+      headers: {
+        'Set-Cookie': await commitSession(session)
+      }
+    })
+  } else if (intent === 'remove') {
+    apiResponse = await ApiClient.deleteConfigVersion(
+      payload.walletAddress,
+      payload.version,
+      theCookie || ''
+    )
+
     actionResponse.apiResponse = apiResponse
     return json(actionResponse, {
       status: 200,