diff --git a/BTCPayServer.Client/BTCPayServer.Client.csproj b/BTCPayServer.Client/BTCPayServer.Client.csproj index 787bb9f12..c0b6b4e20 100644 --- a/BTCPayServer.Client/BTCPayServer.Client.csproj +++ b/BTCPayServer.Client/BTCPayServer.Client.csproj @@ -29,7 +29,7 @@ - + diff --git a/BTCPayServer.Common/BTCPayServer.Common.csproj b/BTCPayServer.Common/BTCPayServer.Common.csproj index 9838d056f..53ebecf8d 100644 --- a/BTCPayServer.Common/BTCPayServer.Common.csproj +++ b/BTCPayServer.Common/BTCPayServer.Common.csproj @@ -4,7 +4,8 @@ - + + diff --git a/BTCPayServer.Rating/BTCPayServer.Rating.csproj b/BTCPayServer.Rating/BTCPayServer.Rating.csproj index 80bde067c..db04e4716 100644 --- a/BTCPayServer.Rating/BTCPayServer.Rating.csproj +++ b/BTCPayServer.Rating/BTCPayServer.Rating.csproj @@ -6,7 +6,7 @@ - + diff --git a/BTCPayServer.Tests/docker-compose.altcoins.yml b/BTCPayServer.Tests/docker-compose.altcoins.yml index fc5ca2292..a9f553166 100644 --- a/BTCPayServer.Tests/docker-compose.altcoins.yml +++ b/BTCPayServer.Tests/docker-compose.altcoins.yml @@ -71,7 +71,7 @@ services: - "sshd_datadir:/root/.ssh" devlnd: - image: btcpayserver/bitcoin:22.0 + image: btcpayserver/bitcoin:23.0-1 environment: BITCOIN_NETWORK: regtest BITCOIN_WALLETDIR: "/data/wallets" @@ -90,7 +90,7 @@ services: expose: - "4444" nbxplorer: - image: nicolasdorier/nbxplorer:2.3.14 + image: nicolasdorier/nbxplorer:2.3.40 restart: unless-stopped ports: - "32838:32838" @@ -126,7 +126,7 @@ services: bitcoind: restart: unless-stopped - image: btcpayserver/bitcoin:22.0 + image: btcpayserver/bitcoin:23.0-1 environment: BITCOIN_NETWORK: regtest BITCOIN_WALLETDIR: "/data/wallets" diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index 4a1d20968..b58aa276c 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -68,7 +68,7 @@ services: - "sshd_datadir:/root/.ssh" devlnd: - image: btcpayserver/bitcoin:22.0 + image: btcpayserver/bitcoin:23.0-1 environment: BITCOIN_NETWORK: regtest BITCOIN_WALLETDIR: "/data/wallets" @@ -87,7 +87,7 @@ services: expose: - "4444" nbxplorer: - image: nicolasdorier/nbxplorer:2.3.14 + image: nicolasdorier/nbxplorer:2.3.40 restart: unless-stopped ports: - "32838:32838" @@ -113,7 +113,7 @@ services: bitcoind: restart: unless-stopped - image: btcpayserver/bitcoin:22.0 + image: btcpayserver/bitcoin:23.0-1 environment: BITCOIN_NETWORK: regtest BITCOIN_WALLETDIR: "/data/wallets" diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index e07469b22..ea9280e61 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -48,7 +48,7 @@ - + @@ -72,7 +72,6 @@ - diff --git a/BTCPayServer/Controllers/UIStoresController.cs b/BTCPayServer/Controllers/UIStoresController.cs index 62a7eb578..514246d44 100644 --- a/BTCPayServer/Controllers/UIStoresController.cs +++ b/BTCPayServer/Controllers/UIStoresController.cs @@ -646,6 +646,8 @@ namespace BTCPayServer.Controllers if (model.LogoFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture)) { var userId = GetUserId(); + if (userId is null) + return NotFound(); // delete existing image if (!string.IsNullOrEmpty(blob.LogoFileId))