fix: ensure cleanup of stored files

src/lib/storage/jobs/helpers/deleteOldUploads.ts

@@ -1,4 +1,5 @@
 import { Knex } from 'knex';
+import Uploads from '../../../../schemas/public/Uploads';
 import Users from '../../../../schemas/public/Users';
 
 import { TIME_21_MINUTES_AS_SECONDS } from '../../../constants';
@@ -25,4 +26,19 @@ export default async function deleteOldUploads(db: Knex) {
     await storage.deleteWith(upload.key);
     await db('uploads').delete().where('key', upload.key);
   }
+
+  const files = await storage.getContents();
+  const query = await db.raw(`
+    SELECT up.key FROM users u JOIN uploads up ON u.id = up.owner WHERE u.patreon = true;
+  `);
+
+  const anonUploads = query.rows as Uploads[];
+  const nonPatreonFiles =
+    files?.filter((f) => f.Key && anonUploads.find((up) => up.key !== f.Key)) ||
+    [];
+  for (const no of nonPatreonFiles) {
+    if (no.Key) {
+      storage.deleteWith(no.Key);
+    }
+  }
 }

src/middleware/RequireAllowedOrigin.ts

@@ -1,6 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 
 import { ALLOWED_ORIGINS } from '../lib/constants';
+import { addUserFieldsToResponse } from './addUserFieldsToRespone';
 
 const RequireAllowedOrigin = async (
   req: Request,
@@ -18,6 +19,9 @@ const RequireAllowedOrigin = async (
   }
   console.info(`permitted access to ${origin}`);
   res.set('Access-Control-Allow-Origin', origin);
+
+  await addUserFieldsToResponse(req, res);
+
   return next();
 };
 

src/middleware/addUserFieldsToRespone.ts

@@ -0,0 +1,16 @@
+import { Request, Response } from 'express';
+import TokenHandler from '../lib/misc/TokenHandler';
+
+export const addUserFieldsToResponse = async (req: Request, res: Response) => {
+  if (!req.cookies.token) {
+    return;
+  }
+
+  const user = await TokenHandler.GetUserFrom(req.cookies.token);
+  if (!user) {
+    return res.redirect('/login#login');
+  }
+
+  res.locals.owner = user.owner;
+  res.locals.patreon = user.patreon;
+};

src/server.ts

@@ -29,7 +29,7 @@ import DB from './lib/storage/db';
 import KnexConfig from './KnexConfig';
 import TokenHandler from './lib/misc/TokenHandler';
 import CrashReporter from './lib/CrashReporter';
-import { ScheduleCleanup } from './lib/storage/jobs/JobHandler';
+import { ScheduleCleanup } from './lib/storage/jobs/ScheduleCleanup';
 import RequireAuthentication from './middleware/RequireAuthentication';
 import { Knex } from 'knex';
 import { sendError } from './lib/error/sendError';