Store on delete in all cases

Fixes: #85

src/routes/source.js

@@ -14,7 +14,6 @@ import putObject from '../storage/object/put.js';
 import deleteObjects from '../storage/object/delete.js';
 
 import putHelper from '../helpers/source.js';
-import { postObjectVersion } from '../storage/version/put.js';
 
 async function invalidateCollab(api, url, env) {
   const invPath = `/api/v1/${api}?doc=${url}`;
@@ -24,16 +23,9 @@ async function invalidateCollab(api, url, env) {
   await env.dacollab.fetch(invURL);
 }
 
-export async function deleteSource({ req, env, daCtx }) {
-  await postObjectVersion(req, env, daCtx);
+export async function deleteSource({ env, daCtx }) {
   const resp = await deleteObjects(env, daCtx);
 
-  if (resp.status === 204) {
-    const initiator = req.headers.get('x-da-initiator');
-    if (initiator !== 'collab') {
-      await invalidateCollab('deleteadmin', req.url, env);
-    }
-  }
   return resp;
 }
 

src/storage/object/delete.js

@@ -17,6 +17,7 @@ import {
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 import getS3Config from '../utils/config.js';
+import { postObjectVersion } from '../version/put.js';
 
 function buildInput(org, key) {
   return {
@@ -25,16 +26,35 @@ function buildInput(org, key) {
   };
 }
 
-export async function deleteObject(client, org, Key) {
+async function invalidateCollab(api, url, env) {
+  const invPath = `/api/v1/${api}?doc=${url}`;
+
+  // Use dacollab service binding, hostname is not relevant
+  const invURL = `https://localhost${invPath}`;
+  await env.dacollab.fetch(invURL);
+}
+
+export async function deleteObject(client, daCtx, Key, env) {
+  if (Key.endsWith('.html')) {
+    await postObjectVersion('Deleted', env, daCtx);
+  }
+
+  let resp;
   try {
-    const delCommand = new DeleteObjectCommand({ Bucket: `${org}-content`, Key });
+    const delCommand = new DeleteObjectCommand({ Bucket: `${daCtx.org}-content`, Key });
     const url = await getSignedUrl(client, delCommand, { expiresIn: 3600 });
-    return fetch(url, { method: 'DELETE' });
+    resp = fetch(url, { method: 'DELETE' });
   } catch (e) {
     // eslint-disable-next-line no-console
     console.log(`There was an error deleting ${Key}.`);
     return e;
   }
+
+  if (Key.endsWith('.html')) {
+    await invalidateCollab('deleteadmin', `${daCtx.origin}/source/${daCtx.org}/${Key}`, env);
+  }
+
+  return resp;
 }
 
 export default async function deleteObjects(env, daCtx) {
@@ -59,7 +79,7 @@ export default async function deleteObjects(env, daCtx) {
       await Promise.all(
         new Array(1).fill(null).map(async () => {
           while (sourceKeys.length) {
-            await deleteObject(client, daCtx.org, sourceKeys.pop());
+            await deleteObject(client, daCtx, sourceKeys.pop(), env);
           }
         }),
       );

src/storage/object/move.js

@@ -71,7 +71,7 @@ export default async function moveObject(env, daCtx, details) {
         const copied = await copyFile(client, daCtx.org, key, details);
         // Only delete the source if the file was successfully copied
         if (copied.$metadata.httpStatusCode === 200) {
-          const deleted = await deleteObject(client, daCtx.org, key);
+          const deleted = await deleteObject(client, daCtx, key, env);
           result.status = deleted.status === 204 ? 204 : deleted.status;
         } else {
           result.status = copied.$metadata.httpStatusCode;

src/utils/daCtx.js

@@ -41,6 +41,7 @@ export default async function getDaCtx(req, env) {
     org,
     users,
     fullKey,
+    origin: new URL(req.url).origin,
   };
 
   // Get org properties