cors fixed; signature extraction fixed;

Author: Rajat Saxena

apps/api/src/media/handlers.ts

@@ -16,6 +16,7 @@ import { Request } from "express";
 import mediaService from "./service";
 import { getMediaCount as getCount, getTotalSpace } from "./queries";
 import { getSubscriptionStatus } from "@medialit/models";
+import { getSignatureFromReq } from "../signature/utils";
 
 function validateUploadOptions(req: Request): Joi.ValidationResult {
     const uploadSchema = Joi.object({
@@ -69,7 +70,7 @@ export async function uploadMedia(
             access,
             caption,
             group,
-            signature: req.query.signature,
+            signature: getSignatureFromReq(req),
         });
 
         const media = await mediaService.getMediaDetails({

apps/api/src/media/routes.ts

@@ -16,9 +16,11 @@ import {
 } from "./handlers";
 import signatureMiddleware from "../signature/middleware";
 import storage from "./storage-middleware";
+import { getSignatureFromReq } from "../signature/utils";
 
 const router = express.Router();
 
+router.options("/create", cors());
 router.post(
     "/create",
     cors(),
@@ -31,10 +33,7 @@ router.post(
         },
     }),
     (req: Request, res: Response, next: (...args: any[]) => void) => {
-        const signature =
-            req.query.signature ||
-            req.headers["x-medialit-signature"] ||
-            req.headers["X-Medialit-Signature"];
+        const signature = getSignatureFromReq(req);
         if (signature) {
             signatureMiddleware(
                 req as Request & { user: any; apikey: string },

apps/api/src/signature/middleware.ts

@@ -1,16 +1,14 @@
 import { Request, Response } from "express";
 import { PRESIGNED_URL_INVALID } from "../config/strings";
 import * as preSignedUrlService from "./service";
+import { getSignatureFromReq } from "./utils";
 
 export default async function signature(
     req: Request & { user?: any; apikey?: string },
     res: Response,
     next: (...args: any[]) => void,
 ) {
-    const signature =
-        req.query.signature ||
-        req.headers["x-medialit-signature"] ||
-        req.headers["X-Medialit-Signature"];
+    const signature = getSignatureFromReq(req);
 
     const response = await preSignedUrlService.getUserAndGroupFromPresignedUrl(
         signature as string,

apps/api/src/signature/utils.ts

@@ -0,0 +1,7 @@
+export function getSignatureFromReq(req: any) {
+    return (
+        req.query.signature ||
+        req.headers["x-medialit-signature"] ||
+        req.headers["X-Medialit-Signature"]
+    );
+}

apps/api/src/tus/routes.ts

@@ -4,6 +4,6 @@ import { server } from "./tus-server";
 
 const router = express.Router();
 
-router.all("/create/resumable{*splat}", cors(), server.handle.bind(server));
+router.all("/create/resumable*", cors(), server.handle.bind(server));
 
 export default router;