From 926b60df3da79d11543734e128acf1f5f5d40d32 Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Thu, 21 Oct 2021 15:02:25 +0200
Subject: [PATCH] Fix camera scanner CSP issue

---
 BTCPayServer/Views/Shared/CameraScanner.cshtml     | 5 +++++
 BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BTCPayServer/Views/Shared/CameraScanner.cshtml b/BTCPayServer/Views/Shared/CameraScanner.cshtml
index 07b5e7095..cc20b4cd6 100644
--- a/BTCPayServer/Views/Shared/CameraScanner.cshtml
+++ b/BTCPayServer/Views/Shared/CameraScanner.cshtml
@@ -1,3 +1,8 @@
+@inject BTCPayServer.Security.ContentSecurityPolicies csp
+@{
+    csp.Add("worker-src", "blob:");
+}
+
 <template id="camera-qr-scanner-wrap">
 	<div v-if="modalId" :id="modalId" class="modal fade" data-bs-backdrop="static">
 		<div class="modal-dialog" role="document">
diff --git a/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml b/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml
index a37afa362..ee5fed499 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml
@@ -69,7 +69,7 @@
     <bundle name="wwwroot/bundles/camera-bundle.min.js"></bundle>
     <script>
         window.coinName = "@Model.Network.DisplayName.ToLowerInvariant()";
-        window.addEventListener("load", async () => {
+        document.addEventListener("DOMContentLoaded", function () {
             initCameraScanningApp("Scan wallet QR", data => {
                 document.getElementById("WalletFileContent").value = data;
                 document.getElementById("qr-import-form").submit();