Merge pull request #962 from open-dynaMIX/dep_updates

chore: update dependencies
adfinis · Nov 3, 2023 · b5178db · b5178db
2 parents 4660304 + 9cc0466
commit b5178db
Show file tree

Hide file tree

Showing 5 changed files with 717 additions and 643 deletions.
diff --git a/api/mysagw/case/tests/__snapshots__/test_case_views.ambr b/api/mysagw/case/tests/__snapshots__/test_case_views.ambr
diff --git a/api/mysagw/pdf_utils.py b/api/mysagw/pdf_utils.py
@@ -3,7 +3,7 @@
 import requests
 from django.conf import settings
 from pypdf import PdfWriter
-from pypdf.errors import DependencyError, PdfReadError
+from pypdf.errors import FileNotDecryptedError, PdfReadError
 from reportlab.lib.pagesizes import A4, mm
 from reportlab.lib.utils import ImageReader
 from reportlab.pdfgen import canvas
@@ -78,16 +78,15 @@ def add_caluma_files_to_pdf(pdf, urls):
     for file in prepare_files_for_merge(files):
         try:
             merger.append(file)
-        except PdfReadError:  # pragma: no cover
-            ## faulty pdf
-            pass
-        except DependencyError as e:
+        except FileNotDecryptedError as e:
             # we don't support AES encrypted PDFs
             if (
-                not e.args
-                or not e.args[0] == "PyCryptodome is required for AES algorithm"
+                not e.args or not e.args[0] == "File has not been decrypted"
             ):  # pragma: no cover
                 raise
+        except PdfReadError:  # pragma: no cover
+            ## faulty pdf
+            pass
 
     result = io.BytesIO()
 

diff --git a/api/mysagw/test_files/test_encrypted.pdf b/api/mysagw/test_files/test_encrypted.pdf