Fix up deletions

Author: daniellrgn

server/db.ts

@@ -71,6 +71,9 @@ export const DbLinks = {
     db.query(`UPDATE shlink set active=false where id=?`, [shl.id]);
     return true;
   },
+  linkExists(linkId: string): boolean {
+    return Boolean(db.query(`SELECT * from shlink where id=?`, [linkId]));
+  },
   getManagedShl(linkId: string, managementToken: string): types.HealthLink {
     const linkRow = db
       .prepareQuery(`SELECT * from shlink where id=? and management_token=?`)
@@ -119,15 +122,14 @@ export const DbLinks = {
 
     return hashEncoded;
   },
-  async deleteFile(linkId: string, file: types.HealthLinkFile): Promise<string> {
-    const hash = await crypto.subtle.digest('SHA-256', file.content);
+  async deleteFile(linkId: string, content: Uint8Array) {
+    const hash = await crypto.subtle.digest('SHA-256', content);
     const hashEncoded = base64url.encode(hash);
 
     db.query(
-      `delete from shlink_file where shlink = :linkId and content_type = :content and content_hash = :hashEncoded`,
+      `delete from shlink_file where shlink = :linkId and content_hash = :hashEncoded`,
       {
         linkId,
-        content: file.content,
         hashEncoded,
       }
     );
@@ -137,6 +139,8 @@ export const DbLinks = {
     //   hashEncoded,
     //   content: file.content,
     // });
+
+    return true;
   },
   async addEndpoint(linkId: string, endpoint: types.HealthLinkEndpoint): Promise<string> {
     const id = randomStringWithEntropy(32);

server/routers/api.ts

@@ -161,12 +161,7 @@ export const shlApiRouter = new oak.Router()
       throw new Error(`Can't manage SHLink ` + context.params.shlId);
     }
 
-    const fileToRemove = {
-      contentType: context.request.headers.get('content-type')!,
-      content: await currentFileBody.value,
-    }
-
-    const deleted = db.DbLinks.deleteFile(shl.id, fileToRemove);
+    const deleted = db.DbLinks.deleteFile(shl.id, await currentFileBody.value);
     context.response.body = {
       ...shl,
       deleted,
@@ -190,12 +185,16 @@ export const shlApiRouter = new oak.Router()
   })
   .delete('/shl/:shlId', async (context) => {
     const managementToken = await context.request.headers.get('authorization')?.split(/bearer /i)[1]!;
-    const shl = db.DbLinks.getManagedShl(context.params.shlId, managementToken)!;
-    if (!shl) {
-      throw new Error(`Can't manage SHLink ` + context.params.shlId);
+    if (db.DbLinks.linkExists(context.params.shlId)) {
+      const shl = db.DbLinks.getManagedShl(context.params.shlId, managementToken)!;
+      if (!shl) {
+        return (context.response.status = 401);
+      }
+      const deactivated = db.DbLinks.deactivate(shl);
+      context.response.body = deactivated;
+    } else {
+      return (context.response.status = 404);
     }
-    const deactivated = db.DbLinks.deactivate(shl);
-    context.response.body = deactivated;
   })
   .post('/subscribe', async (context) => {
     const shlSet: { shlId: string; managementToken: string }[] = await context.request.body({ type: 'json' }).value;