merge conflicts

petrsvihlik · Feb 24, 2024 · 47f711e · 47f711e
1 parent 2fb2d11
commit 47f711e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/WopiHost.Core/Controllers/FilesController.cs b/src/WopiHost.Core/Controllers/FilesController.cs
@@ -158,6 +158,7 @@ public async Task<IActionResult> PutFile(string id)
     [HttpPost("{id}"), WopiOverrideHeader(["PUT_RELATIVE"])]
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
     public async Task<IActionResult> PutRelativeFile(string id) => throw new NotImplementedException($"{nameof(PutRelativeFile)} is not implemented yet.");
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
 
     /// <summary>
     /// Changes the contents of the file in accordance with [MS-FSSHTTP].

diff --git a/src/WopiHost.Core/Controllers/WopiBootstrapperController.cs b/src/WopiHost.Core/Controllers/WopiBootstrapperController.cs
@@ -108,5 +108,6 @@ private bool ValidateAuthorizationHeader(StringValues authorizationHeader)
     {
         //TODO: implement header validation https://learn.microsoft.com/en-us/microsoft-365/cloud-storage-partner-program/rest/bootstrapper/getrootcontainer#sample-response
         // http://stackoverflow.com/questions/31948426/oauth-bearer-token-authentication-is-not-passing-signature-validation
-        true;
+        return true;
+    }
 }