From 66ffa7ca736dc9d826660085dbfce700f7fcc061 Mon Sep 17 00:00:00 2001 From: Kieran Date: Sat, 26 Feb 2022 22:57:42 +0000 Subject: [PATCH] Fix upload bug --- VoidCat/Controllers/UploadController.cs | 2 +- VoidCat/Program.cs | 2 +- VoidCat/spa/src/FileUpload.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VoidCat/Controllers/UploadController.cs b/VoidCat/Controllers/UploadController.cs index 582f08f..57414e1 100644 --- a/VoidCat/Controllers/UploadController.cs +++ b/VoidCat/Controllers/UploadController.cs @@ -71,7 +71,7 @@ namespace VoidCat.Controllers var digest = Request.Headers.GetHeader("V-Digest"); var vf = await _storage.Ingress(new(Request.Body, fileInfo.Metadata, digest!) { - EditSecret = editSecret?.FromBase58Guid(), + EditSecret = editSecret?.FromBase58Guid() ?? Guid.Empty, Id = gid }, HttpContext.RequestAborted); diff --git a/VoidCat/Program.cs b/VoidCat/Program.cs index 0073db8..c3586f6 100644 --- a/VoidCat/Program.cs +++ b/VoidCat/Program.cs @@ -46,7 +46,7 @@ services.AddCors(opt => { p.AllowCredentials() .AllowAnyMethod() - .WithHeaders("V-Content-Type", "V-Filename", "V-Digest", "Content-Type", "Authorization") + .WithHeaders("V-Content-Type", "V-Filename", "V-Digest", "V-EditSecret", "Content-Type", "Authorization") .WithOrigins(voidSettings.CorsOrigins.Select(a => a.OriginalString).ToArray()); }); }); diff --git a/VoidCat/spa/src/FileUpload.js b/VoidCat/spa/src/FileUpload.js index ca164b2..071f016 100644 --- a/VoidCat/spa/src/FileUpload.js +++ b/VoidCat/spa/src/FileUpload.js @@ -138,7 +138,7 @@ export function FileUpload(props) { for (let s = 0; s < segments; s++) { let offset = s * UploadSize; let slice = props.file.slice(offset, offset + UploadSize, props.file.type); - xhr = await xhrSegment(await slice.arrayBuffer(), xhr?.file?.id, xhr?.file?.editSecret); + xhr = await xhrSegment(await slice.arrayBuffer(), xhr?.file?.id, xhr?.file?.metadata?.editSecret); if (!xhr.ok) { break; }