From 47f711ec57276b64a226dee7a61859ae114ea423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0vihl=C3=ADk?= Date: Sat, 24 Feb 2024 17:21:15 +0100 Subject: [PATCH] merge conflicts --- src/WopiHost.Core/Controllers/FilesController.cs | 1 + src/WopiHost.Core/Controllers/WopiBootstrapperController.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/WopiHost.Core/Controllers/FilesController.cs b/src/WopiHost.Core/Controllers/FilesController.cs index ab50d0e..c759875 100644 --- a/src/WopiHost.Core/Controllers/FilesController.cs +++ b/src/WopiHost.Core/Controllers/FilesController.cs @@ -158,6 +158,7 @@ public async Task PutFile(string id) [HttpPost("{id}"), WopiOverrideHeader(["PUT_RELATIVE"])] #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously public async Task 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 /// /// 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 index d75e878..7fb5732 100644 --- 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; + } }