final change

Delete old comments as part of new execution,remove reactions
gitignore for configs
2025-07-11 13:13:15 +01:00 · 2025-07-11 13:00:39 +01:00 · 2025-07-11 12:50:00 +01:00 · 2025-07-11 12:45:47 +01:00 · 2025-07-11 12:33:40 +01:00 · 2025-07-11 12:31:37 +01:00
1803 changed files with 22061 additions and 96045 deletions
@@ -5,18 +5,8 @@
      "Bash(mkdir:*)",
      "Bash(./gradlew:*)",
      "Bash(grep:*)",
-      "Bash(cat:*)",
-      "Bash(find:*)",
-      "Bash(npm test)",
-      "Bash(npm test:*)",
-      "Bash(ls:*)",
-      "Bash(npx tsc:*)",
-      "Bash(node:*)",
-      "Bash(npm run dev:*)",
-      "Bash(sed:*)",
-      "Bash(npm run typecheck:*)"
+      "Bash(cat:*)"
    ],
-    "deny": [],
-    "defaultMode": "acceptEdits"
+    "deny": []
  }
 }
@@ -49,7 +49,7 @@
                "java.configuration.updateBuildConfiguration": "interactive",
                "java.format.enabled": true,
                "java.format.settings.profile": "GoogleStyle",
-                "java.format.settings.google.version": "1.28.0",
+                "java.format.settings.google.version": "1.26.0",
                "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
                "java.saveActions.cleanup": true,
                "java.cleanup.actions": [
@@ -79,17 +79,9 @@
                    ".venv*/",
                    ".vscode/",
                    "bin/",
-                    "app/core/bin/",
-                    "app/common/bin/",
-                    "app/proprietary/bin/",
                    "build/",
-                    "app/core/build/",
-                    "app/common/build/",
-                    "app/proprietary/build/",
                    "configs/",
-                    "app/core/configs/",
                    "customFiles/",
-                    "app/core/customFiles/",
                    "docs/",
                    "exampleYmlFiles",
                    "gradle/",
@@ -101,9 +93,6 @@
                    ".git-blame-ignore-revs",
                    ".gitattributes",
                    ".gitignore",
-                    "app/core/.gitignore",
-                    "app/common/.gitignore",
-                    "app/proprietary/.gitignore",
                    ".pre-commit-config.yaml"
                ],
                "java.signatureHelp.enabled": true,
@@ -130,9 +119,7 @@
                "EditorConfig.EditorConfig", // EditorConfig support for maintaining consistent coding styles
                "ms-azuretools.vscode-docker", // Docker extension for Visual Studio Code
                "charliermarsh.ruff", // Ruff extension for Ruff language support
-                "github.vscode-github-actions", // GitHub Actions extension for Visual Studio Code
-                "stylelint.vscode-stylelint", // Stylelint extension for CSS and SCSS linting
-                "redhat.vscode-yaml" // YAML extension for Visual Studio Code
+                "github.vscode-github-actions" // GitHub Actions extension for Visual Studio Code
            ]
        }
    },
@@ -24,19 +24,25 @@ indent_size = 2
 insert_final_newline = false
 trim_trailing_whitespace = false

-[{*.js,*.jsx,*.mjs,*.ts,*.tsx}]
+[*.js]
 indent_size = 2

 [*.css]
 # CSS files typically use an indent size of 2 spaces for better readability and alignment with community standards.
 indent_size = 2

-[*.{yml,yaml}]
+[*.yaml]
 # YAML files use an indent size of 2 spaces to maintain consistency with common YAML formatting practices.
 indent_size = 2
 insert_final_newline = false
 trim_trailing_whitespace = false

+[*.yml]
+# YML files follow the same conventions as YAML files, using an indent size of 2 spaces.
+indent_size = 2
+insert_final_newline = false
+trim_trailing_whitespace = false
+
 [*.json]
 # JSON files use an indent size of 2 spaces, which is the standard for JSON formatting.
 indent_size = 2
@@ -1,9 +1,5 @@
 # Formatting
 5f771b785130154ed47952635b7acef371ffe0ec
-7fa5e130d99227c2202ebddfdd91348176ec0c7b
-14d4fbb2a36195eedb034785e5a5ff6a47f268c6
-ee8030c1c4148062cde15c49c67d04ef03930c55
-fcd41924f5f261febfa9d9a92994671f3ebc97d6

 # Normalize files
 55d4fda01b2f39f5b7d7b4fda5214bd7ff0fd5dd
@@ -1,10 +1,10 @@
 * text=auto eol=lf

 # Ignore all JavaScript files in a directory
-app/core/src/main/resources/static/pdfjs/* linguist-vendored
-app/core/src/main/resources/static/pdfjs/** linguist-vendored
-app/core/src/main/resources/static/pdfjs-legacy/* linguist-vendored
-app/core/src/main/resources/static/pdfjs-legacy/** linguist-vendored
-app/core/src/main/resources/static/css/bootstrap-icons.css linguist-vendored
-app/core/src/main/resources/static/css/bootstrap.min.css linguist-vendored
-app/core/src/main/resources/static/css/fonts/* linguist-vendored
+stirling-pdf/src/main/resources/static/pdfjs/* linguist-vendored
+stirling-pdf/src/main/resources/static/pdfjs/** linguist-vendored
+stirling-pdf/src/main/resources/static/pdfjs-legacy/* linguist-vendored
+stirling-pdf/src/main/resources/static/pdfjs-legacy/** linguist-vendored
+stirling-pdf/src/main/resources/static/css/bootstrap-icons.css linguist-vendored
+stirling-pdf/src/main/resources/static/css/bootstrap.min.css linguist-vendored
+stirling-pdf/src/main/resources/static/css/fonts/* linguist-vendored
@@ -1,21 +1,2 @@
-# All PRs must be approved by Frooodle or Ludy87
-* @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
-
-# Backend
-/app/** @DarioGii @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
-
-#V1 frontend
-/app/core/src/main/resources/static/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-/app/core/src/main/resources/templates/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-
-#V2 frontend
-/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle
-
-#V2 docker
-/docker/backend/** @Frooodle @Ludy87 @DarioGii @Ludy87
-/docker/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
-/docker/compose/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
-
-
-#GHA (All users)
-/.github/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
+# All PRs to V1 must be approved by Frooodle
+* @Frooodle @reecebrowne @Ludy87 @DarioGii @ConnorYoh
@@ -1,31 +0,0 @@
-build: &build
-  - build.gradle
-  - app/(common|core|proprietary)/build.gradle
-
-app: &app
-  - app/(common|core|proprietary)/src/main/java/**
-
-openapi: &openapi
-  - build.gradle
-  - app/(common|core|proprietary)/build.gradle
-  - app/(common|core|proprietary)/src/main/java/**
-
-project: &project
-  - app/(common|core|proprietary)/src/(main|test)/java/**
-  - app/(common|core|proprietary)/build.gradle
-  - 'app/(common|core|proprietary)/src/(main|test)/resources/**/!(messages_*.properties|*.md)*'
-  - exampleYmlFiles/**
-  - gradle/**
-  - libs/**
-  - testing/**
-  - build.gradle
-  - Dockerfile
-  - Dockerfile.fat
-  - Dockerfile.ultra-lite
-  - gradle.properties
-  - gradlew
-  - gradlew.bat
-  - launch4jConfig.xml
-  - settings.gradle
-  - frontend/**
-  - docker/**
@@ -7,7 +7,6 @@
    "sbplat",
    "reecebrowne",
    "DarioGii",
-    "ConnorYoh",
-    "EthanHealy01"
+    "ConnorYoh"
  ]
 }
@@ -2,106 +2,88 @@ version: 1
 labels:

  - label: "Bugfix"
-    title: '^fix(\([^)]*\))?:|^fix:.*'
+    title: '^fix:.*'

  - label: "enhancement"
-    title: '^feat(\([^)]*\))?:|^feat:.*'
+    title: '^feat:.*'

  - label: "build"
-    title: '^build(\([^)]*\))?:|^build:.*'
+    title: '^build:.*'

  - label: "chore"
-    title: '^chore(\([^)]*\))?:|^chore:.*'
+    title: '^chore:.*'

  - label: "ci"
-    title: '^ci(\([^)]*\))?:|^ci:.*'
-
-  - label: "ci"
-    title: '^.*\(ci\):.*'
+    title: '^ci:.*'

  - label: "perf"
-    title: '^perf(\([^)]*\))?:|^perf:.*'
+    title: '^perf:.*'

  - label: "refactor"
-    title: '^refactor(\([^)]*\))?:|^refactor:.*'
+    title: '^refactor:.*'

  - label: "revert"
-    title: '^revert(\([^)]*\))?:|^revert:.*'
+    title: '^revert:.*'

  - label: "style"
-    title: '^style(\([^)]*\))?:|^style:.*'
+    title: '^style:.*'

  - label: "Documentation"
-    title: '^docs(\([^)]*\))?:|^docs:.*'
-
-  - label: "Documentation"
-    title: '^.*\(docs\):.*'
-
-  - label: "dependencies"
-    title: '^deps(\([^)]*\))?:|^deps:.*'
-
-  - label: "dependencies"
-    title: '^.*\(deps\):.*'
+    title: '^docs:.*'

  - label: 'API'
-    title: '.*openapi.*|.*swagger.*|.*api.*'
-
-  - label: 'v2'
-    base-branch: 'V2'
+    title: '.*openapi.*'

  - label: 'Translation'
    files:
-      - 'app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
+      - 'stirling-pdf/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties'
      - 'scripts/ignore_translation.toml'
-      - 'app/core/src/main/resources/templates/fragments/languages.html'
+      - 'stirling-pdf/src/main/resources/templates/fragments/languages.html'
      - '.github/scripts/check_language_properties.py'

  - label: 'Front End'
    files:
-      - 'app/core/src/main/resources/templates/.*'
-      - 'app/proprietary/src/main/resources/templates/.*'
-      - 'app/core/src/main/resources/static/.*'
-      - 'app/proprietary/src/main/resources/static/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/UI/.*'
-      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'
-      - 'frontend/**'
+      - 'stirling-pdf/src/main/resources/templates/.*'
+      - 'proprietary/src/main/resources/templates/.*'
+      - 'stirling-pdf/src/main/resources/static/.*'
+      - 'proprietary/src/main/resources/static/.*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/.*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/UI/.*'
+      - 'proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'

  - label: 'Java'
    files:
-      - 'app/common/src/main/java/.*.java'
-      - 'app/proprietary/src/main/java/.*.java'
-      - 'app/core/src/main/java/.*.java'
+      - 'common/src/main/java/.*.java'
+      - 'proprietary/src/main/java/.*.java'
+      - 'stirling-pdf/src/main/java/.*.java'

  - label: 'Back End'
    files:
-      - 'app/core/src/main/java/stirling/software/SPDF/config/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/.*'
-      - 'app/core/src/main/resources/settings.yml.template'
-      - 'app/core/src/main/resources/application.properties'
-      - 'app/core/src/main/resources/banner.txt'
-      - 'app/core/src/main/resources/static/python/png_to_webp.py'
-      - 'app/core/src/main/resources/static/python/split_photos.py'
-      - 'app/core/src/main/resources/static/pipeline/defaultWebUIConfigs/**'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/.*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/.*'
+      - 'stirling-pdf/src/main/resources/settings.yml.template'
+      - 'stirling-pdf/src/main/resources/application.properties'
+      - 'stirling-pdf/src/main/resources/banner.txt'
+      - 'scripts/png_to_webp.py'
+      - 'split_photos.py'
      - 'application.properties'

  - label: 'Security'
    files:
-      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/.*'
+      - 'proprietary/src/main/java/stirling/software/proprietary/security/.*'
      - 'scripts/download-security-jar.sh'
      - '.github/workflows/dependency-review.yml'
      - '.github/workflows/scorecards.yml'

  - label: 'API'
    files:
-      - 'app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-      - 'app/core/src/main/java/stirling/software/SPDF/controller/api/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/model/api/.*'
-      - 'app/core/src/main/java/stirling/software/SPDF/service/ApiDocService.java'
-      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/.*'
-      - 'app/core/src/main/resources/static/python/png_to_webp.py'
-      - 'app/core/src/main/resources/static/python/split_photos.py'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/.*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/model/api/.*'
+      - 'proprietary/src/main/java/stirling/software/proprietary/security/controller/api/.*'
+      - 'scripts/png_to_webp.py'
+      - 'split_photos.py'
      - '.github/workflows/swagger.yml'

  - label: 'Documentation'
@@ -124,7 +106,6 @@ labels:
      - 'scripts/installFonts.sh'
      - 'test.sh'
      - 'test2.sh'
-      - 'docker/**'

  - label: 'Devtools'
    files:
@@ -134,14 +115,13 @@ labels:
      - '.editorconfig'
      - '.pre-commit-config'
      - '.github/workflows/pre_commit.yml'
-      - 'devGuide/.*'
-      - 'devTools/.*'
+      - 'HowToAddNewLanguage.md'

  - label: 'Test'
    files:
-      - 'app/common/src/test/.*'
-      - 'app/proprietary/src/test/.*'
-      - 'app/core/src/test/.*'
+      - 'common/src/test/.*'
+      - 'proprietary/src/test/.*'
+      - 'stirling-pdf/src/test/.*'
      - 'testing/.*'
      - '.github/workflows/scorecards.yml'
      - 'exampleYmlFiles/test_cicd.yml'
@@ -157,6 +137,6 @@ labels:
      - 'gradlew.bat'
      - 'settings.gradle'
      - 'build.gradle'
-      - 'app/common/build.gradle'
-      - 'app/proprietary/build.gradle'
-      - 'app/core/build.gradle'
+      - 'common/build.gradle'
+      - 'proprietary/build.gradle'
+      - 'stirling-pdf/build.gradle'
@@ -0,0 +1,86 @@
+Translation:
+  - changed-files:
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/messages_*_*.properties'
+    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/templates/fragments/languages.html'
+
+Front End:
+  - changed-files:
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/templates/**/*'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/static/**/*'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/**'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/UI/**/*'
+
+Java:
+  - changed-files:
+    - any-glob-to-any-file: 'common/src/main/java/**/*.java'
+    - any-glob-to-any-file: 'proprietary/src/main/java/**/*.java'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/**/*.java'
+
+Back End:
+  - changed-files:
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/config/**/*'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/**/*'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/settings.yml.template'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/application.properties'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/resources/banner.txt'
+    - any-glob-to-any-file: 'scripts/png_to_webp.py'
+    - any-glob-to-any-file: 'split_photos.py'
+
+Security:
+  - changed-files:
+    - any-glob-to-any-file: 'proprietary/src/main/java/stirling/software/proprietary/security/**/*'
+    - any-glob-to-any-file: 'scripts/download-security-jar.sh'
+    - any-glob-to-any-file: '.github/workflows/dependency-review.yml'
+    - any-glob-to-any-file: '.github/workflows/scorecards.yml'
+
+API:
+  - changed-files:
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/**/*'
+    - any-glob-to-any-file: 'stirling-pdf/src/main/java/stirling/software/SPDF/model/api/**/*'
+    - any-glob-to-any-file: 'scripts/png_to_webp.py'
+    - any-glob-to-any-file: 'split_photos.py'
+    - any-glob-to-any-file: '.github/workflows/swagger.yml'
+
+Documentation:
+  - changed-files:
+    - any-glob-to-any-file: '**/*.md'
+    - any-glob-to-any-file: 'scripts/counter_translation.py'
+    - any-glob-to-any-file: 'scripts/ignore_translation.toml'
+
+Docker:
+  - changed-files:
+    - any-glob-to-any-file: '.github/workflows/build.yml'
+    - any-glob-to-any-file: '.github/workflows/push-docker.yml'
+    - any-glob-to-any-file: 'Dockerfile'
+    - any-glob-to-any-file: 'Dockerfile.fat'
+    - any-glob-to-any-file: 'Dockerfile.ultra-lite'
+    - any-glob-to-any-file: 'exampleYmlFiles/*.yml'
+    - any-glob-to-any-file: 'scripts/download-security-jar.sh'
+    - any-glob-to-any-file: 'scripts/init.sh'
+    - any-glob-to-any-file: 'scripts/init-without-ocr.sh'
+    - any-glob-to-any-file: 'scripts/installFonts.sh'
+    - any-glob-to-any-file: 'test.sh'
+    - any-glob-to-any-file: 'test2.sh'
+
+Devtools:
+  - changed-files:
+    - any-glob-to-any-file: '.devcontainer/**/*'
+    - any-glob-to-any-file: 'Dockerfile.dev'
+
+Test:
+  - changed-files:
+    - any-glob-to-any-file: 'cucumber/**/*'
+    - any-glob-to-any-file: 'common/src/test/**/*'
+    - any-glob-to-any-file: 'proprietary/src/test/**/*'
+    - any-glob-to-any-file: 'stirling-pdf/src/test/**/*'
+    - any-glob-to-any-file: 'src/testing/**/*'
+    - any-glob-to-any-file: '.pre-commit-config'
+    - any-glob-to-any-file: '.github/workflows/pre_commit.yml'
+    - any-glob-to-any-file: '.github/workflows/scorecards.yml'
+
+Github:
+  - changed-files:
+    - any-glob-to-any-file: '.github/**/*'
@@ -42,7 +42,6 @@
 - name: "Front End"
  color: "BBD2F1"
  description: "Issues or pull requests related to front-end development"
-  from_name: "frontend"
 - name: "github-actions"
  description: "Pull requests that update GitHub Actions code"
  color: "999999"
@@ -78,12 +77,10 @@
 - name: "Translation"
  color: "9FABF9"
  from_name: "translation"
-  description: "Issues or pull requests related to translation"
 - name: "upstream"
  color: "DEDEDE"
 - name: "v2"
  color: "FFFF00"
-  description: "Issues or pull requests related to the v2 branch"
 - name: "wontfix"
  description: "This will not be worked on"
  color: "FFFFFF"
@@ -178,9 +175,3 @@
  description: "This PR changes 1000+ lines ignoring generated files."
 - name: "to research"
  color: "FBCA04"
- name: "pr-deployed"
-  color: "00FF00"
-  description: "Pull request has been deployed to a test environment"
- name: "codex"
-  color: "ededed"
-  description: "chatgpt AI generated code"
@@ -1,6 +1,5 @@
 # Description of Changes

-<!--
 Please provide a summary of the changes, including:

 - What was changed
@@ -8,7 +7,6 @@ Please provide a summary of the changes, including:
 - Any challenges encountered

 Closes #(issue_number)
-->

 ---

@@ -17,15 +15,15 @@ Closes #(issue_number)
 ### General

 - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md) (if applicable)
- [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md) (if applicable)
+- [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable)
+- [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable)
 - [ ] I have performed a self-review of my own code
 - [ ] My changes generate no new warnings

 ### Documentation

 - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed)
- [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)
+- [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)

 ### UI Changes (if applicable)

@@ -33,4 +31,4 @@ Closes #(issue_number)

 ### Testing (if applicable)

- [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md#6-testing) for more details.
+- [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
@@ -197,7 +197,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
    if len(file_list) == 1:
        file_arr = file_list[0].split()
    base_dir = os.path.abspath(
-        os.path.join(os.getcwd(), "app", "core", "src", "main", "resources")
+        os.path.join(os.getcwd(), "stirling-pdf", "src", "main", "resources")
    )

    for file_path in file_arr:
@@ -219,14 +219,13 @@ def check_for_differences(reference_file, file_list, branch, actor):
                # only local windows command
                not file_normpath.startswith(
                    os.path.join(
-                        "", "app", "core", "src", "main", "resources", "messages_"
+                        "", "stirling-pdf", "src", "main", "resources", "messages_"
                    )
                )
                and not file_normpath.startswith(
                    os.path.join(
                        os.getcwd(),
-                        "app",
-                        "core",
+                        "stirling-pdf",
                        "src",
                        "main",
                        "resources",
@@ -329,7 +328,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
        report.append("## ❌ Overall Check Status: **_Failed_**")
        report.append("")
        report.append(
-            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/app/core/src/main/resources/messages_en_GB.properties)"
+            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/stirling-pdf/src/main/resources/messages_en_GB.properties)"
        )
    else:
        report.append("## ✅ Overall Check Status: **_Success_**")
@@ -390,8 +389,7 @@ if __name__ == "__main__":
            file_list = glob.glob(
                os.path.join(
                    os.getcwd(),
-                    "app",
-                    "core",
+                    "stirling-pdf",
                    "src",
                    "main",
                    "resources",
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_pre_commit.txt' --strip-extras '.github\scripts\requirements_pre_commit.in'
+#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_pre_commit.txt' '.github\scripts\requirements_pre_commit.in'
 #
 cfgv==3.4.0 \
    --hash=sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9 \
@@ -12,25 +12,25 @@ distlib==0.3.9 \
    --hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
    --hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
    # via virtualenv
-filelock==3.18.0 \
-    --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
-    --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
+filelock==3.16.1 \
+    --hash=sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0 \
+    --hash=sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435
    # via virtualenv
-identify==2.6.12 \
-    --hash=sha256:ad9672d5a72e0d2ff7c5c8809b62dfa60458626352fb0eb7b55e69bdc45334a2 \
-    --hash=sha256:d8de45749f1efb108badef65ee8386f0f7bb19a7f26185f74de6367bffbaf0e6
+identify==2.6.5 \
+    --hash=sha256:14181a47091eb75b337af4c23078c9d09225cd4c48929f521f3bf16b09d02566 \
+    --hash=sha256:c10b33f250e5bba374fae86fb57f3adcebf1161bce7cdf92031915fd480c13bc
    # via pre-commit
 nodeenv==1.9.1 \
    --hash=sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f \
    --hash=sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9
    # via pre-commit
-platformdirs==4.3.8 \
-    --hash=sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc \
-    --hash=sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4
+platformdirs==4.3.6 \
+    --hash=sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907 \
+    --hash=sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb
    # via virtualenv
-pre-commit==4.2.0 \
-    --hash=sha256:601283b9757afd87d40c4c4a9b2b5de9637a8ea02eaff7adc2d0fb4e04841146 \
-    --hash=sha256:a009ca7205f1eb497d10b845e52c838a98b6cdd2102a6c8e4540e94ee75c58bd
+pre-commit==4.0.1 \
+    --hash=sha256:80905ac375958c0444c65e9cebebd948b3cdb518f335a091a670a89d652139d2 \
+    --hash=sha256:efde913840816312445dc98787724647c65473daefe420785f885e8ed9a06878
    # via -r .github\scripts\requirements_pre_commit.in
 pyyaml==6.0.2 \
    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
@@ -87,7 +87,7 @@ pyyaml==6.0.2 \
    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
    # via pre-commit
-virtualenv==20.31.2 \
-    --hash=sha256:36efd0d9650ee985f0cad72065001e66d49a6f24eb44d98980f630686243cf11 \
-    --hash=sha256:e10c0a9d02835e592521be48b332b6caee6887f332c111aa79a09b9e79efc2af
+virtualenv==20.28.1 \
+    --hash=sha256:412773c85d4dab0409b83ec36f7a6499e72eaf08c80e81e9576bca61831c71cb \
+    --hash=sha256:5d34ab240fdb5d21549b76f9e8ff3af28252f5499fb6d6f031adac4e5a8c5329
    # via pre-commit
@@ -2,9 +2,9 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_sync_readme.txt' --strip-extras '.github\scripts\requirements_sync_readme.in'
+#    pip-compile --generate-hashes --output-file='.github\scripts\requirements_sync_readme.txt' '.github\scripts\requirements_sync_readme.in'
 #
-tomlkit==0.13.3 \
-    --hash=sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1 \
-    --hash=sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0
+tomlkit==0.13.2 \
+    --hash=sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde \
+    --hash=sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79
    # via -r .github\scripts\requirements_sync_readme.in
@@ -2,7 +2,7 @@ name: Auto PR V2 Deployment

 on:
  pull_request:
-    types: [opened, synchronize, reopened, closed]
+    types: [opened, synchronize, reopened]


 permissions:
@@ -12,7 +12,6 @@ permissions:

 jobs:
  check-pr:
-    if: github.event.action != 'closed'
    runs-on: ubuntu-latest
    outputs:
      should_deploy: ${{ steps.check-conditions.outputs.should_deploy }}
@@ -35,9 +34,8 @@ jobs:
          echo "PR Title: $PR_TITLE"
          echo "PR Author: $PR_AUTHOR"
          echo "PR Branch: $PR_BRANCH"
-          echo "PR Base Branch: ${{ github.event.pull_request.base.ref }}"
          
-          # Define authorized users
+          # Check if author is authorized
          authorized_users=(
            "Frooodle"
            "sf298"
@@ -47,11 +45,8 @@ jobs:
            "reecebrowne"
            "DarioGii"
            "ConnorYoh"
-            "EthanHealy01"
-            "jbrunton96"
          )
          
-          # Check if author is in the authorized list
          is_authorized=false
          for user in "${authorized_users[@]}"; do
            if [[ "$PR_AUTHOR" == "$user" ]]; then
@@ -60,26 +55,19 @@ jobs:
            fi
          done
          
-          # If PR is targeting V2 and user is authorized, deploy unconditionally
-          PR_BASE_BRANCH="${{ github.event.pull_request.base.ref }}"
-          if [[ "$PR_BASE_BRANCH" == "V2" && "$is_authorized" == "true" ]]; then
-            echo "✅ Deployment forced: PR targets V2 and author is authorized."
-            echo "should_deploy=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-          
-          # Otherwise, continue with original keyword checks
+          # Check if title contains V2/version2 keywords (case insensitive)
          has_v2_keyword=false
          if [[ "$PR_TITLE" =~ [Vv]2 ]] || [[ "$PR_TITLE" =~ [Vv]ersion.?2 ]] || [[ "$PR_TITLE" =~ [Vv]ersion.?[Tt]wo ]]; then
            has_v2_keyword=true
          fi
          
+          # Check if branch name contains V2 or react keywords (case insensitive)
          has_branch_keyword=false
          if [[ "$PR_BRANCH" =~ [Vv]2 ]] || [[ "$PR_BRANCH" =~ [Rr]eact ]]; then
            has_branch_keyword=true
          fi
          
-          if [[ "$is_authorized" == "true" && ( "$has_v2_keyword" == "true" || "$has_branch_keyword" == "true" ) ]]; then
+          if [[ "$is_authorized" == "true" ]] && [[ "$has_v2_keyword" == "true" || "$has_branch_keyword" == "true" ]]; then
            echo "✅ Deployment conditions met"
            echo "should_deploy=true" >> $GITHUB_OUTPUT
          else
@@ -123,17 +111,9 @@ jobs:
        with:
          egress-policy: audit

-      - name: Checkout main repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: ${{ github.repository }}
-          ref: main
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
@@ -142,7 +122,7 @@ jobs:
        id: deployment-started
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            const { owner, repo } = context.repo;
            const prNumber = ${{ needs.check-pr.outputs.pr_number }};
@@ -186,8 +166,19 @@ jobs:
          repository: ${{ needs.check-pr.outputs.pr_repository }}
          ref: ${{ needs.check-pr.outputs.pr_ref }}
          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0  # Fetch full history for commit hash detection

+      - name: Set up JDK
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          java-version: "17"
+          distribution: "temurin"
+
+      - name: Build backend
+        run: |
+          export DISABLE_ADDITIONAL_FEATURES=true
+          ./gradlew clean build
+        env:
+          STIRLING_PDF_DESKTOP_UI: false

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
@@ -204,81 +195,13 @@ jobs:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}

-      - name: Get commit hashes for frontend and backend
-        id: commit-hashes
-        run: |
-          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
-          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$FRONTEND_HASH" ]; then
-            FRONTEND_HASH="no-frontend-changes"
-          fi
-          
-          # Get last commit that touched backend code, docker/backend, or docker/compose
-          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$BACKEND_HASH" ]; then
-            BACKEND_HASH="no-backend-changes"
-          fi
-          
-          echo "Frontend hash: $FRONTEND_HASH"
-          echo "Backend hash: $BACKEND_HASH"
-          
-          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
-          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
-          
-          # Short hashes for tags
-          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
-            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
-          else
-            echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-          
-          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
-            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
-          else
-            echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check if frontend image exists
-        id: check-frontend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Frontend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Frontend image needs to be built"
-          fi
-
-      - name: Check if backend image exists
-        id: check-backend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Backend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Backend image needs to be built"
-          fi
-
-      - name: Build and push V2 frontend image
-        if: steps.check-frontend.outputs.exists == 'false'
+      - name: Build and push V2 monolith image
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
        with:
          context: .
-          file: ./docker/frontend/Dockerfile
+          file: ./docker/monolith/Dockerfile
          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-      - name: Build and push V2 backend image
-        if: steps.check-backend.outputs.exists == 'false'
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          context: .
-          file: ./docker/backend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-pr-${{ needs.check-pr.outputs.pr_number }}
          build-args: VERSION_TAG=v2-alpha
          platforms: linux/amd64

@@ -293,17 +216,16 @@ jobs:
        run: |
          # Use same port strategy as regular PRs - just the PR number
          V2_PORT=${{ needs.check-pr.outputs.pr_number }}
-          BACKEND_PORT=$((V2_PORT + 10000))  # Backend on higher port to avoid conflicts
          
-          # Create docker-compose for V2 with separate frontend and backend
+          # Create docker-compose for V2 monolith
          cat > docker-compose.yml << EOF
          version: '3.3'
          services:
-            stirling-pdf-v2-backend:
-              container_name: stirling-pdf-v2-backend-pr-${{ needs.check-pr.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
+            stirling-pdf-v2:
+              container_name: stirling-pdf-v2-pr-${{ needs.check-pr.outputs.pr_number }}
+              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-pr-${{ needs.check-pr.outputs.pr_number }}
              ports:
-                - "${BACKEND_PORT}:8080"    # Backend API port
+                - "${V2_PORT}:80"      # Frontend port (same as regular PRs)
              volumes:
                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/data:/usr/share/tessdata:rw
                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/config:/configs:rw
@@ -318,19 +240,6 @@ jobs:
                SYSTEM_MAXFILESIZE: "100"
                METRICS_ENABLED: "true"
                SYSTEM_GOOGLEVISIBILITY: "false"
-                SWAGGER_SERVER_URL: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
-                baseUrl: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
-              restart: on-failure:5
-              
-            stirling-pdf-v2-frontend:
-              container_name: stirling-pdf-v2-frontend-pr-${{ needs.check-pr.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-              ports:
-                - "${V2_PORT}:80"          # Frontend port (same as regular PRs)
-              environment:
-                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:${BACKEND_PORT}"
-              depends_on:
-                - stirling-pdf-v2-backend
              restart: on-failure:5
          EOF

@@ -353,10 +262,7 @@ jobs:
            docker-compose up -d
            
            # Clean up unused Docker resources to save space
-            docker system prune -af --volumes || true
-            
-            # Clean up old backend/frontend images (older than 2 weeks)
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
+            docker system prune -af --volumes
          ENDSSH

          # Set port for output
@@ -366,7 +272,7 @@ jobs:
        if: success()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            const { owner, repo } = context.repo;
            const prNumber = ${{ needs.check-pr.outputs.pr_number }};
@@ -388,12 +294,10 @@ jobs:
            }
            
            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${v2Port}`;
-            const httpsUrl = `https://${v2Port}.ssl.stirlingpdf.cloud`;
-
+            
            const commentBody = `## 🚀 V2 Auto-Deployment Complete!\n\n` +
                              `Your V2 PR with the new frontend/backend split architecture has been deployed!\n\n` +
-                              `🔗 **Direct Test URL (non-SSL)** [${deploymentUrl}](${deploymentUrl})\n\n` +
-                              `🔐 **Secure HTTPS URL**: [${httpsUrl}](${httpsUrl})\n\n` +
+                              `🔗 **V2 Test URL:** [${deploymentUrl}](${deploymentUrl})\n\n` +
                              `_This deployment will be automatically cleaned up when the PR is closed._\n\n` +
                              `🔄 **Auto-deployed** because PR title or branch name contains V2/version2/React keywords.`;

@@ -404,102 +308,3 @@ jobs:
              body: commentBody
            });

-  cleanup-v2-deployment:
-    if: github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Clean up V2 deployment comments
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = ${{ github.event.pull_request.number }};
-            
-            // Find and delete V2 deployment comments
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber
-            });
-            
-            const v2Comments = comments.filter(c =>
-              c.body?.includes("## 🚀 V2 Auto-Deployment Complete!") &&
-              c.user?.type === "Bot"
-            );
-            
-            for (const comment of v2Comments) {
-              await github.rest.issues.deleteComment({
-                owner,
-                repo,
-                comment_id: comment.id
-              });
-              console.log(`Deleted V2 deployment comment (ID: ${comment.id})`);
-            }
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Cleanup V2 deployment
-        run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
-            if [ -d "/stirling/V2-PR-${{ github.event.pull_request.number }}" ]; then
-              echo "Found V2 PR directory, proceeding with cleanup..."
-
-              # Stop and remove V2 containers
-              cd /stirling/V2-PR-${{ github.event.pull_request.number }}
-              docker-compose down || true
-
-              # Go back to root before removal
-              cd /
-
-              # Remove V2 PR-specific directories
-              rm -rf /stirling/V2-PR-${{ github.event.pull_request.number }}
-
-              # Clean up V2 containers by name (in case compose cleanup missed them)
-              docker rm -f stirling-pdf-v2-frontend-pr-${{ github.event.pull_request.number }} || true
-              docker rm -f stirling-pdf-v2-backend-pr-${{ github.event.pull_request.number }} || true
-
-              echo "V2 cleanup completed"
-            else
-              echo "V2 PR directory not found, nothing to clean up"
-            fi
-            
-            # Clean up old unused images (older than 2 weeks) but keep recent ones for reuse
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-            
-            # Note: We don't remove the commit-based images since they can be reused across PRs
-            # Only remove PR-specific containers and directories
-          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          rm -f ../private.key
-        continue-on-error: true
-
@@ -6,18 +6,20 @@ on:

 permissions:
  contents: read
-  pull-requests: read
+  issues: write      # Required for adding reactions to comments
+  pull-requests: read # Required for reading PR information

 jobs:
  check-comment:
    runs-on: ubuntu-latest
    permissions:
      issues: write
+      pull-requests: read
    if: |
      github.event.issue.pull_request &&
      (
-        contains(github.event.comment.body, 'prdeploy') ||
-        contains(github.event.comment.body, 'deploypr')
+      contains(github.event.comment.body, 'prdeploy') ||
+      contains(github.event.comment.body, 'deploypr')
      )
      &&
      (
@@ -28,8 +30,6 @@ jobs:
        github.event.comment.user.login == 'sbplat' ||
        github.event.comment.user.login == 'reecebrowne' ||
        github.event.comment.user.login == 'DarioGii' ||
-        github.event.comment.user.login == 'EthanHealy01' ||
-        github.event.comment.user.login == 'jbrunton96' ||
        github.event.comment.user.login == 'ConnorYoh'
      )
    outputs:
@@ -42,18 +42,14 @@ jobs:
      enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
+      # Generate GitHub App token
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
@@ -126,7 +122,7 @@ jobs:
        id: add-eyes-reaction
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            console.log(`Adding eyes reaction to comment ID: ${context.payload.comment.id}`);
            try {
@@ -148,33 +144,28 @@ jobs:
    needs: check-comment
    runs-on: ubuntu-latest
    permissions:
+      contents: read
      issues: write
-      pull-requests: write

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
        with:
          app-id: ${{ secrets.GH_APP_ID }}
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          repository: ${{ needs.check-comment.outputs.pr_repository }}
          ref: ${{ needs.check-comment.outputs.pr_ref }}
-          token: ${{ steps.setup-bot.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up JDK
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -196,8 +187,14 @@ jobs:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

+      - name: Get version number
+        id: versionNumber
+        run: |
+          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
+          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
+
      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -299,7 +296,7 @@ jobs:
        if: success()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            console.log(`Adding rocket reaction to comment ID: ${{ needs.check-comment.outputs.comment_id }}`);
            try {
@@ -315,26 +312,11 @@ jobs:
              console.error(error);
            }

-            // add label to PR
-            const prNumber = ${{ needs.check-comment.outputs.pr_number }};
-            try {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                labels: ['pr-deployed']
-              });
-              console.log(`Added 'pr-deployed' label to PR #${prNumber}`);
-            } catch (error) {
-              console.error(`Failed to add label to PR: ${error.message}`);
-              console.error(error);
-            }
-
      - name: Add failure reaction to comment
        if: failure()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            console.log(`Adding -1 reaction to comment ID: ${{ needs.check-comment.outputs.comment_id }}`);
            try {
@@ -354,7 +336,7 @@ jobs:
        if: success()
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            const { GITHUB_REPOSITORY } = process.env;
            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
@@ -374,11 +356,3 @@ jobs:
              issue_number: prNumber,
              body: commentBody
            });
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          echo "Cleaning up temporary files..."
-          rm -f ../private.key docker-compose.yml
-          echo "Cleanup complete."
-        continue-on-error: true
@@ -1,7 +1,7 @@
 name: PR Deployment cleanup

 on:
-  pull_request_target:
+  pull_request:
    types: [opened, synchronize, reopened, closed]

 permissions:
@@ -13,99 +13,25 @@ env:

 jobs:
  cleanup:
-    if: github.event.action == 'closed'
    runs-on: ubuntu-latest
    permissions:
+      contents: write
      pull-requests: write
-      issues: write
+    if: github.event.action == 'closed'

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - name: Checkout PR
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Setup GitHub App Bot
-        if: github.actor != 'dependabot[bot]'
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        continue-on-error: true
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Remove 'pr-deployed' label if present
-        id: remove-label-comment
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const prNumber = ${{ github.event.pull_request.number }};
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-
-            // Get all labels on the PR
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner,
-              repo,
-              issue_number: prNumber
-            });
-
-            const hasLabel = labels.some(label => label.name === 'pr-deployed');
-
-            if (hasLabel) {
-              console.log("Label 'pr-deployed' found. Removing...");
-              await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: prNumber,
-                name: 'pr-deployed'
-              });
-            } else {
-              console.log("Label 'pr-deployed' not found. Nothing to do.");
-            }
-
-            // Find existing bot comments about the deployment
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber
-            });
-            const deploymentComments = comments.filter(c =>
-              c.body?.includes("## 🚀 PR Test Deployment") &&
-              c.user?.type === "Bot"
-            );
-
-            if (deploymentComments.length > 0) {
-              for (const comment of deploymentComments) {
-                await github.rest.issues.deleteComment({
-                  owner,
-                  repo,
-                  comment_id: comment.id
-                });
-                console.log(`Deleted deployment comment (ID: ${comment.id})`);
-              }
-            } else {
-              console.log("No matching deployment comments found.");
-            }
-
-            // Set flag if either label or comment was present
-            const hasDeploymentComment = deploymentComments.length > 0;
-            core.setOutput('present', (hasLabel || hasDeploymentComment) ? 'true' : 'false');
-
-
      - name: Set up SSH
-        if: steps.remove-label-comment.outputs.present == 'true'
        run: |
          mkdir -p ~/.ssh/
          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
          sudo chmod 600 ../private.key

      - name: Cleanup PR deployment
-        if: steps.remove-label-comment.outputs.present == 'true'
        id: cleanup
        run: |
          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
@@ -131,11 +57,3 @@ jobs:
              echo "NO_CLEANUP_NEEDED"
            fi
          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          echo "Cleaning up temporary files..."
-          rm -f ../private.key
-          echo "Cleanup complete."
-        continue-on-error: true
@@ -19,11 +19,11 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

@@ -87,7 +87,7 @@ jobs:
      - name: AI PR Title Analysis
        if: steps.actor.outputs.is_repo_dev == 'true'
        id: ai-title-analysis
-        uses: actions/ai-inference@b81b2afb8390ee6839b494a404766bef6493c7d9 # v1.2.8
+        uses: actions/ai-inference@d645f067d89ee1d5d736a5990e327e504d1c5a4a # v1.1.0
        with:
          model: openai/gpt-4o
          system-prompt-file: ".github/config/system-prompt.txt"
@@ -0,0 +1,27 @@
+name: "Pull Request Labeler"
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Apply Labels
+        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          configuration-path: .github/labeler-config.yml
+          sync-labels: true
@@ -13,11 +13,11 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -1,194 +1,122 @@
-name: Build and Test Workflow
+name: Build repo

 on:
+  push:
+    branches: ["main"]
  pull_request:
-    branches: ["main", "V2", "V2-gha"]
-  workflow_dispatch:
-
-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true
+    branches: ["main"]

 permissions:
  contents: read

 jobs:
-  files-changed:
-    name: detect what files changed
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    outputs:
-      build: ${{ steps.changes.outputs.build }}
-      app: ${{ steps.changes.outputs.app }}
-      project: ${{ steps.changes.outputs.project }}
-      openapi: ${{ steps.changes.outputs.openapi }}
-    steps:
-      - uses: actions/checkout@v4.3.0
-
-      - name: Check for file changes
-        uses: dorny/paths-filter@v3.0.2
-        id: changes
-        with:
-          filters: .github/config/.files.yaml
-
  build:
    runs-on: ubuntu-latest
+
    permissions:
      actions: read
      security-events: write
+
    strategy:
      fail-fast: false
      matrix:
        jdk-version: [17, 21]
        spring-security: [true, false]
+
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit
+
      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: ${{ matrix.jdk-version }}
          distribution: "temurin"
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.4.2
-        with:
-          gradle-version: 8.14
+
      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
-        run: ./gradlew clean build -PnoSpotless
+        run: ./gradlew clean build
        env:
          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
+
      - name: Check Test Reports Exist
+        id: check-reports
        if: always()
        run: |
          declare -a dirs=(
-            "app/core/build/reports/tests/"
-            "app/core/build/test-results/"
-            "app/common/build/reports/tests/"
-            "app/common/build/test-results/"
-            "app/proprietary/build/reports/tests/"
-            "app/proprietary/build/test-results/"
+            "stirling-pdf/build/reports/tests/"
+            "stirling-pdf/build/test-results/"
+            "common/build/reports/tests/"
+            "common/build/test-results/"
+            "proprietary/build/reports/tests/"
+            "proprietary/build/test-results/"
          )
+          missing_reports=()
          for dir in "${dirs[@]}"; do
            if [ ! -d "$dir" ]; then
-              echo "Missing $dir"
-              exit 1
+              missing_reports+=("$dir")
            fi
          done
+          if [ ${#missing_reports[@]} -gt 0 ]; then
+            echo "ERROR: The following required test report directories are missing:"
+            printf '%s\n' "${missing_reports[@]}"
+            exit 1
+          fi
+          echo "All required test report directories are present"
+
      - name: Upload Test Reports
        if: always()
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
          path: |
-            app/**/build/reports/tests/
-            app/**/build/test-results/
-            app/**/build/reports/problems/
+            stirling-pdf/build/reports/tests/
+            stirling-pdf/build/test-results/
+            stirling-pdf/build/reports/problems/
+            common/build/reports/tests/
+            common/build/test-results/
+            common/build/reports/problems/
+            proprietary/build/reports/tests/
+            proprietary/build/test-results/
+            proprietary/build/reports/problems/
            build/reports/problems/
          retention-days: 3
          if-no-files-found: warn

-  check-generateOpenApiDocs:
-    if: needs.files-changed.outputs.openapi == 'true'
-    needs: [files-changed]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2.13.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-      - uses: gradle/actions/setup-gradle@v4.4.2
-      - name: Generate OpenAPI documentation
-        run: ./gradlew :stirling-pdf:generateOpenApiDocs
-        env:
-          DISABLE_ADDITIONAL_FEATURES: true
-      
-      - name: Upload OpenAPI Documentation
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: openapi-docs
-          path: ./SwaggerDoc.json
-
-  frontend-validation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2.12.2
-        with:
-          egress-policy: audit
-      - name: Checkout repository
-        uses: actions/checkout@v4.2.2
-      - name: Set up Node.js
-        uses: actions/setup-node@v4.1.0
-        with:
-          node-version: '20'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-      - name: Install frontend dependencies
-        run: cd frontend && npm ci
-      - name: Lint frontend
-        run: cd frontend && npm run lint
-      - name: Build frontend
-        run: cd frontend && npm run build
-      - name: Run frontend tests
-        run: cd frontend && npm run test -- --run
-      - name: Upload frontend build artifacts
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: frontend-build
-          path: frontend/dist/
-          retention-days: 3
-
  check-licence:
-    if: needs.files-changed.outputs.build == 'true'
-    needs: [files-changed, build]
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit
+
      - name: Checkout repository
-        uses: actions/checkout@v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
      - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          distribution: "adopt"
+
      - name: check the licenses for compatibility
        run: ./gradlew clean checkLicense
+
      - name: FAILED - check the licenses for compatibility
        if: failure()
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: dependencies-without-allowed-license.json
-          path: build/reports/dependency-license/dependencies-without-allowed-license.json
+          path: |
+            build/reports/dependency-license/dependencies-without-allowed-license.json
          retention-days: 3

  docker-compose-tests:
-    if: needs.files-changed.outputs.project == 'true'
-    needs: files-changed
    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
    #     (github.event_name == 'pull_request' &&
    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
@@ -207,18 +135,18 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Checkout Repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up Java 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          distribution: "adopt"

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
@@ -233,7 +161,6 @@ jobs:
        with:
          python-version: "3.12"
          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: ./testing/cucumber/requirements.txt

      - name: Pip requirements
        run: |
@@ -245,69 +172,3 @@ jobs:
          chmod +x ./testing/test.sh
          chmod +x ./testing/test_disabledEndpoints.sh
          ./testing/test.sh
-
-  test-build-docker-images:
-    if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
-    needs: [files-changed, build, check-generateOpenApiDocs, check-licence]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        docker-rev: ["Dockerfile", "Dockerfile.ultra-lite", "Dockerfile.fat"]
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout Repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-        with:
-          gradle-version: 8.14
-
-      - name: Build application
-        run: ./gradlew clean build
-        env:
-          DISABLE_ADDITIONAL_FEATURES: true
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-
-      - name: Build ${{ matrix.docker-rev }}
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./docker/backend/${{ matrix.docker-rev }}
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Upload Reports
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: reports-docker-${{ matrix.docker-rev }}
-          path: |
-            build/reports/tests/
-            build/test-results/
-            build/reports/problems/
-          retention-days: 3
-          if-no-files-found: warn
@@ -4,19 +4,7 @@ on:
  pull_request_target:
    types: [opened, synchronize, reopened]
    paths:
-      - "app/core/src/main/resources/messages_*.properties"
-
-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true
+      - "stirling-pdf/src/main/resources/messages_*.properties"

 permissions:
  contents: read # Allow read access to repository content
@@ -30,12 +18,12 @@ jobs:
      pull-requests: write # Allow writing to pull requests
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Checkout main branch first
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -79,7 +67,7 @@ jobs:
              exit 1
            fi
            # Get changed files and filter for properties files, handle case where no matches are found
-            gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt || echo "No matching properties files found in PR"
+            gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^stirling-pdf/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt || echo "No matching properties files found in PR"
            # Check if any files were found
            if [ ! -s changed_files.txt ]; then
              echo "No properties files changed in this PR"
@@ -127,9 +115,9 @@ jobs:

            // Filter for relevant files based on the PR changes
            const changedFiles = files
-              .filter(file =>
+              .filter(file => 
                file.status !== "removed" &&
-                /^app\/core\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
+                /^stirling-pdf\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
              )
              .map(file => file.filename);

@@ -169,12 +157,12 @@ jobs:

            // Determine reference file
            let referenceFilePath;
-            if (changedFiles.includes("app/core/src/main/resources/messages_en_GB.properties")) {
+            if (changedFiles.includes("stirling-pdf/src/main/resources/messages_en_GB.properties")) {
              console.log("Using PR branch reference file.");
              const { data: fileContent } = await github.rest.repos.getContent({
                owner: prRepoOwner,
                repo: prRepoName,
-                path: "app/core/src/main/resources/messages_en_GB.properties",
+                path: "stirling-pdf/src/main/resources/messages_en_GB.properties",
                ref: branch,
              });

@@ -186,7 +174,7 @@ jobs:
              const { data: fileContent } = await github.rest.repos.getContent({
                owner: repoOwner,
                repo: repoName,
-                path: "app/core/src/main/resources/messages_en_GB.properties",
+                path: "stirling-pdf/src/main/resources/messages_en_GB.properties",
                ref: "main",
              });

@@ -289,4 +277,4 @@ jobs:
          rm -rf pr-branch
          rm -f pr-branch-messages_en_GB.properties main-branch-messages_en_GB.properties changed_files.txt result.txt
          echo "Cleanup complete."
-        continue-on-error: true # Ensure cleanup runs even if previous steps fail
+        continue-on-error: true # Ensure cleanup runs even if previous steps fail
@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: "Checkout Repository"
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: "Dependency Review"
        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
@@ -1,189 +0,0 @@
-name: Auto V2 Deploy on Push
-
-on:
-  push:
-    branches:
-      - V2
-      - deploy-on-v2-commit
-
-permissions:
-  contents: read
-
-jobs:
-  deploy-v2-on-push:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: deploy-v2-push-V2
-      cancel-in-progress: true
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
-        with:
-          egress-policy: audit
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Get commit hashes for frontend and backend
-        id: commit-hashes
-        run: |
-          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
-          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$FRONTEND_HASH" ]; then
-            FRONTEND_HASH="no-frontend-changes"
-          fi
-          
-          # Get last commit that touched backend code, docker/backend, or docker/compose
-          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
-          if [ -z "$BACKEND_HASH" ]; then
-            BACKEND_HASH="no-backend-changes"
-          fi
-          
-          echo "Frontend hash: $FRONTEND_HASH"
-          echo "Backend hash: $BACKEND_HASH"
-          
-          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
-          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
-          
-          # Short hashes for tags
-          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
-            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
-          else
-            echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-          
-          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
-            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
-          else
-            echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check if frontend image exists
-        id: check-frontend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Frontend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Frontend image needs to be built"
-          fi
-
-      - name: Check if backend image exists
-        id: check-backend
-        run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }} >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Backend image already exists, skipping build"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Backend image needs to be built"
-          fi
-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push frontend image
-        if: steps.check-frontend.outputs.exists == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/frontend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-      
-      - name: Build and push backend image
-        if: steps.check-backend.outputs.exists == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/backend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          chmod 600 ../private.key
-
-
-      - name: Deploy to VPS on port 3000
-        run: |
-          export UNIQUE_NAME=docker-compose-v2-$GITHUB_RUN_ID.yml
-      
-          cat > $UNIQUE_NAME << EOF
-          version: '3.3'
-          services:
-            backend:
-              container_name: stirling-v2-backend
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-              ports:
-                - "13000:8080"
-              volumes:
-                - /stirling/V2/data:/usr/share/tessdata:rw
-                - /stirling/V2/config:/configs:rw
-                - /stirling/V2/logs:/logs:rw
-              environment:
-                DISABLE_ADDITIONAL_FEATURES: "true"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF V2"
-                UI_HOMEDESCRIPTION: "V2 Frontend/Backend Split"
-                UI_APPNAMENAVBAR: "V2 Deployment"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-                SWAGGER_SERVER_URL: "https://demo.stirlingpdf.cloud"
-                baseUrl: "https://demo.stirlingpdf.cloud"
-              restart: on-failure:5
-      
-            frontend:
-              container_name: stirling-v2-frontend
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-              ports:
-                - "3000:80"
-              environment:
-                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:13000"
-              depends_on:
-                - backend
-              restart: on-failure:5
-          EOF
-      
-          # Copy to remote with unique name
-          scp -i ../private.key -o StrictHostKeyChecking=no $UNIQUE_NAME ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/$UNIQUE_NAME
-      
-          # SSH and rename/move atomically to avoid interference
-          ssh -i ../private.key -o StrictHostKeyChecking=no ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
-            mkdir -p /stirling/V2/{data,config,logs}
-            mv /tmp/$UNIQUE_NAME /stirling/V2/docker-compose.yml
-            cd /stirling/V2
-            docker-compose down || true
-            docker-compose pull
-            docker-compose up -d
-            docker system prune -af --volumes || true
-            docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
-          ENDSSH
-
-      - name: Cleanup temporary files
-        if: always()
-        run: |
-          rm -f ../private.key
-
@@ -1,217 +0,0 @@
-name: Frontend License Report Workflow
-
-on:
-  push:
-    branches:
-      - V2
-    paths:
-      - "frontend/package.json"
-      - "frontend/package-lock.json"
-      - "frontend/scripts/generate-licenses.js"
-  pull_request:
-    branches:
-      - V2
-    paths:
-      - "frontend/package.json"
-      - "frontend/package-lock.json"
-      - "frontend/scripts/generate-licenses.js"
-
-permissions:
-  contents: read
-
-jobs:
-  generate-frontend-license-report:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      repository-projects: write # Required for enabling automerge
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
-        with:
-          node-version: '18'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-
-      - name: Install frontend dependencies
-        working-directory: frontend
-        run: npm ci
-
-      - name: Generate frontend license report
-        working-directory: frontend
-        run: npm run generate-licenses
-
-      - name: Check for license warnings
-        run: |
-          if [ -f "frontend/src/assets/license-warnings.json" ]; then
-            echo "LICENSE_WARNINGS_EXIST=true" >> $GITHUB_ENV
-          else
-            echo "LICENSE_WARNINGS_EXIST=false" >> $GITHUB_ENV
-          fi
-
-      # PR Event: Check licenses and comment on PR
-      - name: Delete previous license check comments
-        if: github.event_name == 'pull_request'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.issue.number;
-            
-            // Get all comments on the PR
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number: prNumber,
-              per_page: 100
-            });
-            
-            // Filter for license check comments
-            const licenseComments = comments.filter(comment => 
-              comment.body.includes('## ✅ Frontend License Check Passed') ||
-              comment.body.includes('## ❌ Frontend License Check Failed')
-            );
-            
-            // Delete old license check comments
-            for (const comment of licenseComments) {
-              console.log(`Deleting old license check comment: ${comment.id}`);
-              await github.rest.issues.deleteComment({
-                owner,
-                repo,
-                comment_id: comment.id
-              });
-            }
-
-      - name: Comment on PR - License Check Results
-        if: github.event_name == 'pull_request'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ steps.setup-bot.outputs.token }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.issue.number;
-            const hasWarnings = process.env.LICENSE_WARNINGS_EXIST === 'true';
-            
-            let commentBody;
-            
-            if (hasWarnings) {
-              // Read warnings file to get specific issues
-              const fs = require('fs');
-              let warningDetails = '';
-              try {
-                const warnings = JSON.parse(fs.readFileSync('frontend/src/assets/license-warnings.json', 'utf8'));
-                warningDetails = warnings.warnings.map(w => `- ${w.message}`).join('\n');
-              } catch (e) {
-                warningDetails = 'Unable to read warning details';
-              }
-              
-              commentBody = `## ❌ Frontend License Check Failed
-              
-              The frontend license check has detected compatibility warnings that require review:
-
-              ${warningDetails}
-
-              **Action Required:** Please review these licenses to ensure they are acceptable for your use case before merging.
-
-              _This check will fail the PR until license issues are resolved._`;
-            } else {
-              commentBody = `## ✅ Frontend License Check Passed
-              
-              All frontend licenses have been validated and no compatibility warnings were detected.
-
-              The frontend license report has been updated successfully.`;
-            }
-            
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body: commentBody
-            });
-
-      - name: Fail workflow if license warnings exist (PR only)
-        if: github.event_name == 'pull_request' && env.LICENSE_WARNINGS_EXIST == 'true'
-        run: |
-          echo "❌ License warnings detected. Failing the workflow."
-          exit 1
-
-      # Push Event: Commit license files and create PR
-      - name: Commit changes (Push only)
-        if: github.event_name == 'push'
-        run: |
-          git add frontend/src/assets/3rdPartyLicenses.json
-          # Note: Do NOT commit license-warnings.json - it's only for PR review
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Prepare PR body (Push only)
-        if: github.event_name == 'push'
-        run: |
-          PR_BODY="Auto-generated by ${{ steps.setup-bot.outputs.app-slug }}[bot]
-
-          This PR updates the frontend license report based on changes to package.json dependencies."
-          
-          if [ "${{ env.LICENSE_WARNINGS_EXIST }}" = "true" ]; then
-            PR_BODY="$PR_BODY
-
-          ## ⚠️ License Compatibility Warnings
-
-          The following licenses may require review for corporate compatibility:
-
-          $(cat frontend/src/assets/license-warnings.json | jq -r '.warnings[].message')
-
-          Please review these licenses to ensure they are acceptable for your use case."
-          fi
-          
-          echo "PR_BODY<<EOF" >> $GITHUB_ENV
-          echo "$PR_BODY" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Create Pull Request (Push only)
-        id: cpr
-        if: github.event_name == 'push' && env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: "Update Frontend 3rd Party Licenses"
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: update-frontend-3rd-party-licenses
-          base: V2
-          title: "Update Frontend 3rd Party Licenses"
-          body: ${{ env.PR_BODY }}
-          labels: Licenses,github-actions,frontend
-          draft: false
-          delete-branch: true
-          sign-commits: true
-
-      - name: Enable Pull Request Automerge (Push only)
-        if: github.event_name == 'push' && steps.cpr.outputs.pull-request-operation == 'created' && env.LICENSE_WARNINGS_EXIST == 'false'
-        run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
-
-      - name: Add review required label (Push only)
-        if: github.event_name == 'push' && steps.cpr.outputs.pull-request-operation == 'created' && env.LICENSE_WARNINGS_EXIST == 'true'
-        run: gh pr edit "${{ steps.cpr.outputs.pull-request-number }}" --add-label "license-review-required"
-        env:
-          GH_TOKEN: ${{ steps.setup-bot.outputs.token }}
@@ -7,18 +7,6 @@ on:
    paths:
      - "build.gradle"

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -31,12 +19,12 @@ jobs:
      repository-projects: write # Required for enabling automerge
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Check out code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

@@ -51,10 +39,10 @@ jobs:
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
-          distribution: "temurin"
+          distribution: "adopt"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

      - name: Check licenses for compatibility
        run: ./gradlew clean checkLicense
@@ -69,11 +57,11 @@ jobs:

      - name: Move and rename license file
        run: |
-          mv build/reports/dependency-license/index.json app/core/src/main/resources/static/3rdPartyLicenses.json
+          mv build/reports/dependency-license/index.json stirling-pdf/src/main/resources/static/3rdPartyLicenses.json

      - name: Commit changes
        run: |
-          git add app/core/src/main/resources/static/3rdPartyLicenses.json
+          git add stirling-pdf/src/main/resources/static/3rdPartyLicenses.json
          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV

      - name: Create Pull Request
@@ -15,12 +15,12 @@ jobs:
      issues: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Check out the repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Run Labeler
        uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916 # v5.3.0
@@ -21,31 +21,27 @@ jobs:
      versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-
-      # ✅ Get version from Gradle
+      # Get version number
      - name: Get version number
        id: versionNumber
        run: |
-          VERSION=$(./gradlew printVersion --quiet | tail -1)
+          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT

-      # ✅ Get Mac-specific version from Gradle
      - name: Get version number mac
        id: versionNumberMac
        run: |
-          VERSION_MAC=$(./gradlew printMacVersion --quiet | tail -1)
-          echo "versionNumberMac=$VERSION_MAC" >> $GITHUB_OUTPUT
+          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
+          CURRENT_YEAR=$(date +'%Y')
+          IFS='.' read -r -a VERSION_PARTS <<< "$VERSION"
+          MAC_VERSION="$CURRENT_YEAR.${VERSION_PARTS[1]:-0}.${VERSION_PARTS[2]:-0}"
+          echo "versionNumberMac=$MAC_VERSION" >> $GITHUB_OUTPUT

  build-portable:
    needs: read_versions
@@ -60,11 +56,11 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 21
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -72,7 +68,7 @@ jobs:
          java-version: "21"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -86,7 +82,7 @@ jobs:
        run: |
          mkdir ./binaries
          mv ./build/launch4j/Stirling-PDF.exe ./binaries/win-Stirling-PDF-portable-Server${{ matrix.file_suffix }}.exe
-          mv ./app/core/build/libs/stirling-pdf-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar
+          mv ./build/libs/Stirling-PDF-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar

      - name: Upload build artifacts
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -110,12 +106,12 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: stirling-${{ matrix.file_suffix }}binaries

@@ -148,11 +144,11 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 21
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -160,7 +156,7 @@ jobs:
          java-version: "21"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -238,12 +234,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: ${{ matrix.platform }}binaries

@@ -252,7 +248,7 @@ jobs:

      - name: Install Cosign
        if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0

      - name: Generate key pair
        if: matrix.os == 'windows-latest'
@@ -301,12 +297,12 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Download signed artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
      - name: Display structure of downloaded files
        run: ls -R
      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
@@ -2,9 +2,8 @@ name: Pre-commit

 on:
  workflow_dispatch:
-  push:
-    branches:
-      - main
+  schedule:
+    - cron: "0 0 * * 1"

 permissions:
  contents: read
@@ -17,12 +16,12 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

@@ -38,7 +37,6 @@ jobs:
        with:
          python-version: 3.12
          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: ./.github/scripts/requirements_pre_commit.txt

      - name: Run Pre-Commit Hooks
        run: |
@@ -47,15 +45,6 @@ jobs:
      - run: pre-commit run --all-files -c .pre-commit-config.yaml
        continue-on-error: true

-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          java-version: 17
-          distribution: "temurin"
-
-      - name: Build with Gradle
-        run: ./gradlew clean build
-
      - name: git add
        run: |
          git add .
@@ -7,18 +7,6 @@ on:
      - master
      - main

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -30,11 +18,11 @@ jobs:
      id-token: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -42,7 +30,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -54,7 +42,7 @@ jobs:

      - name: Install cosign
        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
        with:
          cosign-release: "v2.4.1"

@@ -67,13 +55,13 @@ jobs:
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -88,8 +76,7 @@ jobs:

      - name: Generate tags
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
-        if: github.ref != 'refs/heads/main'
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: |
            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -99,11 +86,11 @@ jobs:
          tags: |
            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}

      - name: Build and push main Dockerfile
        id: build-push-regular
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        if: github.ref != 'refs/heads/main'
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
@@ -134,7 +121,7 @@ jobs:

      - name: Generate tags ultra-lite
        id: meta2
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        if: github.ref != 'refs/heads/main'
        with:
          images: |
@@ -165,7 +152,8 @@ jobs:

      - name: Generate tags fat
        id: meta3
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        if: github.ref != 'refs/heads/main'
        with:
          images: |
            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -175,11 +163,11 @@ jobs:
          tags: |
            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}

      - name: Build and push main Dockerfile fat
        id: build-push-fat
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        if: github.ref != 'refs/heads/main'
        with:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
@@ -23,11 +23,11 @@ jobs:
      version: ${{ steps.versionNumber.outputs.versionNumber }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -35,7 +35,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
        with:
          gradle-version: 8.14

@@ -83,19 +83,19 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Download build artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: binaries${{ matrix.file_suffix }}
      - name: Display structure of downloaded files
        run: ls -R

      - name: Install Cosign
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0

      - name: Generate key pair
        run: cosign generate-key-pair
@@ -161,12 +161,12 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Download signed artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: signed${{ matrix.file_suffix }}

@@ -34,12 +34,12 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: "Checkout code"
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

@@ -74,6 +74,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
        with:
          sarif_file: results.sarif
@@ -9,18 +9,6 @@ on:
      - main
  workflow_dispatch:

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  pull-requests: read
  actions: read
@@ -30,16 +18,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

      - name: Build and analyze with Gradle
        env:
@@ -16,7 +16,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

@@ -6,18 +6,6 @@ on:
    branches:
      - master

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -26,11 +14,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK 17
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -38,10 +26,10 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

      - name: Generate Swagger documentation
-        run: ./gradlew :stirling-pdf:generateOpenApiDocs
+        run: ./gradlew generateOpenApiDocs

      - name: Upload Swagger Documentation to SwaggerHub
        run: ./gradlew swaggerhubUpload
@@ -8,22 +8,10 @@ on:
    paths:
      - "build.gradle"
      - "README.md"
-      - "app/core/src/main/resources/messages_*.properties"
-      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
+      - "stirling-pdf/src/main/resources/messages_*.properties"
+      - "stirling-pdf/src/main/resources/static/3rdPartyLicenses.json"
      - "scripts/ignore_translation.toml"

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -32,11 +20,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Setup GitHub App Bot
        id: setup-bot
@@ -53,11 +41,11 @@ jobs:

      - name: Sync translation property files
        run: |
-          python .github/scripts/check_language_properties.py --reference-file "app/core/src/main/resources/messages_en_GB.properties" --branch main
+          python .github/scripts/check_language_properties.py --reference-file "stirling-pdf/src/main/resources/messages_en_GB.properties" --branch main

      - name: Commit translation files
        run: |
-          git add app/core/src/main/resources/messages_*.properties
+          git add stirling-pdf/src/main/resources/messages_*.properties
          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"

      - name: Install dependencies
@@ -69,8 +57,8 @@ jobs:

      - name: Run git add
        run: |
-          git add README.md scripts/ignore_translation.toml
-          git diff --staged --quiet || git commit -m ":memo: Sync README.md & scripts/ignore_translation.toml" || echo "No changes detected"
+          git add README.md
+          git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "No changes detected"

      - name: Create Pull Request
        if: always()
@@ -113,4 +101,4 @@ jobs:
          sign-commits: true
          add-paths: |
            README.md
-            app/core/src/main/resources/messages_*.properties
+              stirling-pdf/src/main/resources/messages_*.properties
@@ -4,18 +4,6 @@ on:
  push:
    branches: ["master", "UITest", "testdriver"]

-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
 permissions:
  contents: read

@@ -24,12 +12,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

      - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Set up JDK
        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -37,11 +25,6 @@ jobs:
          java-version: '17'
          distribution: 'temurin'

-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-        with:
-          gradle-version: 8.14
-
      - name: Build with Gradle
        run: ./gradlew clean build
        env:
@@ -57,7 +40,7 @@ jobs:
          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -122,16 +105,11 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-
-      - name: Set up Node
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-        with:
-          cache: 'npm'
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Run TestDriver.ai
        uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3
@@ -156,7 +134,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
        with:
          egress-policy: audit

@@ -27,7 +27,7 @@ clientWebUI/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip
 exampleYmlFiles/stirling/
-/stirling/
+stirling/
 /testing/file_snapshots
 SwaggerDoc.json

@@ -125,13 +125,10 @@ SwaggerDoc.json
 *.tar.gz
 *.rar
 *.db
-build
-app/core/build
-app/common/build
-app/proprietary/build
-common/build
-proprietary/build
-stirling-pdf/build
+/build
+/stirling-pdf/build
+/common/build
+/proprietary/build

 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -1,15 +1,15 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.12.0
    hooks:
      - id: ruff
        args:
          - --fix
          - --line-length=127
-        files: ^((\.github/scripts|scripts|app/core/src/main/resources/static/python)/.+)?[^/]+\.py$
+        files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
        exclude: (split_photos.py)
      - id: ruff-format
-        files: ^((\.github/scripts|scripts|app/core/src/main/resources/static/python)/.+)?[^/]+\.py$
+        files: ^((\.github/scripts|scripts)/.+)?[^/]+\.py$
        exclude: (split_photos.py)
  - repo: https://github.com/codespell-project/codespell
    rev: v2.4.1
@@ -20,9 +20,9 @@ repos:
          - --skip="./.*,*.csv,*.json,*.ambr"
          - --quiet-level=2
        files: \.(html|css|js|py|md)$
-        exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
+        exclude: (.vscode|.devcontainer|stirling-pdf/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
  - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.28.0
+    rev: v8.27.2
    hooks:
      - id: gitleaks
  - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -34,13 +34,3 @@ repos:
      - id: trailing-whitespace
        files: ^.*(\.js|\.java|\.py|\.yml)$
        exclude: ^(.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js|\.github/workflows/.*$)
-  # - repo: https://github.com/thibaudcolas/pre-commit-stylelint
-  #   rev: v16.21.1
-  #   hooks:
-  #     - id: stylelint
-  #       additional_dependencies:
-  #         - stylelint@16.21.1
-  #         - stylelint-config-standard@38.0.0
-  #         - "@stylistic/stylelint-plugin@3.1.3"
-  #       files: \.(css)$
-  #       args: [--fix]
@@ -17,8 +17,5 @@
    "GitHub.vscode-pull-request-github", // GitHub Pull Requests extension for Visual Studio Code
    "charliermarsh.ruff", // Ruff code formatter for Python to follow the Ruff Style Guide
    "yzhang.markdown-all-in-one", // Markdown All-in-One extension for enhanced Markdown editing
-    "stylelint.vscode-stylelint", // Stylelint extension for CSS and SCSS linting
-    "redhat.vscode-yaml", // YAML extension for Visual Studio Code
-    "dbaeumer.vscode-eslint", // ESLint extension for TypeScript linting
  ]
 }
@@ -2,20 +2,13 @@
  "editor.wordSegmenterLocales": "",
  "editor.guides.bracketPairs": "active",
  "editor.guides.bracketPairsHorizontal": "active",
-  "editor.defaultFormatter": "EditorConfig.EditorConfig",
  "cSpell.enabled": false,
-  "[feature]": {
-    "editor.defaultFormatter": "alexkrechik.cucumberautocomplete"
-  },
  "[java]": {
    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code"
  },
  "[jsonc]": {
    "editor.defaultFormatter": "vscode.json-language-features"
  },
-  "[css]": {
-    "editor.defaultFormatter": "stylelint.vscode-stylelint"
-  },
  "[json]": {
    "editor.defaultFormatter": "vscode.json-language-features"
  },
@@ -34,14 +27,11 @@
  "[gradle]": {
    "editor.defaultFormatter": "vscjava.vscode-gradle"
  },
-  "[yaml]": {
-    "editor.defaultFormatter": "redhat.vscode-yaml"
-  },
  "java.compile.nullAnalysis.mode": "automatic",
  "java.configuration.updateBuildConfiguration": "interactive",
  "java.format.enabled": true,
  "java.format.settings.profile": "GoogleStyle",
-  "java.format.settings.google.version": "1.28.0",
+  "java.format.settings.google.version": "1.27.0",
  "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
  // (DE) Aktiviert Kommentare im Java-Format.
  // (EN) Enables comments in Java formatting.
@@ -80,17 +70,13 @@
    ".venv*/",
    ".vscode/",
    "bin/",
-    "app/core/bin/",
-    "app/common/bin/",
-    "app/proprietary/bin/",
+    "common/bin/",
+    "proprietary/bin/",
    "build/",
-    "app/core/build/",
-    "app/common/build/",
-    "app/proprietary/build/",
+    "common/build/",
+    "proprietary/build/",
    "configs/",
-    "app/core/configs/",
    "customFiles/",
-    "app/core/customFiles/",
    "docs/",
    "exampleYmlFiles",
    "gradle/",
@@ -102,9 +88,8 @@
    ".git-blame-ignore-revs",
    ".gitattributes",
    ".gitignore",
-    "app/core/.gitignore",
-    "app/common/.gitignore",
-    "app/proprietary/.gitignore",
+    "common/.gitignore",
+    "proprietary/.gitignore",
    ".pre-commit-config.yaml",
  ],
  // Enables signature help in Java.
@@ -134,13 +119,9 @@
  "html.format.indentHandlebars": true,
  "html.format.preserveNewLines": true,
  "html.format.maxPreserveNewLines": 2,
-  "stylelint.configFile": "devTools/.stylelintrc.json",
  "java.project.sourcePaths": [
-    "app/core/src/main/java",
-    "app/common/src/main/java",
-    "app/proprietary/src/main/java"
-  ],
-  "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+    "stirling-pdf/src/main/java",
+    "common/src/main/java",
+    "proprietary/src/main/java"
+  ]
 }
@@ -1,300 +0,0 @@
-# Adding New React Tools to Stirling PDF
-
-This guide covers how to add new PDF tools to the React frontend, either by migrating existing Thymeleaf templates or creating entirely new tools.
-
-## Overview
-
-When adding tools, follow this systematic approach using the established patterns and architecture.
-
-## 1. Create Tool Structure
-
-Create these files in the correct directories:
-```
-frontend/src/hooks/tools/[toolName]/
-  ├── use[ToolName]Parameters.ts     # Parameter definitions and validation
-  └── use[ToolName]Operation.ts      # Tool operation logic using useToolOperation
-
-frontend/src/components/tools/[toolName]/
-  └── [ToolName]Settings.tsx         # Settings UI component (if needed)
-
-frontend/src/tools/
-  └── [ToolName].tsx                 # Main tool component
-```
-
-## 2. Implementation Pattern
-
-Use `useBaseTool` for simplified hook management. This is the recommended approach for all new tools:
-
-**Parameters Hook** (`use[ToolName]Parameters.ts`):
-```typescript
-import { BaseParameters } from '../../../types/parameters';
-import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
-
-export interface [ToolName]Parameters extends BaseParameters {
-  // Define your tool-specific parameters here
-  someOption: boolean;
-}
-
-export const defaultParameters: [ToolName]Parameters = {
-  someOption: false,
-};
-
-export const use[ToolName]Parameters = (): BaseParametersHook<[ToolName]Parameters> => {
-  return useBaseParameters({
-    defaultParameters,
-    endpointName: 'your-endpoint-name',
-    validateFn: (params) => true, // Add validation logic
-  });
-};
-```
-
-**Operation Hook** (`use[ToolName]Operation.ts`):
-```typescript
-import { useTranslation } from 'react-i18next';
-import { ToolType, useToolOperation } from '../shared/useToolOperation';
-import { createStandardErrorHandler } from '../../../utils/toolErrorHandler';
-
-export const build[ToolName]FormData = (parameters: [ToolName]Parameters, file: File): FormData => {
-  const formData = new FormData();
-  formData.append('fileInput', file);
-  // Add parameters to formData
-  return formData;
-};
-
-export const [toolName]OperationConfig = {
-  toolType: ToolType.singleFile, // or ToolType.multiFile (buildFormData's file parameter will need to be updated)
-  buildFormData: build[ToolName]FormData,
-  operationType: '[toolName]',
-  endpoint: '/api/v1/category/endpoint-name',
-  filePrefix: 'processed_', // Will be overridden with translation
-  defaultParameters,
-} as const;
-
-export const use[ToolName]Operation = () => {
-  const { t } = useTranslation();
-  return useToolOperation({
-    ...[toolName]OperationConfig,
-    filePrefix: t('[toolName].filenamePrefix', 'processed') + '_',
-    getErrorMessage: createStandardErrorHandler(t('[toolName].error.failed', 'Operation failed'))
-  });
-};
-```
-
-**Main Component** (`[ToolName].tsx`):
-```typescript
-import { useTranslation } from "react-i18next";
-import { createToolFlow } from "../components/tools/shared/createToolFlow";
-import { use[ToolName]Parameters } from "../hooks/tools/[toolName]/use[ToolName]Parameters";
-import { use[ToolName]Operation } from "../hooks/tools/[toolName]/use[ToolName]Operation";
-import { useBaseTool } from "../hooks/tools/shared/useBaseTool";
-import { BaseToolProps, ToolComponent } from "../types/tool";
-
-const [ToolName] = (props: BaseToolProps) => {
-  const { t } = useTranslation();
-  const base = useBaseTool('[toolName]', use[ToolName]Parameters, use[ToolName]Operation, props);
-
-  return createToolFlow({
-    files: {
-      selectedFiles: base.selectedFiles,
-      isCollapsed: base.hasResults,
-      placeholder: t("[toolName].files.placeholder", "Select files to get started"),
-    },
-    steps: [
-      // Add settings steps if needed
-    ],
-    executeButton: {
-      text: t("[toolName].submit", "Process"),
-      isVisible: !base.hasResults,
-      loadingText: t("loading"),
-      onClick: base.handleExecute,
-      disabled: !base.params.validateParameters() || !base.hasFiles || !base.endpointEnabled,
-    },
-    review: {
-      isVisible: base.hasResults,
-      operation: base.operation,
-      title: t("[toolName].results.title", "Results"),
-      onFileClick: base.handleThumbnailClick,
-      onUndo: base.handleUndo,
-    },
-  });
-};
-
-[ToolName].tool = () => use[ToolName]Operation;
-export default [ToolName] as ToolComponent;
-```
-
-**Note**: Some existing tools (like AddPassword, Compress) use a legacy pattern with manual hook management. **Always use the Modern Pattern above for new tools** - it's cleaner, more maintainable, and includes automation support.
-
-## 3. Register Tool in System
-Update these files to register your new tool:
-
-**Tool Registry** (`frontend/src/data/useTranslatedToolRegistry.tsx`):
-1. Add imports at the top:
-```typescript
-import [ToolName] from "../tools/[ToolName]";
-import { [toolName]OperationConfig } from "../hooks/tools/[toolName]/use[ToolName]Operation";
-import [ToolName]Settings from "../components/tools/[toolName]/[ToolName]Settings";
-```
-
-2. Add tool entry in the `allTools` object:
-```typescript
-[toolName]: {
-  icon: <LocalIcon icon="your-icon-name" width="1.5rem" height="1.5rem" />,
-  name: t("home.[toolName].title", "Tool Name"),
-  component: [ToolName],
-  description: t("home.[toolName].desc", "Tool description"),
-  categoryId: ToolCategoryId.STANDARD_TOOLS, // or appropriate category
-  subcategoryId: SubcategoryId.APPROPRIATE_SUBCATEGORY,
-  maxFiles: -1, // or specific number
-  endpoints: ["endpoint-name"],
-  operationConfig: [toolName]OperationConfig,
-  settingsComponent: [ToolName]Settings, // if settings exist
-},
-```
-
-## 4. Add Tooltips (Optional but Recommended)
-Create user-friendly tooltips to help non-technical users understand your tool. **Use simple, clear language - avoid technical jargon:**
-
-**Tooltip Hook** (`frontend/src/components/tooltips/use[ToolName]Tips.ts`):
-```typescript
-import { useTranslation } from 'react-i18next';
-import { TooltipContent } from '../../types/tips';
-
-export const use[ToolName]Tips = (): TooltipContent => {
-  const { t } = useTranslation();
-
-  return {
-    header: {
-      title: t("[toolName].tooltip.header.title", "Tool Overview")
-    },
-    tips: [
-      {
-        title: t("[toolName].tooltip.description.title", "What does this tool do?"),
-        description: t("[toolName].tooltip.description.text", "Simple explanation in everyday language that non-technical users can understand."),
-        bullets: [
-          t("[toolName].tooltip.description.bullet1", "Easy-to-understand benefit 1"),
-          t("[toolName].tooltip.description.bullet2", "Easy-to-understand benefit 2")
-        ]
-      }
-      // Add more tip sections as needed
-    ]
-  };
-};
-```
-
-**Add tooltip to your main component:**
-```typescript
-import { use[ToolName]Tips } from "../components/tooltips/use[ToolName]Tips";
-
-const [ToolName] = (props: BaseToolProps) => {
-  const tips = use[ToolName]Tips();
-  
-  // In your steps array:
-  steps: [
-    {
-      title: t("[toolName].steps.settings", "Settings"),
-      tooltip: tips, // Add this line
-      content: <[ToolName]Settings ... />
-    }
-  ]
-```
-
-## 5. Add Translations
-Update translation files. **Important: Only update `en-GB` files** - other languages are handled separately.
-
-**File to update:** `frontend/public/locales/en-GB/translation.json`
-
-**Required Translation Keys**:
-```json
-{
-  "home": {
-    "[toolName]": {
-      "title": "Tool Name",
-      "desc": "Tool description"
-    }
-  },
-  "[toolName]": {
-    "title": "Tool Name",
-    "submit": "Process",
-    "filenamePrefix": "processed",
-    "files": {
-      "placeholder": "Select files to get started"
-    },
-    "steps": {
-      "settings": "Settings"
-    },
-    "options": {
-      "title": "Tool Options",
-      "someOption": "Option Label",
-      "someOption.desc": "Option description",
-      "note": "General information about the tool."
-    },
-    "results": {
-      "title": "Results"
-    },
-    "error": {
-      "failed": "Operation failed"
-    },
-    "tooltip": {
-      "header": {
-        "title": "Tool Overview"
-      },
-      "description": {
-        "title": "What does this tool do?",
-        "text": "Simple explanation in everyday language",
-        "bullet1": "Easy-to-understand benefit 1",
-        "bullet2": "Easy-to-understand benefit 2"
-      }
-    }
-  }
-}
-```
-
-**Translation Notes:**
- **Only update `en-GB/translation.json`** - other locale files are managed separately
- Use descriptive keys that match your component's `t()` calls
- Include tooltip translations if you created tooltip hooks
- Add `options.*` keys if your tool has settings with descriptions
-
-**Tooltip Writing Guidelines:**
- **Use simple, everyday language** - avoid technical terms like "converts interactive elements" 
- **Focus on benefits** - explain what the user gains, not how it works internally
- **Use concrete examples** - "text boxes become regular text" vs "form fields are flattened"
- **Answer user questions** - "What does this do?", "When should I use this?", "What's this option for?"
- **Keep descriptions concise** - 1-2 sentences maximum per section
- **Use bullet points** for multiple benefits or features
-
-## 6. Migration from Thymeleaf
-When migrating existing Thymeleaf templates:
-
-1. **Identify Form Parameters**: Look at the original `<form>` inputs to determine parameter structure
-2. **Extract Translation Keys**: Find `#{key.name}` references and add them to JSON translations (For many tools these translations will already exist but some parts will be missing)
-3. **Map API Endpoint**: Note the `th:action` URL for the operation hook
-4. **Preserve Functionality**: Ensure all original form behaviour is replicated which is applicable to V2 react UI
-
-## 7. Testing Your Tool
- Verify tool appears in UI with correct icon and description
- Test with various file sizes and types
- Confirm translations work
- Check error handling
- Test undo functionality
- Verify results display correctly
-
-## Tool Development Patterns
-
-### Three Tool Patterns:
-
-**Pattern 1: Single-File Tools** (Individual processing)
- Backend processes one file per API call
- Set `multiFileEndpoint: false`
- Examples: Compress, Rotate
-
-**Pattern 2: Multi-File Tools** (Batch processing)
- Backend accepts `MultipartFile[]` arrays in single API call
- Set `multiFileEndpoint: true`
- Examples: Split, Merge, Overlay
-
-**Pattern 3: Complex Tools** (Custom processing)
- Tools with complex routing logic or non-standard processing
- Provide `customProcessor` for full control
- Examples: Convert, OCR
@@ -25,115 +25,23 @@ Set `DOCKER_ENABLE_SECURITY=true` environment variable to enable security featur
 - **Proxy Configuration**: Vite proxies `/api/*` calls to backend (localhost:8080)
 - **Build Process**: DO NOT run build scripts manually - builds are handled by CI/CD pipelines
 - **Package Installation**: DO NOT run npm install commands - package management handled separately
- **Deployment Options**:
-  - **Desktop App**: `npm run tauri-build` (native desktop application)
-  - **Web Server**: `npm run build` then serve dist/ folder
-  - **Development**: `npm run tauri-dev` for desktop dev mode

-#### Multi-Tool Workflow Architecture
-Frontend designed for **stateful document processing**:
- Users upload PDFs once, then chain tools (split → merge → compress → view)
- File state and processing results persist across tool switches
- No file reloading between tools - performance critical for large PDFs (up to 100GB+)
-
-#### FileContext - Central State Management
-**Location**: `src/contexts/FileContext.tsx`
- **Active files**: Currently loaded PDFs and their variants
- **Tool navigation**: Current mode (viewer/pageEditor/fileEditor/toolName)  
- **Memory management**: PDF document cleanup, blob URL lifecycle, Web Worker management
- **IndexedDB persistence**: File storage with thumbnail caching
- **Preview system**: Tools can preview results (e.g., Split → Viewer → back to Split) without context pollution
-
-**Critical**: All file operations go through FileContext. Don't bypass with direct file handling.
-
-#### Processing Services
- **enhancedPDFProcessingService**: Background PDF parsing and manipulation
- **thumbnailGenerationService**: Web Worker-based with main-thread fallback
- **fileStorage**: IndexedDB with LRU cache management
-
-#### Memory Management Strategy
-**Why manual cleanup exists**: Large PDFs (up to 100GB+) through multiple tools accumulate:
- PDF.js documents that need explicit .destroy() calls
- Blob URLs from tool outputs that need revocation
- Web Workers that need termination
-Without cleanup: browser crashes with memory leaks.
-
-#### Tool Development
-
-**Architecture**: Modular hook-based system with clear separation of concerns:
-
- **useToolOperation** (`frontend/src/hooks/tools/shared/useToolOperation.ts`): Main orchestrator hook
-  - Coordinates all tool operations with consistent interface
-  - Integrates with FileContext for operation tracking
-  - Handles validation, error handling, and UI state management
-
- **Supporting Hooks**:
-  - **useToolState**: UI state management (loading, progress, error, files)
-  - **useToolApiCalls**: HTTP requests and file processing
-  - **useToolResources**: Blob URLs, thumbnails, ZIP downloads
-
- **Utilities**:
-  - **toolErrorHandler**: Standardized error extraction and i18n support
-  - **toolResponseProcessor**: API response handling (single/zip/custom)
-  - **toolOperationTracker**: FileContext integration utilities
-
-**Three Tool Patterns**:
-
-**Pattern 1: Single-File Tools** (Individual processing)
- Backend processes one file per API call
- Set `multiFileEndpoint: false`
- Examples: Compress, Rotate
-```typescript
-return useToolOperation({
-  operationType: 'compress',
-  endpoint: '/api/v1/misc/compress-pdf',
-  buildFormData: (params, file: File) => { /* single file */ },
-  multiFileEndpoint: false,
-  filePrefix: 'compressed_'
-});
+#### Tailwind CSS Setup (if not already installed)
+```bash
+cd frontend
+npm install -D tailwindcss postcss autoprefixer
+npx tailwindcss init -p
 ```

-**Pattern 2: Multi-File Tools** (Batch processing)
- Backend accepts `MultipartFile[]` arrays in single API call
- Set `multiFileEndpoint: true`
- Examples: Split, Merge, Overlay
-```typescript
-return useToolOperation({
-  operationType: 'split',
-  endpoint: '/api/v1/general/split-pages',
-  buildFormData: (params, files: File[]) => { /* all files */ },
-  multiFileEndpoint: true,
-  filePrefix: 'split_'
-});
-```
-
-**Pattern 3: Complex Tools** (Custom processing)
- Tools with complex routing logic or non-standard processing
- Provide `customProcessor` for full control
- Examples: Convert, OCR
-```typescript
-return useToolOperation({
-  operationType: 'convert',
-  customProcessor: async (params, files) => { /* custom logic */ },
-  filePrefix: 'converted_'
-});
-```
-
-**Benefits**:
- **No Timeouts**: Operations run until completion (supports 100GB+ files)
- **Consistent**: All tools follow same pattern and interface  
- **Maintainable**: Single responsibility hooks, easy to test and modify
- **i18n Ready**: Built-in internationalization support
- **Type Safe**: Full TypeScript support with generic interfaces
- **Memory Safe**: Automatic resource cleanup and blob URL management
-
 ## Architecture Overview

 ### Project Structure
 - **Backend**: Spring Boot application with Thymeleaf templating
- **Frontend**: React-based SPA in `/frontend` directory (Thymeleaf templates fully replaced)
+- **Frontend**: React-based SPA in `/frontend` directory (replacing legacy Thymeleaf templates)
+  - **Current Status**: Active development to replace Thymeleaf UI with modern React SPA
  - **File Storage**: IndexedDB for client-side file persistence and thumbnails
  - **Internationalization**: JSON-based translations (converted from backend .properties)
+  - **URL Parameters**: Deep linking support for tool states and configurations
 - **PDF Processing**: PDFBox for core PDF operations, LibreOffice for conversions, PDF.js for client-side rendering
 - **Security**: Spring Security with optional authentication (controlled by `DOCKER_ENABLE_SECURITY`)
 - **Configuration**: YAML-based configuration with environment variable overrides
@@ -151,8 +59,9 @@ return useToolOperation({
 - **Pipeline System**: Automated PDF processing workflows via `PipelineController`
 - **Security Layer**: Authentication, authorization, and user management (when enabled)

-### Component Architecture
- **React Components**: Located in `frontend/src/components/` and `frontend/src/tools/`
+### Template System (Legacy + Modern)
+- **Legacy Thymeleaf Templates**: Located in `src/main/resources/templates/` (being phased out)
+- **Modern React Components**: Located in `frontend/src/components/` and `frontend/src/tools/`
 - **Static Assets**: CSS, JS, and resources in `src/main/resources/static/` (legacy) + `frontend/public/` (modern)
 - **Internationalization**:
  - Backend: `messages_*.properties` files
@@ -182,17 +91,13 @@ return useToolOperation({
   - Frontend: Update JSON files in `frontend/public/locales/` or use conversion script
 5. **Documentation**: API docs auto-generated and available at `/swagger-ui/index.html`

-## Frontend Architecture Status
+## Frontend Migration Notes

- **Core Status**: React SPA architecture complete with multi-tool workflow support
- **State Management**: FileContext handles all file operations and tool navigation  
- **File Processing**: Production-ready with memory management for large PDF workflows (up to 100GB+)
- **Tool Integration**: Modular hook architecture with `useToolOperation` orchestrator
-  - Individual hooks: `useToolState`, `useToolApiCalls`, `useToolResources`
-  - Utilities: `toolErrorHandler`, `toolResponseProcessor`, `toolOperationTracker`
-  - Pattern: Each tool creates focused operation hook, UI consumes state/actions
- **Preview System**: Tool results can be previewed without polluting file context (Split tool example)
- **Performance**: Web Worker thumbnails, IndexedDB persistence, background processing
+- **Current Branch**: `feature/react-overhaul` - Active React SPA development
+- **Migration Status**: Core tools (Split, Merge, Compress) converted to React with URL parameter support
+- **File Management**: Implemented IndexedDB storage with thumbnail generation using PDF.js
+- **Tools Architecture**: Each tool receives `params` and `updateParams` for URL state synchronization
+- **Remaining Work**: Convert remaining Thymeleaf templates to React components

 ## Important Notes

@@ -203,12 +108,6 @@ return useToolOperation({
  - **Backend**: Designed to be stateless - files are processed in memory/temp locations only
  - **Frontend**: Uses IndexedDB for client-side file storage and caching (with thumbnails)
 - **Security**: When `DOCKER_ENABLE_SECURITY=false`, security-related classes are excluded from compilation
- **FileContext**: All file operations MUST go through FileContext - never bypass with direct File handling
- **Memory Management**: Manual cleanup required for PDF.js documents and blob URLs - don't remove cleanup code
- **Tool Development**: New tools should follow `useToolOperation` hook pattern (see `useCompressOperation.ts`)
- **Performance Target**: Must handle PDFs up to 100GB+ without browser crashes
- **Preview System**: Tools can preview results without polluting main file context (see Split tool implementation)
- **Adding Tools**: See `ADDING_TOOLS.md` for complete guide to creating new PDF tools

 ## Communication Style
 - Be direct and to the point
@@ -25,7 +25,7 @@ Please make sure your Pull Request adheres to the following guidelines:

 ## Translations

-If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](devGuide/HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it!
+If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it!

 ## Docs

@@ -37,18 +37,7 @@ First, make sure you've read the section [Pull Requests](#pull-requests).

 If, at any point in time, you have a question, please feel free to ask in the same issue thread or in our [Discord](https://discord.gg/FJUSXUSYec).

-## Developer Documentation
-
-For technical guides, setup instructions, and development resources, please see our [Developer Documentation](devGuide/) which includes:
-
- [Developer Guide](devGuide/DeveloperGuide.md) - Main setup and architecture guide
- [Exception Handling Guide](devGuide/EXCEPTION_HANDLING_GUIDE.md) - Error handling patterns and i18n
- [Translation Guide](devGuide/HowToAddNewLanguage.md) - Adding new languages
- And more in the [devGuide folder](devGuide/)
-
-For configuration and usage guides, see:
- [Database Guide](DATABASE.md) - Database setup and configuration
- [OCR Guide](HowToUseOCR.md) - OCR setup and configuration
+Developers should review our [Developer Guide](DeveloperGuide.md)

 ## License

@@ -10,7 +10,7 @@ Fork Stirling-PDF and create a new branch out of `main`.

 Then add a reference to the language in the navbar by adding a new language entry to the dropdown:

- Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/app/core/src/main/resources/templates/fragments/languages.html)
+- Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/stirling-pdf/src/main/resources/templates/fragments/languages.html)


 For example, to add Polish, you would add:
@@ -25,7 +25,7 @@ The `data-bs-language-code` is the code used to reference the file in the next s

 Start by copying the existing English property file:

- [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/app/core/src/main/resources/messages_en_GB.properties)
+- [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/stirling-pdf/src/main/resources/messages_en_GB.properties)

 Copy and rename it to `messages_{your data-bs-language-code here}.properties`. In the Polish example, you would set the name to `messages_pl_PL.properties`.

@@ -62,15 +62,15 @@ Make sure to place the entry under the correct language section. This helps main
 #### Windows command

 ```powershell
-python .github/scripts/check_language_properties.py --reference-file app\core\src\main\resources\messages_en_GB.properties --branch "" --files app\core\src\main\resources\messages_pl_PL.properties
+python .github/scripts/check_language_properties.py --reference-file stirling-pdf\src\main\resources\messages_en_GB.properties --branch "" --files stirling-pdf\src\main\resources\messages_pl_PL.properties

-python .github/scripts/check_language_properties.py --reference-file app\core\src\main\resources\messages_en_GB.properties --branch "" --check-file app\core\src\main\resources\messages_pl_PL.properties
+python .github/scripts/check_language_properties.py --reference-file stirling-pdf\src\main\resources\messages_en_GB.properties --branch "" --check-file stirling-pdf\src\main\resources\messages_pl_PL.properties
 ```

 #### Linux command

 ```bash
-python3 .github/scripts/check_language_properties.py --reference-file app/core/src/main/resources/messages_en_GB.properties --branch "" --files app/core/src/main/resources/messages_pl_PL.properties
+python3 .github/scripts/check_language_properties.py --reference-file stirling-pdf/src/main/resources/messages_en_GB.properties --branch "" --files stirling-pdf/src/main/resources/messages_pl_PL.properties

-python3 .github/scripts/check_language_properties.py --reference-file app/core/src/main/resources/messages_en_GB.properties --branch "" --check-file app/core/src/main/resources/messages_pl_PL.properties
+python3 .github/scripts/check_language_properties.py --reference-file stirling-pdf/src/main/resources/messages_en_GB.properties --branch "" --check-file stirling-pdf/src/main/resources/messages_pl_PL.properties
 ```
@@ -4,8 +4,8 @@ Copyright (c) 2025 Stirling PDF Inc.

 Portions of this software are licensed as follows:

-* All content that resides under the "app/proprietary/" directory of this repository,
-if that directory exists, is licensed under the license defined in "app/proprietary/LICENSE".
+* All content that resides under the "proprietary/" directory of this repository,
+if that directory exists, is licensed under the license defined in "proprietary/LICENSE".
 * Content outside of the above mentioned directories or restrictions above is
 available under the MIT License as defined below.

@@ -29,7 +29,7 @@ All documentation available at [https://docs.stirlingpdf.com/](https://docs.stir
 - API for integration with external scripts
 - Optional Login and Authentication support (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/System%20and%20Security) for documentation)
 - Database Backup and Import (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/DATABASE) for documentation)
- Enterprise features like SSO (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/Single%20Sign-On%20Configuration) for documentation)
+- Enterprise features like SSO see [here](https://docs.stirlingpdf.com/Enterprise%20Edition)

 ## PDF Features

@@ -116,47 +116,47 @@ Stirling-PDF currently supports 40 languages!

 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![61%](https://geps.dev/progress/61)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![62%](https://geps.dev/progress/62)   |
-| Basque (Euskara) (eu_ES)                     | ![36%](https://geps.dev/progress/36)   |
-| Bulgarian (Български) (bg_BG)                | ![68%](https://geps.dev/progress/68)   |
-| Catalan (Català) (ca_CA)                     | ![68%](https://geps.dev/progress/68)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![60%](https://geps.dev/progress/60)   |
-| Czech (Česky) (cs_CZ)                        | ![70%](https://geps.dev/progress/70)   |
-| Danish (Dansk) (da_DK)                       | ![61%](https://geps.dev/progress/61)   |
-| Dutch (Nederlands) (nl_NL)                   | ![60%](https://geps.dev/progress/60)   |
+| Arabic (العربية) (ar_AR)                        | ![65%](https://geps.dev/progress/65)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![65%](https://geps.dev/progress/65)   |
+| Basque (Euskara) (eu_ES)                     | ![38%](https://geps.dev/progress/38)   |
+| Bulgarian (Български) (bg_BG)                | ![72%](https://geps.dev/progress/72)   |
+| Catalan (Català) (ca_CA)                     | ![71%](https://geps.dev/progress/71)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![64%](https://geps.dev/progress/64)   |
+| Czech (Česky) (cs_CZ)                        | ![74%](https://geps.dev/progress/74)   |
+| Danish (Dansk) (da_DK)                       | ![65%](https://geps.dev/progress/65)   |
+| Dutch (Nederlands) (nl_NL)                   | ![63%](https://geps.dev/progress/63)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![89%](https://geps.dev/progress/89)   |
-| German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
-| Greek (Ελληνικά) (el_GR)                     | ![67%](https://geps.dev/progress/67)   |
-| Hindi (हिंदी) (hi_IN)                          | ![67%](https://geps.dev/progress/67)   |
+| French (Français) (fr_FR)                    | ![73%](https://geps.dev/progress/73)   |
+| German (Deutsch) (de_DE)                     | ![92%](https://geps.dev/progress/92)   |
+| Greek (Ελληνικά) (el_GR)                     | ![71%](https://geps.dev/progress/71)   |
+| Hindi (हिंदी) (hi_IN)                          | ![71%](https://geps.dev/progress/71)   |
 | Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![62%](https://geps.dev/progress/62)   |
-| Irish (Gaeilge) (ga_IE)                      | ![68%](https://geps.dev/progress/68)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![65%](https://geps.dev/progress/65)   |
+| Irish (Gaeilge) (ga_IE)                      | ![72%](https://geps.dev/progress/72)   |
 | Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
-| Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
-| Korean (한국어) (ko_KR)                      | ![67%](https://geps.dev/progress/67)   |
-| Norwegian (Norsk) (no_NB)                    | ![66%](https://geps.dev/progress/66)   |
-| Persian (فارسی) (fa_IR)                      | ![64%](https://geps.dev/progress/64)   |
-| Polish (Polski) (pl_PL)                      | ![72%](https://geps.dev/progress/72)   |
-| Portuguese (Português) (pt_PT)               | ![69%](https://geps.dev/progress/69)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![76%](https://geps.dev/progress/76)   |
-| Romanian (Română) (ro_RO)                    | ![57%](https://geps.dev/progress/57)   |
-| Russian (Русский) (ru_RU)                    | ![88%](https://geps.dev/progress/88)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![95%](https://geps.dev/progress/95)   |
+| Japanese (日本語) (ja_JP)                    | ![72%](https://geps.dev/progress/72)   |
+| Korean (한국어) (ko_KR)                      | ![71%](https://geps.dev/progress/71)   |
+| Norwegian (Norsk) (no_NB)                    | ![70%](https://geps.dev/progress/70)   |
+| Persian (فارسی) (fa_IR)                      | ![68%](https://geps.dev/progress/68)   |
+| Polish (Polski) (pl_PL)                      | ![76%](https://geps.dev/progress/76)   |
+| Portuguese (Português) (pt_PT)               | ![72%](https://geps.dev/progress/72)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![80%](https://geps.dev/progress/80)   |
+| Romanian (Română) (ro_RO)                    | ![61%](https://geps.dev/progress/61)   |
+| Russian (Русский) (ru_RU)                    | ![72%](https://geps.dev/progress/72)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![46%](https://geps.dev/progress/46)   |
 | Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
-| Slovakian (Slovensky) (sk_SK)                | ![51%](https://geps.dev/progress/51)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![71%](https://geps.dev/progress/71)   |
-| Spanish (Español) (es_ES)                    | ![74%](https://geps.dev/progress/74)   |
-| Swedish (Svenska) (sv_SE)                    | ![65%](https://geps.dev/progress/65)   |
-| Thai (ไทย) (th_TH)                           | ![59%](https://geps.dev/progress/59)   |
-| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![65%](https://geps.dev/progress/65) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![97%](https://geps.dev/progress/97)   |
-| Turkish (Türkçe) (tr_TR)                     | ![80%](https://geps.dev/progress/80)   |
-| Ukrainian (Українська) (uk_UA)               | ![71%](https://geps.dev/progress/71)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![57%](https://geps.dev/progress/57)   |
-| Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |
+| Slovakian (Slovensky) (sk_SK)                | ![54%](https://geps.dev/progress/54)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![75%](https://geps.dev/progress/75)   |
+| Spanish (Español) (es_ES)                    | ![78%](https://geps.dev/progress/78)   |
+| Swedish (Svenska) (sv_SE)                    | ![69%](https://geps.dev/progress/69)   |
+| Thai (ไทย) (th_TH)                           | ![62%](https://geps.dev/progress/62)   |
+| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![68%](https://geps.dev/progress/68) |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![80%](https://geps.dev/progress/80)   |
+| Turkish (Türkçe) (tr_TR)                     | ![85%](https://geps.dev/progress/85)   |
+| Ukrainian (Українська) (uk_UA)               | ![75%](https://geps.dev/progress/75)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![60%](https://geps.dev/progress/60)   |
+| Malayalam (മലയാളം) (ml_IN)              | ![77%](https://geps.dev/progress/77)   |

 ## Stirling PDF Enterprise

@@ -168,7 +168,7 @@ Check out our [Enterprise docs](https://docs.stirlingpdf.com/Pro)

 Join our community:
 - [Contribution Guidelines](CONTRIBUTING.md)
- [Translation Guide (How to add custom languages)](devGuide/HowToAddNewLanguage.md)
- [Developer Guide](devGuide/DeveloperGuide.md)
+- [Translation Guide (How to add custom languages)](HowToAddNewLanguage.md)
 - [Issue Tracker](https://github.com/Stirling-Tools/Stirling-PDF/issues)
 - [Discord Community](https://discord.gg/HYmhKj45pU)
+- [Developer Guide](DeveloperGuide.md)
@@ -1,26 +0,0 @@
-package stirling.software.common.model.job;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/** Represents a single file result from a job execution */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResultFile {
-
-    /** The file ID for accessing the file */
-    private String fileId;
-
-    /** The original file name */
-    private String fileName;
-
-    /** MIME type of the file */
-    private String contentType;
-
-    /** Size of the file in bytes */
-    private long fileSize;
-}
@@ -1,208 +0,0 @@
-package stirling.software.common.service;
-
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.regex.Pattern;
-
-import org.springframework.stereotype.Service;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class SsrfProtectionService {
-
-    private final ApplicationProperties applicationProperties;
-
-    private static final Pattern DATA_URL_PATTERN =
-            Pattern.compile("^data:.*", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FRAGMENT_PATTERN = Pattern.compile("^#.*");
-
-    public enum SsrfProtectionLevel {
-        OFF, // No SSRF protection - allows all URLs
-        MEDIUM, // Block internal networks but allow external URLs
-        MAX // Block all external URLs - only data: and fragments
-    }
-
-    public boolean isUrlAllowed(String url) {
-        ApplicationProperties.Html.UrlSecurity config =
-                applicationProperties.getSystem().getHtml().getUrlSecurity();
-
-        if (!config.isEnabled()) {
-            return true;
-        }
-
-        if (url == null || url.trim().isEmpty()) {
-            return false;
-        }
-
-        String trimmedUrl = url.trim();
-
-        // Always allow data URLs and fragments
-        if (DATA_URL_PATTERN.matcher(trimmedUrl).matches()
-                || FRAGMENT_PATTERN.matcher(trimmedUrl).matches()) {
-            return true;
-        }
-
-        SsrfProtectionLevel level = parseProtectionLevel(config.getLevel());
-
-        switch (level) {
-            case OFF:
-                return true;
-            case MAX:
-                return isMaxSecurityAllowed(trimmedUrl, config);
-            case MEDIUM:
-                return isMediumSecurityAllowed(trimmedUrl, config);
-            default:
-                return false;
-        }
-    }
-
-    private SsrfProtectionLevel parseProtectionLevel(String level) {
-        try {
-            return SsrfProtectionLevel.valueOf(level.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            log.warn("Invalid SSRF protection level '{}', defaulting to MEDIUM", level);
-            return SsrfProtectionLevel.MEDIUM;
-        }
-    }
-
-    private boolean isMaxSecurityAllowed(
-            String url, ApplicationProperties.Html.UrlSecurity config) {
-        // MAX security: only allow explicitly whitelisted domains
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-
-            if (host == null) {
-                return false;
-            }
-
-            return config.getAllowedDomains().contains(host.toLowerCase());
-
-        } catch (Exception e) {
-            log.debug("Failed to parse URL for MAX security check: {}", url, e);
-            return false;
-        }
-    }
-
-    private boolean isMediumSecurityAllowed(
-            String url, ApplicationProperties.Html.UrlSecurity config) {
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-
-            if (host == null) {
-                return false;
-            }
-
-            String hostLower = host.toLowerCase();
-
-            // Check explicit blocked domains
-            if (config.getBlockedDomains().contains(hostLower)) {
-                log.debug("URL blocked by explicit domain blocklist: {}", url);
-                return false;
-            }
-
-            // Check internal TLD patterns
-            for (String tld : config.getInternalTlds()) {
-                if (hostLower.endsWith(tld.toLowerCase())) {
-                    log.debug("URL blocked by internal TLD pattern '{}': {}", tld, url);
-                    return false;
-                }
-            }
-
-            // If allowedDomains is specified, only allow those
-            if (!config.getAllowedDomains().isEmpty()) {
-                boolean isAllowed =
-                        config.getAllowedDomains().stream()
-                                .anyMatch(
-                                        domain ->
-                                                hostLower.equals(domain.toLowerCase())
-                                                        || hostLower.endsWith(
-                                                                "." + domain.toLowerCase()));
-
-                if (!isAllowed) {
-                    log.debug("URL not in allowed domains list: {}", url);
-                    return false;
-                }
-            }
-
-            // Resolve hostname to IP address for network-based checks
-            try {
-                InetAddress address = InetAddress.getByName(host);
-
-                if (config.isBlockPrivateNetworks() && isPrivateAddress(address)) {
-                    log.debug("URL blocked - private network address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockLocalhost() && address.isLoopbackAddress()) {
-                    log.debug("URL blocked - localhost address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockLinkLocal() && address.isLinkLocalAddress()) {
-                    log.debug("URL blocked - link-local address: {}", url);
-                    return false;
-                }
-
-                if (config.isBlockCloudMetadata()
-                        && isCloudMetadataAddress(address.getHostAddress())) {
-                    log.debug("URL blocked - cloud metadata endpoint: {}", url);
-                    return false;
-                }
-
-            } catch (UnknownHostException e) {
-                log.debug("Failed to resolve hostname for SSRF check: {}", host, e);
-                return false;
-            }
-
-            return true;
-
-        } catch (Exception e) {
-            log.debug("Failed to parse URL for MEDIUM security check: {}", url, e);
-            return false;
-        }
-    }
-
-    private boolean isPrivateAddress(InetAddress address) {
-        return address.isSiteLocalAddress()
-                || address.isAnyLocalAddress()
-                || isPrivateIPv4Range(address.getHostAddress());
-    }
-
-    private boolean isPrivateIPv4Range(String ip) {
-        return ip.startsWith("10.")
-                || ip.startsWith("192.168.")
-                || (ip.startsWith("172.") && isInRange172(ip))
-                || ip.startsWith("127.")
-                || "0.0.0.0".equals(ip);
-    }
-
-    private boolean isInRange172(String ip) {
-        String[] parts = ip.split("\\.");
-        if (parts.length >= 2) {
-            try {
-                int secondOctet = Integer.parseInt(parts[1]);
-                return secondOctet >= 16 && secondOctet <= 31;
-            } catch (NumberFormatException e) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    private boolean isCloudMetadataAddress(String ip) {
-        // Cloud metadata endpoints for AWS, GCP, Azure, Oracle Cloud, and IBM Cloud
-        return ip.startsWith("169.254.169.254") // AWS/GCP/Azure
-                || ip.startsWith("fd00:ec2::254") // AWS IPv6
-                || ip.startsWith("169.254.169.253") // Oracle Cloud
-                || ip.startsWith("169.254.169.250"); // IBM Cloud
-    }
-}
@@ -1,71 +0,0 @@
-package stirling.software.common.util;
-
-import org.owasp.html.AttributePolicy;
-import org.owasp.html.HtmlPolicyBuilder;
-import org.owasp.html.PolicyFactory;
-import org.owasp.html.Sanitizers;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.SsrfProtectionService;
-
-@Component
-public class CustomHtmlSanitizer {
-
-    private final SsrfProtectionService ssrfProtectionService;
-    private final ApplicationProperties applicationProperties;
-
-    @Autowired
-    public CustomHtmlSanitizer(
-            SsrfProtectionService ssrfProtectionService,
-            ApplicationProperties applicationProperties) {
-        this.ssrfProtectionService = ssrfProtectionService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    private final AttributePolicy SSRF_SAFE_URL_POLICY =
-            new AttributePolicy() {
-                @Override
-                public String apply(String elementName, String attributeName, String value) {
-                    if (value == null || value.trim().isEmpty()) {
-                        return null;
-                    }
-
-                    String trimmedValue = value.trim();
-
-                    // Use the SSRF protection service to validate the URL
-                    if (ssrfProtectionService != null
-                            && !ssrfProtectionService.isUrlAllowed(trimmedValue)) {
-                        return null;
-                    }
-
-                    return trimmedValue;
-                }
-            };
-
-    private final PolicyFactory SSRF_SAFE_IMAGES_POLICY =
-            new HtmlPolicyBuilder()
-                    .allowElements("img")
-                    .allowAttributes("alt", "width", "height", "title")
-                    .onElements("img")
-                    .allowAttributes("src")
-                    .matching(SSRF_SAFE_URL_POLICY)
-                    .onElements("img")
-                    .toFactory();
-
-    private final PolicyFactory POLICY =
-            Sanitizers.FORMATTING
-                    .and(Sanitizers.BLOCKS)
-                    .and(Sanitizers.STYLES)
-                    .and(Sanitizers.LINKS)
-                    .and(Sanitizers.TABLES)
-                    .and(SSRF_SAFE_IMAGES_POLICY)
-                    .and(new HtmlPolicyBuilder().disallowElements("noscript").toFactory());
-
-    public String sanitize(String html) {
-        boolean disableSanitize =
-                Boolean.TRUE.equals(applicationProperties.getSystem().getDisableSanitize());
-        return disableSanitize ? html : POLICY.sanitize(html);
-    }
-}
@@ -1,652 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import lombok.Data;
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-
-@UtilityClass
-public class EmlParser {
-
-    private static volatile Boolean jakartaMailAvailable = null;
-    private static volatile Method mimeUtilityDecodeTextMethod = null;
-    private static volatile boolean mimeUtilityChecked = false;
-
-    private static final Pattern MIME_ENCODED_PATTERN =
-            Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-
-    private static final String DISPOSITION_ATTACHMENT = "attachment";
-    private static final String TEXT_PLAIN = "text/plain";
-    private static final String TEXT_HTML = "text/html";
-    private static final String MULTIPART_PREFIX = "multipart/";
-
-    private static final String HEADER_CONTENT_TYPE = "content-type:";
-    private static final String HEADER_CONTENT_DISPOSITION = "content-disposition:";
-    private static final String HEADER_CONTENT_TRANSFER_ENCODING = "content-transfer-encoding:";
-    private static final String HEADER_CONTENT_ID = "Content-ID";
-    private static final String HEADER_SUBJECT = "Subject:";
-    private static final String HEADER_FROM = "From:";
-    private static final String HEADER_TO = "To:";
-    private static final String HEADER_CC = "Cc:";
-    private static final String HEADER_BCC = "Bcc:";
-    private static final String HEADER_DATE = "Date:";
-
-    private static synchronized boolean isJakartaMailAvailable() {
-        if (jakartaMailAvailable == null) {
-            try {
-                Class.forName("jakarta.mail.internet.MimeMessage");
-                Class.forName("jakarta.mail.Session");
-                Class.forName("jakarta.mail.internet.MimeUtility");
-                Class.forName("jakarta.mail.internet.MimePart");
-                Class.forName("jakarta.mail.internet.MimeMultipart");
-                Class.forName("jakarta.mail.Multipart");
-                Class.forName("jakarta.mail.Part");
-                jakartaMailAvailable = true;
-            } catch (ClassNotFoundException e) {
-                jakartaMailAvailable = false;
-            }
-        }
-        return jakartaMailAvailable;
-    }
-
-    public static EmailContent extractEmailContent(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException {
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        if (isJakartaMailAvailable()) {
-            return extractEmailContentAdvanced(emlBytes, request, customHtmlSanitizer);
-        } else {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
-        }
-    }
-
-    private static EmailContent extractEmailContentBasic(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        String emlContent = new String(emlBytes, StandardCharsets.UTF_8);
-        EmailContent content = new EmailContent();
-
-        content.setSubject(extractBasicHeader(emlContent, HEADER_SUBJECT));
-        content.setFrom(extractBasicHeader(emlContent, HEADER_FROM));
-        content.setTo(extractBasicHeader(emlContent, HEADER_TO));
-        content.setCc(extractBasicHeader(emlContent, HEADER_CC));
-        content.setBcc(extractBasicHeader(emlContent, HEADER_BCC));
-
-        String dateStr = extractBasicHeader(emlContent, HEADER_DATE);
-        if (!dateStr.isEmpty()) {
-            content.setDateString(dateStr);
-        }
-
-        String htmlBody = extractHtmlBody(emlContent);
-        if (htmlBody != null) {
-            content.setHtmlBody(htmlBody);
-        } else {
-            String textBody = extractTextBody(emlContent);
-            content.setTextBody(textBody != null ? textBody : "Email content could not be parsed");
-        }
-
-        content.getAttachments().addAll(extractAttachmentsBasic(emlContent));
-
-        return content;
-    }
-
-    private static EmailContent extractEmailContentAdvanced(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        try {
-            Class<?> sessionClass = Class.forName("jakarta.mail.Session");
-            Class<?> mimeMessageClass = Class.forName("jakarta.mail.internet.MimeMessage");
-
-            Method getDefaultInstance =
-                    sessionClass.getMethod("getDefaultInstance", Properties.class);
-            Object session = getDefaultInstance.invoke(null, new Properties());
-
-            Class<?>[] constructorArgs = new Class<?>[] {sessionClass, InputStream.class};
-            Constructor<?> mimeMessageConstructor =
-                    mimeMessageClass.getConstructor(constructorArgs);
-            Object message =
-                    mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
-
-            return extractFromMimeMessage(message, request, customHtmlSanitizer);
-
-        } catch (ReflectiveOperationException e) {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
-        }
-    }
-
-    private static EmailContent extractFromMimeMessage(
-            Object message, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
-        EmailContent content = new EmailContent();
-
-        try {
-            Class<?> messageClass = message.getClass();
-
-            Method getSubject = messageClass.getMethod("getSubject");
-            String subject = (String) getSubject.invoke(message);
-            content.setSubject(subject != null ? safeMimeDecode(subject) : "No Subject");
-
-            Method getFrom = messageClass.getMethod("getFrom");
-            Object[] fromAddresses = (Object[]) getFrom.invoke(message);
-            content.setFrom(buildAddressString(fromAddresses));
-
-            extractRecipients(message, messageClass, content);
-
-            Method getSentDate = messageClass.getMethod("getSentDate");
-            content.setDate((Date) getSentDate.invoke(message));
-
-            Method getContent = messageClass.getMethod("getContent");
-            Object messageContent = getContent.invoke(message);
-
-            processMessageContent(message, messageContent, content, request, customHtmlSanitizer);
-
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            content.setSubject("Email Conversion");
-            content.setFrom("Unknown");
-            content.setTo("Unknown");
-            content.setCc("");
-            content.setBcc("");
-            content.setTextBody("Email content could not be parsed with advanced processing");
-        }
-
-        return content;
-    }
-
-    private static void extractRecipients(
-            Object message, Class<?> messageClass, EmailContent content) {
-        try {
-            Method getRecipients =
-                    messageClass.getMethod(
-                            "getRecipients", Class.forName("jakarta.mail.Message$RecipientType"));
-            Class<?> recipientTypeClass = Class.forName("jakarta.mail.Message$RecipientType");
-
-            Object toType = recipientTypeClass.getField("TO").get(null);
-            Object[] toRecipients = (Object[]) getRecipients.invoke(message, toType);
-            content.setTo(buildAddressString(toRecipients));
-
-            Object ccType = recipientTypeClass.getField("CC").get(null);
-            Object[] ccRecipients = (Object[]) getRecipients.invoke(message, ccType);
-            content.setCc(buildAddressString(ccRecipients));
-
-            Object bccType = recipientTypeClass.getField("BCC").get(null);
-            Object[] bccRecipients = (Object[]) getRecipients.invoke(message, bccType);
-            content.setBcc(buildAddressString(bccRecipients));
-
-        } catch (ReflectiveOperationException e) {
-            try {
-                Method getAllRecipients = messageClass.getMethod("getAllRecipients");
-                Object[] recipients = (Object[]) getAllRecipients.invoke(message);
-                content.setTo(buildAddressString(recipients));
-                content.setCc("");
-                content.setBcc("");
-            } catch (ReflectiveOperationException ex) {
-                content.setTo("");
-                content.setCc("");
-                content.setBcc("");
-            }
-        }
-    }
-
-    private static String buildAddressString(Object[] addresses) {
-        if (addresses == null || addresses.length == 0) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < addresses.length; i++) {
-            if (i > 0) builder.append(", ");
-            builder.append(safeMimeDecode(addresses[i].toString()));
-        }
-        return builder.toString();
-    }
-
-    private static void processMessageContent(
-            Object message,
-            Object messageContent,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        try {
-            if (messageContent instanceof String stringContent) {
-                Method getContentType = message.getClass().getMethod("getContentType");
-                String contentType = (String) getContentType.invoke(message);
-
-                if (contentType != null && contentType.toLowerCase().contains(TEXT_HTML)) {
-                    content.setHtmlBody(stringContent);
-                } else {
-                    content.setTextBody(stringContent);
-                }
-            } else {
-                Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
-                if (multipartClass.isInstance(messageContent)) {
-                    processMultipart(messageContent, content, request, customHtmlSanitizer, 0);
-                }
-            }
-        } catch (ReflectiveOperationException | ClassCastException e) {
-            content.setTextBody("Email content could not be parsed with advanced processing");
-        }
-    }
-
-    private static void processMultipart(
-            Object multipart,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer,
-            int depth) {
-
-        final int MAX_MULTIPART_DEPTH = 10;
-        if (depth > MAX_MULTIPART_DEPTH) {
-            content.setHtmlBody("<div class=\"error\">Maximum multipart depth exceeded</div>");
-            return;
-        }
-
-        try {
-            Class<?> multipartClass = multipart.getClass();
-            Method getCount = multipartClass.getMethod("getCount");
-            int count = (Integer) getCount.invoke(multipart);
-
-            Method getBodyPart = multipartClass.getMethod("getBodyPart", int.class);
-
-            for (int i = 0; i < count; i++) {
-                Object part = getBodyPart.invoke(multipart, i);
-                processPart(part, content, request, customHtmlSanitizer, depth + 1);
-            }
-
-        } catch (ReflectiveOperationException | ClassCastException e) {
-            content.setHtmlBody("<div class=\"error\">Error processing multipart content</div>");
-        }
-    }
-
-    private static void processPart(
-            Object part,
-            EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer,
-            int depth) {
-        try {
-            Class<?> partClass = part.getClass();
-
-            Method isMimeType = partClass.getMethod("isMimeType", String.class);
-            Method getContent = partClass.getMethod("getContent");
-            Method getDisposition = partClass.getMethod("getDisposition");
-            Method getFileName = partClass.getMethod("getFileName");
-            Method getContentType = partClass.getMethod("getContentType");
-            Method getHeader = partClass.getMethod("getHeader", String.class);
-
-            Object disposition = getDisposition.invoke(part);
-            String filename = (String) getFileName.invoke(part);
-            String contentType = (String) getContentType.invoke(part);
-
-            String normalizedDisposition =
-                    disposition != null ? ((String) disposition).toLowerCase() : null;
-
-            if ((Boolean) isMimeType.invoke(part, TEXT_PLAIN) && normalizedDisposition == null) {
-                Object partContent = getContent.invoke(part);
-                if (partContent instanceof String stringContent) {
-                    content.setTextBody(stringContent);
-                }
-            } else if ((Boolean) isMimeType.invoke(part, TEXT_HTML)
-                    && normalizedDisposition == null) {
-                Object partContent = getContent.invoke(part);
-                if (partContent instanceof String stringContent) {
-                    String htmlBody =
-                            customHtmlSanitizer != null
-                                    ? customHtmlSanitizer.sanitize(stringContent)
-                                    : stringContent;
-                    content.setHtmlBody(htmlBody);
-                }
-            } else if ((normalizedDisposition != null
-                            && normalizedDisposition.contains(DISPOSITION_ATTACHMENT))
-                    || (filename != null && !filename.trim().isEmpty())) {
-
-                processAttachment(
-                        part, content, request, getHeader, getContent, filename, contentType);
-            } else if ((Boolean) isMimeType.invoke(part, "multipart/*")) {
-                Object multipartContent = getContent.invoke(part);
-                if (multipartContent != null) {
-                    Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
-                    if (multipartClass.isInstance(multipartContent)) {
-                        processMultipart(
-                                multipartContent, content, request, customHtmlSanitizer, depth + 1);
-                    }
-                }
-            }
-
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            // Continue processing other parts if one fails
-        }
-    }
-
-    private static void processAttachment(
-            Object part,
-            EmailContent content,
-            EmlToPdfRequest request,
-            Method getHeader,
-            Method getContent,
-            String filename,
-            String contentType) {
-
-        content.setAttachmentCount(content.getAttachmentCount() + 1);
-
-        if (filename != null && !filename.trim().isEmpty()) {
-            EmailAttachment attachment = new EmailAttachment();
-            attachment.setFilename(safeMimeDecode(filename));
-            attachment.setContentType(contentType);
-
-            try {
-                String[] contentIdHeaders = (String[]) getHeader.invoke(part, HEADER_CONTENT_ID);
-                if (contentIdHeaders != null) {
-                    for (String contentIdHeader : contentIdHeaders) {
-                        if (contentIdHeader != null && !contentIdHeader.trim().isEmpty()) {
-                            attachment.setEmbedded(true);
-                            String contentId = contentIdHeader.trim().replaceAll("[<>]", "");
-                            attachment.setContentId(contentId);
-                            break;
-                        }
-                    }
-                }
-            } catch (ReflectiveOperationException e) {
-            }
-
-            if ((request != null && request.isIncludeAttachments()) || attachment.isEmbedded()) {
-                extractAttachmentData(part, attachment, getContent, request);
-            }
-
-            content.getAttachments().add(attachment);
-        }
-    }
-
-    private static void extractAttachmentData(
-            Object part, EmailAttachment attachment, Method getContent, EmlToPdfRequest request) {
-        try {
-            Object attachmentContent = getContent.invoke(part);
-            byte[] attachmentData = null;
-
-            if (attachmentContent instanceof InputStream inputStream) {
-                try (InputStream stream = inputStream) {
-                    attachmentData = stream.readAllBytes();
-                } catch (IOException e) {
-                    if (attachment.isEmbedded()) {
-                        attachmentData = new byte[0];
-                    } else {
-                        throw new RuntimeException(e);
-                    }
-                }
-            } else if (attachmentContent instanceof byte[] byteArray) {
-                attachmentData = byteArray;
-            } else if (attachmentContent instanceof String stringContent) {
-                attachmentData = stringContent.getBytes(StandardCharsets.UTF_8);
-            }
-
-            if (attachmentData != null) {
-                long maxSizeMB = request != null ? request.getMaxAttachmentSizeMB() : 10L;
-                long maxSizeBytes = maxSizeMB * 1024 * 1024;
-
-                if (attachmentData.length <= maxSizeBytes || attachment.isEmbedded()) {
-                    attachment.setData(attachmentData);
-                    attachment.setSizeBytes(attachmentData.length);
-                } else {
-                    attachment.setSizeBytes(attachmentData.length);
-                }
-            }
-        } catch (ReflectiveOperationException | RuntimeException e) {
-            // Continue without attachment data
-        }
-    }
-
-    private static String extractBasicHeader(String emlContent, String headerName) {
-        try {
-            String[] lines = emlContent.split("\r?\n");
-            for (int i = 0; i < lines.length; i++) {
-                String line = lines[i];
-                if (line.toLowerCase().startsWith(headerName.toLowerCase())) {
-                    StringBuilder value =
-                            new StringBuilder(line.substring(headerName.length()).trim());
-                    for (int j = i + 1; j < lines.length; j++) {
-                        if (lines[j].startsWith(" ") || lines[j].startsWith("\t")) {
-                            value.append(" ").append(lines[j].trim());
-                        } else {
-                            break;
-                        }
-                    }
-                    return safeMimeDecode(value.toString());
-                }
-                if (line.trim().isEmpty()) break;
-            }
-        } catch (RuntimeException e) {
-            // Ignore errors in header extraction
-        }
-        return "";
-    }
-
-    private static String extractHtmlBody(String emlContent) {
-        try {
-            String lowerContent = emlContent.toLowerCase();
-            int htmlStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_HTML);
-            if (htmlStart == -1) return null;
-
-            int bodyStart = emlContent.indexOf("\r\n\r\n", htmlStart);
-            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", htmlStart);
-            if (bodyStart == -1) return null;
-
-            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-            int bodyEnd = findPartEnd(emlContent, bodyStart);
-
-            return emlContent.substring(bodyStart, bodyEnd).trim();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private static String extractTextBody(String emlContent) {
-        try {
-            String lowerContent = emlContent.toLowerCase();
-            int textStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_PLAIN);
-            if (textStart == -1) {
-                int bodyStart = emlContent.indexOf("\r\n\r\n");
-                if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n");
-                if (bodyStart != -1) {
-                    bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-                    int bodyEnd = findPartEnd(emlContent, bodyStart);
-                    return emlContent.substring(bodyStart, bodyEnd).trim();
-                }
-                return null;
-            }
-
-            int bodyStart = emlContent.indexOf("\r\n\r\n", textStart);
-            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", textStart);
-            if (bodyStart == -1) return null;
-
-            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
-            int bodyEnd = findPartEnd(emlContent, bodyStart);
-
-            return emlContent.substring(bodyStart, bodyEnd).trim();
-        } catch (RuntimeException e) {
-            return null;
-        }
-    }
-
-    private static int findPartEnd(String content, int start) {
-        String[] lines = content.substring(start).split("\r?\n");
-        StringBuilder result = new StringBuilder();
-
-        for (String line : lines) {
-            if (line.startsWith("--") && line.length() > 10) break;
-            result.append(line).append("\n");
-        }
-
-        return start + result.length();
-    }
-
-    private static List<EmailAttachment> extractAttachmentsBasic(String emlContent) {
-        List<EmailAttachment> attachments = new ArrayList<>();
-        try {
-            String[] lines = emlContent.split("\r?\n");
-            boolean inHeaders = true;
-            String currentContentType = "";
-            String currentDisposition = "";
-            String currentFilename = "";
-            String currentEncoding = "";
-
-            for (String line : lines) {
-                String lowerLine = line.toLowerCase().trim();
-
-                if (line.trim().isEmpty()) {
-                    inHeaders = false;
-                    if (isAttachment(currentDisposition, currentFilename, currentContentType)) {
-                        EmailAttachment attachment = new EmailAttachment();
-                        attachment.setFilename(currentFilename);
-                        attachment.setContentType(currentContentType);
-                        attachment.setTransferEncoding(currentEncoding);
-                        attachments.add(attachment);
-                    }
-                    currentContentType = "";
-                    currentDisposition = "";
-                    currentFilename = "";
-                    currentEncoding = "";
-                    inHeaders = true;
-                    continue;
-                }
-
-                if (!inHeaders) continue;
-
-                if (lowerLine.startsWith(HEADER_CONTENT_TYPE)) {
-                    currentContentType = line.substring(HEADER_CONTENT_TYPE.length()).trim();
-                } else if (lowerLine.startsWith(HEADER_CONTENT_DISPOSITION)) {
-                    currentDisposition = line.substring(HEADER_CONTENT_DISPOSITION.length()).trim();
-                    currentFilename = extractFilenameFromDisposition(currentDisposition);
-                } else if (lowerLine.startsWith(HEADER_CONTENT_TRANSFER_ENCODING)) {
-                    currentEncoding =
-                            line.substring(HEADER_CONTENT_TRANSFER_ENCODING.length()).trim();
-                }
-            }
-        } catch (RuntimeException e) {
-            // Continue with empty list
-        }
-        return attachments;
-    }
-
-    private static boolean isAttachment(String disposition, String filename, String contentType) {
-        return (disposition.toLowerCase().contains(DISPOSITION_ATTACHMENT) && !filename.isEmpty())
-                || (!filename.isEmpty() && !contentType.toLowerCase().startsWith("text/"))
-                || (contentType.toLowerCase().contains("application/") && !filename.isEmpty());
-    }
-
-    private static String extractFilenameFromDisposition(String disposition) {
-        if (disposition == null || !disposition.contains("filename=")) {
-            return "";
-        }
-
-        // Handle filename*= (RFC 2231 encoded filename)
-        if (disposition.toLowerCase().contains("filename*=")) {
-            int filenameStarStart = disposition.toLowerCase().indexOf("filename*=") + 10;
-            int filenameStarEnd = disposition.indexOf(";", filenameStarStart);
-            if (filenameStarEnd == -1) filenameStarEnd = disposition.length();
-            String extendedFilename =
-                    disposition.substring(filenameStarStart, filenameStarEnd).trim();
-            extendedFilename = extendedFilename.replaceAll("^\"|\"$", "");
-
-            if (extendedFilename.contains("'")) {
-                String[] parts = extendedFilename.split("'", 3);
-                if (parts.length == 3) {
-                    return EmlProcessingUtils.decodeUrlEncoded(parts[2]);
-                }
-            }
-        }
-
-        // Handle regular filename=
-        int filenameStart = disposition.toLowerCase().indexOf("filename=") + 9;
-        int filenameEnd = disposition.indexOf(";", filenameStart);
-        if (filenameEnd == -1) filenameEnd = disposition.length();
-        String filename = disposition.substring(filenameStart, filenameEnd).trim();
-        filename = filename.replaceAll("^\"|\"$", "");
-        return safeMimeDecode(filename);
-    }
-
-    public static String safeMimeDecode(String headerValue) {
-        if (headerValue == null || headerValue.trim().isEmpty()) {
-            return "";
-        }
-
-        if (!mimeUtilityChecked) {
-            synchronized (EmlParser.class) {
-                if (!mimeUtilityChecked) {
-                    initializeMimeUtilityDecoding();
-                }
-            }
-        }
-
-        if (mimeUtilityDecodeTextMethod != null) {
-            try {
-                return (String) mimeUtilityDecodeTextMethod.invoke(null, headerValue.trim());
-            } catch (ReflectiveOperationException | RuntimeException e) {
-                // Fall through to custom implementation
-            }
-        }
-
-        return EmlProcessingUtils.decodeMimeHeader(headerValue.trim());
-    }
-
-    private static void initializeMimeUtilityDecoding() {
-        try {
-            Class<?> mimeUtilityClass = Class.forName("jakarta.mail.internet.MimeUtility");
-            mimeUtilityDecodeTextMethod = mimeUtilityClass.getMethod("decodeText", String.class);
-        } catch (ClassNotFoundException | NoSuchMethodException e) {
-            mimeUtilityDecodeTextMethod = null;
-        }
-        mimeUtilityChecked = true;
-    }
-
-    @Data
-    public static class EmailContent {
-        private String subject;
-        private String from;
-        private String to;
-        private String cc;
-        private String bcc;
-        private Date date;
-        private String dateString; // For basic parsing fallback
-        private String htmlBody;
-        private String textBody;
-        private int attachmentCount;
-        private List<EmailAttachment> attachments = new ArrayList<>();
-
-        public void setHtmlBody(String htmlBody) {
-            this.htmlBody = htmlBody != null ? htmlBody.replaceAll("\r", "") : null;
-        }
-
-        public void setTextBody(String textBody) {
-            this.textBody = textBody != null ? textBody.replaceAll("\r", "") : null;
-        }
-    }
-
-    @Data
-    public static class EmailAttachment {
-        private String filename;
-        private String contentType;
-        private byte[] data;
-        private boolean embedded;
-        private String embeddedFilename;
-        private long sizeBytes;
-        private String contentId;
-        private String disposition;
-        private String transferEncoding;
-
-        public void setData(byte[] data) {
-            this.data = data;
-            if (data != null) {
-                this.sizeBytes = data.length;
-            }
-        }
-    }
-}
@@ -1,601 +0,0 @@
-package stirling.software.common.util;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-import stirling.software.common.model.api.converters.HTMLToPdfRequest;
-
-@UtilityClass
-public class EmlProcessingUtils {
-
-    // Style constants
-    private static final int DEFAULT_FONT_SIZE = 12;
-    private static final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif";
-    private static final float DEFAULT_LINE_HEIGHT = 1.4f;
-    private static final String DEFAULT_ZOOM = "1.0";
-    private static final String DEFAULT_TEXT_COLOR = "#202124";
-    private static final String DEFAULT_BACKGROUND_COLOR = "#ffffff";
-    private static final String DEFAULT_BORDER_COLOR = "#e8eaed";
-    private static final String ATTACHMENT_BACKGROUND_COLOR = "#f9f9f9";
-    private static final String ATTACHMENT_BORDER_COLOR = "#eeeeee";
-
-    private static final int EML_CHECK_LENGTH = 8192;
-    private static final int MIN_HEADER_COUNT_FOR_VALID_EML = 2;
-
-    // MIME type detection
-    private static final Map<String, String> EXTENSION_TO_MIME_TYPE =
-            Map.of(
-                    ".png", "image/png",
-                    ".jpg", "image/jpeg",
-                    ".jpeg", "image/jpeg",
-                    ".gif", "image/gif",
-                    ".bmp", "image/bmp",
-                    ".webp", "image/webp",
-                    ".svg", "image/svg+xml",
-                    ".ico", "image/x-icon",
-                    ".tiff", "image/tiff",
-                    ".tif", "image/tiff");
-
-    public static void validateEmlInput(byte[] emlBytes) {
-        if (emlBytes == null || emlBytes.length == 0) {
-            throw new IllegalArgumentException("EML file is empty or null");
-        }
-
-        if (isInvalidEmlFormat(emlBytes)) {
-            throw new IllegalArgumentException("Invalid EML file format");
-        }
-    }
-
-    private static boolean isInvalidEmlFormat(byte[] emlBytes) {
-        try {
-            int checkLength = Math.min(emlBytes.length, EML_CHECK_LENGTH);
-            String content;
-
-            try {
-                content = new String(emlBytes, 0, checkLength, StandardCharsets.UTF_8);
-                if (content.contains("\uFFFD")) {
-                    content = new String(emlBytes, 0, checkLength, StandardCharsets.ISO_8859_1);
-                }
-            } catch (Exception e) {
-                content = new String(emlBytes, 0, checkLength, StandardCharsets.ISO_8859_1);
-            }
-
-            String lowerContent = content.toLowerCase(Locale.ROOT);
-
-            boolean hasFrom =
-                    lowerContent.contains("from:") || lowerContent.contains("return-path:");
-            boolean hasSubject = lowerContent.contains("subject:");
-            boolean hasMessageId = lowerContent.contains("message-id:");
-            boolean hasDate = lowerContent.contains("date:");
-            boolean hasTo =
-                    lowerContent.contains("to:")
-                            || lowerContent.contains("cc:")
-                            || lowerContent.contains("bcc:");
-            boolean hasMimeStructure =
-                    lowerContent.contains("multipart/")
-                            || lowerContent.contains("text/plain")
-                            || lowerContent.contains("text/html")
-                            || lowerContent.contains("boundary=");
-
-            int headerCount = 0;
-            if (hasFrom) headerCount++;
-            if (hasSubject) headerCount++;
-            if (hasMessageId) headerCount++;
-            if (hasDate) headerCount++;
-            if (hasTo) headerCount++;
-
-            return headerCount < MIN_HEADER_COUNT_FOR_VALID_EML && !hasMimeStructure;
-
-        } catch (RuntimeException e) {
-            return false;
-        }
-    }
-
-    public static String generateEnhancedEmailHtml(
-            EmlParser.EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        StringBuilder html = new StringBuilder();
-
-        html.append(
-                String.format(
-                        """
-                <!DOCTYPE html>
-                <html lang="en"><head><meta charset="UTF-8">
-                <title>%s</title>
-                <style>
-                """,
-                        sanitizeText(content.getSubject(), customHtmlSanitizer)));
-
-        appendEnhancedStyles(html);
-
-        html.append(
-                """
-                </style>
-                </head><body>
-                """);
-
-        html.append(
-                String.format(
-                        """
-                <div class="email-container">
-                <div class="email-header">
-                <h1>%s</h1>
-                <div class="email-meta">
-                <div><strong>From:</strong> %s</div>
-                <div><strong>To:</strong> %s</div>
-                """,
-                        sanitizeText(content.getSubject(), customHtmlSanitizer),
-                        sanitizeText(content.getFrom(), customHtmlSanitizer),
-                        sanitizeText(content.getTo(), customHtmlSanitizer)));
-
-        if (content.getCc() != null && !content.getCc().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>CC:</strong> %s</div>\n",
-                            sanitizeText(content.getCc(), customHtmlSanitizer)));
-        }
-
-        if (content.getBcc() != null && !content.getBcc().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>BCC:</strong> %s</div>\n",
-                            sanitizeText(content.getBcc(), customHtmlSanitizer)));
-        }
-
-        if (content.getDate() != null) {
-            html.append(
-                    String.format(
-                            "<div><strong>Date:</strong> %s</div>\n",
-                            PdfAttachmentHandler.formatEmailDate(content.getDate())));
-        } else if (content.getDateString() != null && !content.getDateString().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div><strong>Date:</strong> %s</div>\n",
-                            sanitizeText(content.getDateString(), customHtmlSanitizer)));
-        }
-
-        html.append("</div></div>\n");
-
-        html.append("<div class=\"email-body\">\n");
-        if (content.getHtmlBody() != null && !content.getHtmlBody().trim().isEmpty()) {
-            String processedHtml =
-                    processEmailHtmlBody(content.getHtmlBody(), content, customHtmlSanitizer);
-            html.append(processedHtml);
-        } else if (content.getTextBody() != null && !content.getTextBody().trim().isEmpty()) {
-            html.append(
-                    String.format(
-                            "<div class=\"text-body\">%s</div>",
-                            convertTextToHtml(content.getTextBody(), customHtmlSanitizer)));
-        } else {
-            html.append("<div class=\"no-content\"><p><em>No content available</em></p></div>");
-        }
-        html.append("</div>\n");
-
-        if (content.getAttachmentCount() > 0 || !content.getAttachments().isEmpty()) {
-            appendAttachmentsSection(html, content, request, customHtmlSanitizer);
-        }
-
-        html.append("</div>\n</body></html>");
-        return html.toString();
-    }
-
-    public static String processEmailHtmlBody(
-            String htmlBody,
-            EmlParser.EmailContent emailContent,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        if (htmlBody == null) return "";
-
-        String processed =
-                customHtmlSanitizer != null ? customHtmlSanitizer.sanitize(htmlBody) : htmlBody;
-
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*fixed[^;]*;?", "");
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*absolute[^;]*;?", "");
-
-        if (emailContent != null && !emailContent.getAttachments().isEmpty()) {
-            processed = PdfAttachmentHandler.processInlineImages(processed, emailContent);
-        }
-
-        return processed;
-    }
-
-    public static String convertTextToHtml(
-            String textBody, CustomHtmlSanitizer customHtmlSanitizer) {
-        if (textBody == null) return "";
-
-        String html =
-                customHtmlSanitizer != null
-                        ? customHtmlSanitizer.sanitize(textBody)
-                        : escapeHtml(textBody);
-
-        html = html.replace("\r\n", "\n").replace("\r", "\n");
-        html = html.replace("\n", "<br>\n");
-
-        html =
-                html.replaceAll(
-                        "(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)",
-                        "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
-
-        html =
-                html.replaceAll(
-                        "([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,63})",
-                        "<a href=\"mailto:$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
-
-        return html;
-    }
-
-    private static void appendEnhancedStyles(StringBuilder html) {
-        String css =
-                String.format(
-                        """
-                body {
-                  font-family: %s;
-                  font-size: %dpx;
-                  line-height: %s;
-                  color: %s;
-                  margin: 0;
-                  padding: 16px;
-                  background-color: %s;
-                }
-
-                .email-container {
-                  width: 100%%;
-                  max-width: 100%%;
-                  margin: 0 auto;
-                }
-
-                .email-header {
-                  padding-bottom: 10px;
-                  border-bottom: 1px solid %s;
-                  margin-bottom: 10px;
-                }
-
-                .email-header h1 {
-                  margin: 0 0 10px 0;
-                  font-size: %dpx;
-                  font-weight: bold;
-                }
-
-                .email-meta div {
-                  margin-bottom: 2px;
-                  font-size: %dpx;
-                }
-
-                .email-body {
-                  word-wrap: break-word;
-                }
-
-                .attachment-section {
-                  margin-top: 15px;
-                  padding: 10px;
-                  background-color: %s;
-                  border: 1px solid %s;
-                  border-radius: 3px;
-                }
-
-                .attachment-section h3 {
-                  margin: 0 0 8px 0;
-                  font-size: %dpx;
-                }
-
-                .attachment-item {
-                  padding: 5px 0;
-                }
-
-                .attachment-icon {
-                  margin-right: 5px;
-                }
-
-                .attachment-details, .attachment-type {
-                  font-size: %dpx;
-                  color: #555555;
-                }
-
-                .attachment-inclusion-note, .attachment-info-note {
-                  margin-top: 8px;
-                  padding: 6px;
-                  font-size: %dpx;
-                  border-radius: 3px;
-                }
-
-                .attachment-inclusion-note {
-                  background-color: #e6ffed;
-                  border: 1px solid #d4f7dc;
-                  color: #006420;
-                }
-
-                .attachment-info-note {
-                  background-color: #fff9e6;
-                  border: 1px solid #fff0c2;
-                  color: #664d00;
-                }
-
-                .attachment-link-container {
-                  display: flex;
-                  align-items: center;
-                  padding: 8px;
-                  background-color: #f8f9fa;
-                  border: 1px solid #dee2e6;
-                  border-radius: 4px;
-                  margin: 4px 0;
-                }
-
-                .attachment-link-container:hover {
-                  background-color: #e9ecef;
-                }
-
-                .attachment-note {
-                  font-size: %dpx;
-                  color: #6c757d;
-                  font-style: italic;
-                  margin-left: 8px;
-                }
-
-                .no-content {
-                  padding: 20px;
-                  text-align: center;
-                  color: #666;
-                  font-style: italic;
-                }
-
-                .text-body {
-                  white-space: pre-wrap;
-                }
-
-                img {
-                  max-width: 100%%;
-                  height: auto;
-                  display: block;
-                }
-                """,
-                        DEFAULT_FONT_FAMILY,
-                        DEFAULT_FONT_SIZE,
-                        DEFAULT_LINE_HEIGHT,
-                        DEFAULT_TEXT_COLOR,
-                        DEFAULT_BACKGROUND_COLOR,
-                        DEFAULT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 4,
-                        DEFAULT_FONT_SIZE - 1,
-                        ATTACHMENT_BACKGROUND_COLOR,
-                        ATTACHMENT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 1,
-                        DEFAULT_FONT_SIZE - 2,
-                        DEFAULT_FONT_SIZE - 2,
-                        DEFAULT_FONT_SIZE - 3);
-
-        html.append(css);
-    }
-
-    private static void appendAttachmentsSection(
-            StringBuilder html,
-            EmlParser.EmailContent content,
-            EmlToPdfRequest request,
-            CustomHtmlSanitizer customHtmlSanitizer) {
-        html.append("<div class=\"attachment-section\">\n");
-        int displayedAttachmentCount =
-                content.getAttachmentCount() > 0
-                        ? content.getAttachmentCount()
-                        : content.getAttachments().size();
-        html.append("<h3>Attachments (").append(displayedAttachmentCount).append(")</h3>\n");
-
-        if (!content.getAttachments().isEmpty()) {
-            for (int i = 0; i < content.getAttachments().size(); i++) {
-                EmlParser.EmailAttachment attachment = content.getAttachments().get(i);
-
-                String embeddedFilename =
-                        attachment.getFilename() != null
-                                ? attachment.getFilename()
-                                : ("attachment_" + i);
-                attachment.setEmbeddedFilename(embeddedFilename);
-
-                String sizeStr = GeneralUtils.formatBytes(attachment.getSizeBytes());
-                String contentType =
-                        attachment.getContentType() != null
-                                        && !attachment.getContentType().isEmpty()
-                                ? ", " + escapeHtml(attachment.getContentType())
-                                : "";
-
-                String attachmentId = "attachment_" + i;
-                html.append(
-                        String.format(
-                                """
-                        <div class="attachment-item" id="%s">
-                        <span class="attachment-icon" data-filename="%s">@</span>
-                        <span class="attachment-name">%s</span>
-                        <span class="attachment-details">(%s%s)</span>
-                        </div>
-                        """,
-                                attachmentId,
-                                escapeHtml(embeddedFilename),
-                                escapeHtml(EmlParser.safeMimeDecode(attachment.getFilename())),
-                                sizeStr,
-                                contentType));
-            }
-        }
-
-        if (request != null && request.isIncludeAttachments()) {
-            html.append(
-                    """
-                    <div class="attachment-info-note">
-                    <p><em>Attachments are embedded in the file.</em></p>
-                    </div>
-                    """);
-        } else {
-            html.append(
-                    """
-                    <div class="attachment-info-note">
-                    <p><em>Attachment information displayed - files not included in PDF.</em></p>
-                    </div>
-                    """);
-        }
-        html.append("</div>\n");
-    }
-
-    public static HTMLToPdfRequest createHtmlRequest(EmlToPdfRequest request) {
-        HTMLToPdfRequest htmlRequest = new HTMLToPdfRequest();
-
-        if (request != null) {
-            htmlRequest.setFileInput(request.getFileInput());
-        }
-
-        htmlRequest.setZoom(Float.parseFloat(DEFAULT_ZOOM));
-        return htmlRequest;
-    }
-
-    public static String detectMimeType(String filename, String existingMimeType) {
-        if (existingMimeType != null && !existingMimeType.isEmpty()) {
-            return existingMimeType;
-        }
-
-        if (filename != null) {
-            String lowerFilename = filename.toLowerCase();
-            for (Map.Entry<String, String> entry : EXTENSION_TO_MIME_TYPE.entrySet()) {
-                if (lowerFilename.endsWith(entry.getKey())) {
-                    return entry.getValue();
-                }
-            }
-        }
-
-        return "image/png";
-    }
-
-    public static String decodeUrlEncoded(String encoded) {
-        try {
-            return java.net.URLDecoder.decode(encoded, StandardCharsets.UTF_8);
-        } catch (Exception e) {
-            return encoded; // Return original if decoding fails
-        }
-    }
-
-    public static String decodeMimeHeader(String encodedText) {
-        if (encodedText == null || encodedText.trim().isEmpty()) {
-            return encodedText;
-        }
-
-        try {
-            StringBuilder result = new StringBuilder();
-            Pattern concatenatedPattern =
-                    Pattern.compile(
-                            "(=\\?[^?]+\\?[BbQq]\\?[^?]*\\?=)(\\s*=\\?[^?]+\\?[BbQq]\\?[^?]*\\?=)+");
-            Matcher concatenatedMatcher = concatenatedPattern.matcher(encodedText);
-            String processedText =
-                    concatenatedMatcher.replaceAll(
-                            match -> match.group().replaceAll("\\s+(?==\\?)", ""));
-
-            Pattern mimePattern = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-            Matcher matcher = mimePattern.matcher(processedText);
-            int lastEnd = 0;
-
-            while (matcher.find()) {
-                result.append(processedText, lastEnd, matcher.start());
-
-                String charset = matcher.group(1);
-                String encoding = matcher.group(2).toUpperCase();
-                String encodedValue = matcher.group(3);
-
-                try {
-                    String decodedValue =
-                            switch (encoding) {
-                                case "B" -> {
-                                    String cleanBase64 = encodedValue.replaceAll("\\s", "");
-                                    byte[] decodedBytes = Base64.getDecoder().decode(cleanBase64);
-                                    Charset targetCharset;
-                                    try {
-                                        targetCharset = Charset.forName(charset);
-                                    } catch (Exception e) {
-                                        targetCharset = StandardCharsets.UTF_8;
-                                    }
-                                    yield new String(decodedBytes, targetCharset);
-                                }
-                                case "Q" -> decodeQuotedPrintable(encodedValue, charset);
-                                default -> matcher.group(0); // Return original if unknown encoding
-                            };
-                    result.append(decodedValue);
-                } catch (RuntimeException e) {
-                    result.append(matcher.group(0)); // Keep original on decode error
-                }
-
-                lastEnd = matcher.end();
-            }
-
-            result.append(processedText.substring(lastEnd));
-            return result.toString();
-        } catch (Exception e) {
-            return encodedText; // Return original on any parsing error
-        }
-    }
-
-    private static String decodeQuotedPrintable(String encodedText, String charset) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < encodedText.length(); i++) {
-            char c = encodedText.charAt(i);
-            switch (c) {
-                case '=' -> {
-                    if (i + 2 < encodedText.length()) {
-                        String hex = encodedText.substring(i + 1, i + 3);
-                        try {
-                            int value = Integer.parseInt(hex, 16);
-                            result.append((char) value);
-                            i += 2;
-                        } catch (NumberFormatException e) {
-                            result.append(c);
-                        }
-                    } else if (i + 1 == encodedText.length()
-                            || (i + 2 == encodedText.length()
-                                    && encodedText.charAt(i + 1) == '\n')) {
-                        if (i + 1 < encodedText.length() && encodedText.charAt(i + 1) == '\n') {
-                            i++; // Skip the newline too
-                        }
-                    } else {
-                        result.append(c);
-                    }
-                }
-                case '_' -> result.append(' '); // Space encoding in Q encoding
-                default -> result.append(c);
-            }
-        }
-
-        byte[] bytes = result.toString().getBytes(StandardCharsets.ISO_8859_1);
-        try {
-            Charset targetCharset = Charset.forName(charset);
-            return new String(bytes, targetCharset);
-        } catch (Exception e) {
-            try {
-                return new String(bytes, StandardCharsets.UTF_8);
-            } catch (Exception fallbackException) {
-                return new String(bytes, StandardCharsets.ISO_8859_1);
-            }
-        }
-    }
-
-    public static String escapeHtml(String text) {
-        if (text == null) return "";
-        return text.replace("&", "&amp;")
-                .replace("<", "&lt;")
-                .replace(">", "&gt;")
-                .replace("\"", "&quot;")
-                .replace("'", "&#39;");
-    }
-
-    public static String sanitizeText(String text, CustomHtmlSanitizer customHtmlSanitizer) {
-        if (customHtmlSanitizer != null) {
-            return customHtmlSanitizer.sanitize(text);
-        } else {
-            return escapeHtml(text);
-        }
-    }
-
-    public static String simplifyHtmlContent(String htmlContent) {
-        String simplified = htmlContent.replaceAll("(?i)<script[^>]*>.*?</script>", "");
-        simplified = simplified.replaceAll("(?i)<style[^>]*>.*?</style>", "");
-        return simplified;
-    }
-}
@@ -1,103 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.model.api.converters.EmlToPdfRequest;
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@UtilityClass
-public class EmlToPdf {
-
-    public static String convertEmlToHtml(byte[] emlBytes, EmlToPdfRequest request)
-            throws IOException {
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        EmlParser.EmailContent emailContent =
-                EmlParser.extractEmailContent(emlBytes, request, null);
-        return EmlProcessingUtils.generateEnhancedEmailHtml(emailContent, request, null);
-    }
-
-    public static byte[] convertEmlToPdf(
-            String weasyprintPath,
-            EmlToPdfRequest request,
-            byte[] emlBytes,
-            String fileName,
-            CustomPDFDocumentFactory pdfDocumentFactory,
-            TempFileManager tempFileManager,
-            CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException, InterruptedException {
-
-        EmlProcessingUtils.validateEmlInput(emlBytes);
-
-        try {
-            EmlParser.EmailContent emailContent =
-                    EmlParser.extractEmailContent(emlBytes, request, customHtmlSanitizer);
-
-            String htmlContent =
-                    EmlProcessingUtils.generateEnhancedEmailHtml(
-                            emailContent, request, customHtmlSanitizer);
-
-            byte[] pdfBytes =
-                    convertHtmlToPdf(
-                            weasyprintPath,
-                            request,
-                            htmlContent,
-                            tempFileManager,
-                            customHtmlSanitizer);
-
-            if (shouldAttachFiles(emailContent, request)) {
-                pdfBytes =
-                        PdfAttachmentHandler.attachFilesToPdf(
-                                pdfBytes, emailContent.getAttachments(), pdfDocumentFactory);
-            }
-
-            return pdfBytes;
-
-        } catch (IOException | InterruptedException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new IOException("Error converting EML to PDF", e);
-        }
-    }
-
-    private static boolean shouldAttachFiles(
-            EmlParser.EmailContent emailContent, EmlToPdfRequest request) {
-        return emailContent != null
-                && request != null
-                && request.isIncludeAttachments()
-                && !emailContent.getAttachments().isEmpty();
-    }
-
-    private static byte[] convertHtmlToPdf(
-            String weasyprintPath,
-            EmlToPdfRequest request,
-            String htmlContent,
-            TempFileManager tempFileManager,
-            CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException, InterruptedException {
-
-        var htmlRequest = EmlProcessingUtils.createHtmlRequest(request);
-
-        try {
-            return FileToPdf.convertHtmlToPdf(
-                    weasyprintPath,
-                    htmlRequest,
-                    htmlContent.getBytes(StandardCharsets.UTF_8),
-                    "email.html",
-                    tempFileManager,
-                    customHtmlSanitizer);
-        } catch (IOException | InterruptedException e) {
-            String simplifiedHtml = EmlProcessingUtils.simplifyHtmlContent(htmlContent);
-            return FileToPdf.convertHtmlToPdf(
-                    weasyprintPath,
-                    htmlRequest,
-                    simplifiedHtml.getBytes(StandardCharsets.UTF_8),
-                    "email.html",
-                    tempFileManager,
-                    customHtmlSanitizer);
-        }
-    }
-}
@@ -1,327 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Utility class for handling exceptions with internationalized error messages. Provides consistent
- * error handling and user-friendly messages across the application.
- */
-@Slf4j
-public class ExceptionUtils {
-
-    /**
-     * Create an IOException with internationalized message for PDF corruption.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfCorruptedException(Exception cause) {
-        return createPdfCorruptedException(null, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for PDF corruption with context.
-     *
-     * @param context additional context (e.g., "during merge", "during image extraction")
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfCorruptedException(String context, Exception cause) {
-        String message;
-        if (context != null && !context.isEmpty()) {
-            message =
-                    String.format(
-                            "Error %s: PDF file appears to be corrupted or damaged. Please try using the 'Repair PDF' feature first to fix the file before proceeding with this operation.",
-                            context);
-        } else {
-            message =
-                    "PDF file appears to be corrupted or damaged. Please try using the 'Repair PDF' feature first to fix the file before proceeding with this operation.";
-        }
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for multiple corrupted PDFs.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createMultiplePdfCorruptedException(Exception cause) {
-        String message =
-                "One or more PDF files appear to be corrupted or damaged. Please try using the 'Repair PDF' feature on each file first before attempting to merge them.";
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for PDF encryption issues.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfEncryptionException(Exception cause) {
-        String message =
-                "The PDF appears to have corrupted encryption data. This can happen when the PDF was created with incompatible encryption methods. Please try using the 'Repair PDF' feature first, or contact the document creator for a new copy.";
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for PDF password issues.
-     *
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createPdfPasswordException(Exception cause) {
-        String message =
-                "The PDF Document is passworded and either the password was not provided or was incorrect";
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create an IOException with internationalized message for file processing errors.
-     *
-     * @param operation the operation being performed (e.g., "merge", "split", "convert")
-     * @param cause the original exception
-     * @return IOException with user-friendly message
-     */
-    public static IOException createFileProcessingException(String operation, Exception cause) {
-        String message =
-                String.format(
-                        "An error occurred while processing the file during %s operation: %s",
-                        operation, cause.getMessage());
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create a generic IOException with internationalized message.
-     *
-     * @param messageKey the i18n message key
-     * @param defaultMessage the default message if i18n is not available
-     * @param cause the original exception
-     * @param args optional arguments for the message
-     * @return IOException with user-friendly message
-     */
-    public static IOException createIOException(
-            String messageKey, String defaultMessage, Exception cause, Object... args) {
-        String message = MessageFormat.format(defaultMessage, args);
-        return new IOException(message, cause);
-    }
-
-    /**
-     * Create a generic RuntimeException with internationalized message.
-     *
-     * @param messageKey the i18n message key
-     * @param defaultMessage the default message if i18n is not available
-     * @param cause the original exception
-     * @param args optional arguments for the message
-     * @return RuntimeException with user-friendly message
-     */
-    public static RuntimeException createRuntimeException(
-            String messageKey, String defaultMessage, Exception cause, Object... args) {
-        String message = MessageFormat.format(defaultMessage, args);
-        return new RuntimeException(message, cause);
-    }
-
-    /**
-     * Create an IllegalArgumentException with internationalized message.
-     *
-     * @param messageKey the i18n message key
-     * @param defaultMessage the default message if i18n is not available
-     * @param args optional arguments for the message
-     * @return IllegalArgumentException with user-friendly message
-     */
-    public static IllegalArgumentException createIllegalArgumentException(
-            String messageKey, String defaultMessage, Object... args) {
-        String message = MessageFormat.format(defaultMessage, args);
-        return new IllegalArgumentException(message);
-    }
-
-    /** Create file validation exceptions. */
-    public static IllegalArgumentException createHtmlFileRequiredException() {
-        return createIllegalArgumentException(
-                "error.fileFormatRequired", "File must be in {0} format", "HTML or ZIP");
-    }
-
-    public static IllegalArgumentException createPdfFileRequiredException() {
-        return createIllegalArgumentException(
-                "error.fileFormatRequired", "File must be in {0} format", "PDF");
-    }
-
-    public static IllegalArgumentException createInvalidPageSizeException(String size) {
-        return createIllegalArgumentException(
-                "error.invalidFormat", "Invalid {0} format: {1}", "page size", size);
-    }
-
-    /** Create OCR-related exceptions. */
-    public static IOException createOcrLanguageRequiredException() {
-        return createIOException(
-                "error.optionsNotSpecified", "{0} options are not specified", null, "OCR language");
-    }
-
-    public static IOException createOcrInvalidLanguagesException() {
-        return createIOException(
-                "error.invalidFormat",
-                "Invalid {0} format: {1}",
-                null,
-                "OCR languages",
-                "none of the selected languages are valid");
-    }
-
-    public static IOException createOcrToolsUnavailableException() {
-        return createIOException(
-                "error.toolNotInstalled", "{0} is not installed", null, "OCR tools");
-    }
-
-    /** Create system requirement exceptions. */
-    public static IOException createPythonRequiredForWebpException() {
-        return createIOException(
-                "error.toolRequired", "{0} is required for {1}", null, "Python", "WebP conversion");
-    }
-
-    /** Create file operation exceptions. */
-    public static IOException createFileNotFoundException(String fileId) {
-        return createIOException("error.fileNotFound", "File not found with ID: {0}", null, fileId);
-    }
-
-    public static RuntimeException createPdfaConversionFailedException() {
-        return createRuntimeException(
-                "error.conversionFailed", "{0} conversion failed", null, "PDF/A");
-    }
-
-    public static IllegalArgumentException createInvalidComparatorException() {
-        return createIllegalArgumentException(
-                "error.invalidFormat",
-                "Invalid {0} format: {1}",
-                "comparator",
-                "only 'greater', 'equal', and 'less' are supported");
-    }
-
-    /** Create compression-related exceptions. */
-    public static RuntimeException createMd5AlgorithmException(Exception cause) {
-        return createRuntimeException(
-                "error.algorithmNotAvailable", "{0} algorithm not available", cause, "MD5");
-    }
-
-    public static IllegalArgumentException createCompressionOptionsException() {
-        return createIllegalArgumentException(
-                "error.optionsNotSpecified",
-                "{0} options are not specified",
-                "compression (expected output size and optimize level)");
-    }
-
-    public static IOException createGhostscriptCompressionException() {
-        return createIOException(
-                "error.commandFailed", "{0} command failed", null, "Ghostscript compression");
-    }
-
-    public static IOException createGhostscriptCompressionException(Exception cause) {
-        return createIOException(
-                "error.commandFailed", "{0} command failed", cause, "Ghostscript compression");
-    }
-
-    public static IOException createQpdfCompressionException(Exception cause) {
-        return createIOException("error.commandFailed", "{0} command failed", cause, "QPDF");
-    }
-
-    /**
-     * Check if an exception indicates a corrupted PDF and wrap it with appropriate message.
-     *
-     * @param e the exception to check
-     * @return the original exception if not PDF corruption, or a new IOException with user-friendly
-     *     message
-     */
-    public static IOException handlePdfException(IOException e) {
-        return handlePdfException(e, null);
-    }
-
-    /**
-     * Check if an exception indicates a corrupted PDF and wrap it with appropriate message.
-     *
-     * @param e the exception to check
-     * @param context additional context for the error
-     * @return the original exception if not PDF corruption, or a new IOException with user-friendly
-     *     message
-     */
-    public static IOException handlePdfException(IOException e, String context) {
-        if (PdfErrorUtils.isCorruptedPdfError(e)) {
-            return createPdfCorruptedException(context, e);
-        }
-
-        if (isEncryptionError(e)) {
-            return createPdfEncryptionException(e);
-        }
-
-        if (isPasswordError(e)) {
-            return createPdfPasswordException(e);
-        }
-
-        return e; // Return original exception if no specific handling needed
-    }
-
-    /**
-     * Check if an exception indicates a PDF encryption/decryption error.
-     *
-     * @param e the exception to check
-     * @return true if it's an encryption error, false otherwise
-     */
-    public static boolean isEncryptionError(IOException e) {
-        String message = e.getMessage();
-        if (message == null) return false;
-
-        return message.contains("BadPaddingException")
-                || message.contains("Given final block not properly padded")
-                || message.contains("AES initialization vector not fully read")
-                || message.contains("Failed to decrypt");
-    }
-
-    /**
-     * Check if an exception indicates a PDF password error.
-     *
-     * @param e the exception to check
-     * @return true if it's a password error, false otherwise
-     */
-    public static boolean isPasswordError(IOException e) {
-        String message = e.getMessage();
-        if (message == null) return false;
-
-        return message.contains("password is incorrect")
-                || message.contains("Password is not provided")
-                || message.contains("PDF contains an encryption dictionary");
-    }
-
-    /**
-     * Log an exception with appropriate level based on its type.
-     *
-     * @param operation the operation being performed
-     * @param e the exception that occurred
-     */
-    public static void logException(String operation, Exception e) {
-        if (PdfErrorUtils.isCorruptedPdfError(e)) {
-            log.warn("PDF corruption detected during {}: {}", operation, e.getMessage());
-        } else if (e instanceof IOException
-                && (isEncryptionError((IOException) e) || isPasswordError((IOException) e))) {
-            log.info("PDF security issue during {}: {}", operation, e.getMessage());
-        } else {
-            log.error("Unexpected error during {}", operation, e);
-        }
-    }
-
-    /** Create common validation exceptions. */
-    public static IllegalArgumentException createInvalidArgumentException(String argumentName) {
-        return createIllegalArgumentException(
-                "error.invalidArgument", "Invalid argument: {0}", argumentName);
-    }
-
-    public static IllegalArgumentException createInvalidArgumentException(
-            String argumentName, String value) {
-        return createIllegalArgumentException(
-                "error.invalidFormat", "Invalid {0} format: {1}", argumentName, value);
-    }
-
-    public static IllegalArgumentException createNullArgumentException(String argumentName) {
-        return createIllegalArgumentException(
-                "error.argumentRequired", "{0} must not be null", argumentName);
-    }
-}
@@ -1,680 +0,0 @@
-package stirling.software.common.util;
-
-import static stirling.software.common.util.AttachmentUtils.setCatalogViewerPreferences;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
-import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PageMode;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.TextPosition;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@UtilityClass
-public class PdfAttachmentHandler {
-    // Note: This class is designed for EML attachments, not general PDF attachments.
-
-    private static final String ATTACHMENT_MARKER = "@";
-    private static final float ATTACHMENT_ICON_WIDTH = 12f;
-    private static final float ATTACHMENT_ICON_HEIGHT = 14f;
-    private static final float ANNOTATION_X_OFFSET = 2f;
-    private static final float ANNOTATION_Y_OFFSET = 10f;
-
-    public static byte[] attachFilesToPdf(
-            byte[] pdfBytes,
-            List<EmlParser.EmailAttachment> attachments,
-            CustomPDFDocumentFactory pdfDocumentFactory)
-            throws IOException {
-
-        if (attachments == null || attachments.isEmpty()) {
-            return pdfBytes;
-        }
-
-        try (PDDocument document = pdfDocumentFactory.load(pdfBytes);
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-
-            List<MultipartFile> multipartAttachments = new ArrayList<>(attachments.size());
-            for (int i = 0; i < attachments.size(); i++) {
-                EmlParser.EmailAttachment attachment = attachments.get(i);
-                if (attachment.getData() != null && attachment.getData().length > 0) {
-                    String embeddedFilename =
-                            attachment.getFilename() != null
-                                    ? attachment.getFilename()
-                                    : ("attachment_" + i);
-                    attachment.setEmbeddedFilename(embeddedFilename);
-                    multipartAttachments.add(createMultipartFile(attachment));
-                }
-            }
-
-            if (!multipartAttachments.isEmpty()) {
-                Map<Integer, String> indexToFilenameMap =
-                        addAttachmentsToDocumentWithMapping(
-                                document, multipartAttachments, attachments);
-                setCatalogViewerPreferences(document, PageMode.USE_ATTACHMENTS);
-                addAttachmentAnnotationsToDocumentWithMapping(
-                        document, attachments, indexToFilenameMap);
-            }
-
-            document.save(outputStream);
-            return outputStream.toByteArray();
-        } catch (RuntimeException e) {
-            throw new IOException(
-                    "Invalid PDF structure or processing error: " + e.getMessage(), e);
-        } catch (Exception e) {
-            throw new IOException("Error attaching files to PDF: " + e.getMessage(), e);
-        }
-    }
-
-    private static MultipartFile createMultipartFile(EmlParser.EmailAttachment attachment) {
-        return new MultipartFile() {
-            @Override
-            public @NotNull String getName() {
-                return "attachment";
-            }
-
-            @Override
-            public String getOriginalFilename() {
-                return attachment.getFilename() != null
-                        ? attachment.getFilename()
-                        : "attachment_" + System.currentTimeMillis();
-            }
-
-            @Override
-            public String getContentType() {
-                return attachment.getContentType() != null
-                        ? attachment.getContentType()
-                        : "application/octet-stream";
-            }
-
-            @Override
-            public boolean isEmpty() {
-                return attachment.getData() == null || attachment.getData().length == 0;
-            }
-
-            @Override
-            public long getSize() {
-                return attachment.getData() != null ? attachment.getData().length : 0;
-            }
-
-            @Override
-            public byte @NotNull [] getBytes() {
-                return attachment.getData() != null ? attachment.getData() : new byte[0];
-            }
-
-            @Override
-            public @NotNull InputStream getInputStream() {
-                byte[] data = attachment.getData();
-                return new ByteArrayInputStream(data != null ? data : new byte[0]);
-            }
-
-            @Override
-            public void transferTo(@NotNull File dest) throws IOException, IllegalStateException {
-                try (FileOutputStream fos = new FileOutputStream(dest)) {
-                    byte[] data = attachment.getData();
-                    if (data != null) {
-                        fos.write(data);
-                    }
-                }
-            }
-        };
-    }
-
-    private static String ensureUniqueFilename(String filename, Set<String> existingNames) {
-        if (!existingNames.contains(filename)) {
-            return filename;
-        }
-
-        String baseName;
-        String extension = "";
-        int lastDot = filename.lastIndexOf('.');
-        if (lastDot > 0) {
-            baseName = filename.substring(0, lastDot);
-            extension = filename.substring(lastDot);
-        } else {
-            baseName = filename;
-        }
-
-        int counter = 1;
-        String uniqueName;
-        do {
-            uniqueName = baseName + "_" + counter + extension;
-            counter++;
-        } while (existingNames.contains(uniqueName));
-
-        return uniqueName;
-    }
-
-    private static @NotNull PDRectangle calculateAnnotationRectangle(
-            PDPage page, float x, float y) {
-        PDRectangle cropBox = page.getCropBox();
-
-        // ISO 32000-1:2008 Section 8.3: PDF coordinate system transforms
-        int rotation = page.getRotation();
-        float pdfX = x;
-        float pdfY = cropBox.getHeight() - y;
-
-        switch (rotation) {
-            case 90 -> {
-                float temp = pdfX;
-                pdfX = pdfY;
-                pdfY = cropBox.getWidth() - temp;
-            }
-            case 180 -> {
-                pdfX = cropBox.getWidth() - pdfX;
-                pdfY = y;
-            }
-            case 270 -> {
-                float temp = pdfX;
-                pdfX = cropBox.getHeight() - pdfY;
-                pdfY = temp;
-            }
-            default -> {}
-        }
-
-        float iconHeight = ATTACHMENT_ICON_HEIGHT;
-        float paddingX = 2.0f;
-        float paddingY = 2.0f;
-
-        PDRectangle rect =
-                new PDRectangle(
-                        pdfX + ANNOTATION_X_OFFSET + paddingX,
-                        pdfY - iconHeight + ANNOTATION_Y_OFFSET + paddingY,
-                        ATTACHMENT_ICON_WIDTH,
-                        iconHeight);
-
-        PDRectangle mediaBox = page.getMediaBox();
-        if (rect.getLowerLeftX() < mediaBox.getLowerLeftX()
-                || rect.getLowerLeftY() < mediaBox.getLowerLeftY()
-                || rect.getUpperRightX() > mediaBox.getUpperRightX()
-                || rect.getUpperRightY() > mediaBox.getUpperRightY()) {
-
-            float adjustedX =
-                    Math.max(
-                            mediaBox.getLowerLeftX(),
-                            Math.min(
-                                    rect.getLowerLeftX(),
-                                    mediaBox.getUpperRightX() - rect.getWidth()));
-            float adjustedY =
-                    Math.max(
-                            mediaBox.getLowerLeftY(),
-                            Math.min(
-                                    rect.getLowerLeftY(),
-                                    mediaBox.getUpperRightY() - rect.getHeight()));
-            rect = new PDRectangle(adjustedX, adjustedY, rect.getWidth(), rect.getHeight());
-        }
-
-        return rect;
-    }
-
-    public static String processInlineImages(
-            String htmlContent, EmlParser.EmailContent emailContent) {
-        if (htmlContent == null || emailContent == null) return htmlContent;
-
-        Map<String, EmlParser.EmailAttachment> contentIdMap = new HashMap<>();
-        for (EmlParser.EmailAttachment attachment : emailContent.getAttachments()) {
-            if (attachment.isEmbedded()
-                    && attachment.getContentId() != null
-                    && attachment.getData() != null) {
-                contentIdMap.put(attachment.getContentId(), attachment);
-            }
-        }
-
-        if (contentIdMap.isEmpty()) return htmlContent;
-
-        Pattern cidPattern =
-                Pattern.compile(
-                        "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
-                        Pattern.CASE_INSENSITIVE);
-        Matcher matcher = cidPattern.matcher(htmlContent);
-
-        StringBuilder result = new StringBuilder();
-        while (matcher.find()) {
-            String contentId = matcher.group(1);
-            EmlParser.EmailAttachment attachment = contentIdMap.get(contentId);
-
-            if (attachment != null && attachment.getData() != null) {
-                String mimeType =
-                        EmlProcessingUtils.detectMimeType(
-                                attachment.getFilename(), attachment.getContentType());
-
-                String base64Data = Base64.getEncoder().encodeToString(attachment.getData());
-                String dataUri = "data:" + mimeType + ";base64," + base64Data;
-
-                String replacement =
-                        matcher.group(0).replaceFirst("cid:" + Pattern.quote(contentId), dataUri);
-                matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
-            } else {
-                matcher.appendReplacement(result, Matcher.quoteReplacement(matcher.group(0)));
-            }
-        }
-        matcher.appendTail(result);
-
-        return result.toString();
-    }
-
-    public static String formatEmailDate(Date date) {
-        if (date == null) return "";
-
-        SimpleDateFormat formatter =
-                new SimpleDateFormat("EEE, MMM d, yyyy 'at' h:mm a z", Locale.ENGLISH);
-        formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return formatter.format(date);
-    }
-
-    @Data
-    public static class MarkerPosition {
-        private int pageIndex;
-        private float x;
-        private float y;
-        private String character;
-        private String filename;
-
-        public MarkerPosition(int pageIndex, float x, float y, String character, String filename) {
-            this.pageIndex = pageIndex;
-            this.x = x;
-            this.y = y;
-            this.character = character;
-            this.filename = filename;
-        }
-    }
-
-    public static class AttachmentMarkerPositionFinder extends PDFTextStripper {
-        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
-        private int currentPageIndex;
-        protected boolean sortByPosition;
-        private boolean isInAttachmentSection;
-        private boolean attachmentSectionFound;
-        private final StringBuilder currentText = new StringBuilder();
-
-        private static final Pattern ATTACHMENT_SECTION_PATTERN =
-                Pattern.compile("attachments\\s*\\(\\d+\\)", Pattern.CASE_INSENSITIVE);
-
-        private static final Pattern FILENAME_PATTERN =
-                Pattern.compile("@\\s*([^\\s\\(]+(?:\\.[a-zA-Z0-9]+)?)");
-
-        public AttachmentMarkerPositionFinder() {
-            super();
-            this.currentPageIndex = 0;
-            this.sortByPosition = false; // Disable sorting to preserve document order
-            this.isInAttachmentSection = false;
-            this.attachmentSectionFound = false;
-        }
-
-        @Override
-        public String getText(PDDocument document) throws IOException {
-            super.getText(document);
-
-            if (sortByPosition) {
-                positions.sort(
-                        (a, b) -> {
-                            int pageCompare = Integer.compare(a.getPageIndex(), b.getPageIndex());
-                            if (pageCompare != 0) return pageCompare;
-                            return Float.compare(
-                                    b.getY(), a.getY()); // Descending Y per PDF coordinate system
-                        });
-            }
-
-            return ""; // Return empty string as we only need positions
-        }
-
-        @Override
-        protected void startPage(PDPage page) throws IOException {
-            super.startPage(page);
-        }
-
-        @Override
-        protected void endPage(PDPage page) throws IOException {
-            currentPageIndex++;
-            super.endPage(page);
-        }
-
-        @Override
-        protected void writeString(String string, List<TextPosition> textPositions)
-                throws IOException {
-            String lowerString = string.toLowerCase();
-
-            if (ATTACHMENT_SECTION_PATTERN.matcher(lowerString).find()) {
-                isInAttachmentSection = true;
-                attachmentSectionFound = true;
-            }
-
-            if (isInAttachmentSection
-                    && (lowerString.contains("</body>")
-                            || lowerString.contains("</html>")
-                            || (attachmentSectionFound
-                                    && lowerString.trim().isEmpty()
-                                    && string.length() > 50))) {
-                isInAttachmentSection = false;
-            }
-
-            if (isInAttachmentSection) {
-                currentText.append(string);
-
-                for (int i = 0; (i = string.indexOf(ATTACHMENT_MARKER, i)) != -1; i++) {
-                    if (i < textPositions.size()) {
-                        TextPosition textPosition = textPositions.get(i);
-
-                        String filename = extractFilenameAfterMarker(string, i);
-
-                        MarkerPosition position =
-                                new MarkerPosition(
-                                        currentPageIndex,
-                                        textPosition.getXDirAdj(),
-                                        textPosition.getYDirAdj(),
-                                        ATTACHMENT_MARKER,
-                                        filename);
-                        positions.add(position);
-                    }
-                }
-            }
-            super.writeString(string, textPositions);
-        }
-
-        @Override
-        public void setSortByPosition(boolean sortByPosition) {
-            this.sortByPosition = sortByPosition;
-        }
-
-        private String extractFilenameAfterMarker(String text, int markerIndex) {
-            String afterMarker = text.substring(markerIndex + 1);
-
-            Matcher matcher = FILENAME_PATTERN.matcher("@" + afterMarker);
-            if (matcher.find()) {
-                return matcher.group(1);
-            }
-
-            String[] parts = afterMarker.split("[\\s\\(\\)]+");
-            for (String part : parts) {
-                part = part.trim();
-                if (part.length() > 3 && part.contains(".")) {
-                    return part;
-                }
-            }
-
-            return null;
-        }
-    }
-
-    private static Map<Integer, String> addAttachmentsToDocumentWithMapping(
-            PDDocument document,
-            List<MultipartFile> attachments,
-            List<EmlParser.EmailAttachment> originalAttachments)
-            throws IOException {
-
-        PDDocumentCatalog catalog = document.getDocumentCatalog();
-
-        if (catalog == null) {
-            throw new IOException("PDF document catalog is not accessible");
-        }
-
-        PDDocumentNameDictionary documentNames = catalog.getNames();
-        if (documentNames == null) {
-            documentNames = new PDDocumentNameDictionary(catalog);
-            catalog.setNames(documentNames);
-        }
-
-        PDEmbeddedFilesNameTreeNode embeddedFilesTree = documentNames.getEmbeddedFiles();
-        if (embeddedFilesTree == null) {
-            embeddedFilesTree = new PDEmbeddedFilesNameTreeNode();
-            documentNames.setEmbeddedFiles(embeddedFilesTree);
-        }
-
-        Map<String, PDComplexFileSpecification> existingNames = embeddedFilesTree.getNames();
-        if (existingNames == null) {
-            existingNames = new HashMap<>();
-        }
-
-        Map<Integer, String> indexToFilenameMap = new HashMap<>();
-
-        for (int i = 0; i < attachments.size(); i++) {
-            MultipartFile attachment = attachments.get(i);
-            String filename = attachment.getOriginalFilename();
-            if (filename == null || filename.trim().isEmpty()) {
-                filename = "attachment_" + i;
-            }
-
-            String normalizedFilename =
-                    isAscii(filename)
-                            ? filename
-                            : java.text.Normalizer.normalize(
-                                    filename, java.text.Normalizer.Form.NFC);
-            String uniqueFilename =
-                    ensureUniqueFilename(normalizedFilename, existingNames.keySet());
-
-            indexToFilenameMap.put(i, uniqueFilename);
-
-            PDEmbeddedFile embeddedFile = new PDEmbeddedFile(document, attachment.getInputStream());
-            embeddedFile.setSize((int) attachment.getSize());
-
-            GregorianCalendar currentTime = new GregorianCalendar();
-            embeddedFile.setCreationDate(currentTime);
-            embeddedFile.setModDate(currentTime);
-
-            String contentType = attachment.getContentType();
-            if (contentType != null && !contentType.trim().isEmpty()) {
-                embeddedFile.setSubtype(contentType);
-            }
-
-            PDComplexFileSpecification fileSpecification = new PDComplexFileSpecification();
-            fileSpecification.setFile(uniqueFilename);
-            fileSpecification.setFileUnicode(uniqueFilename);
-            fileSpecification.setEmbeddedFile(embeddedFile);
-            fileSpecification.setEmbeddedFileUnicode(embeddedFile);
-
-            existingNames.put(uniqueFilename, fileSpecification);
-        }
-
-        embeddedFilesTree.setNames(existingNames);
-        documentNames.setEmbeddedFiles(embeddedFilesTree);
-        catalog.setNames(documentNames);
-
-        return indexToFilenameMap;
-    }
-
-    private static void addAttachmentAnnotationsToDocumentWithMapping(
-            PDDocument document,
-            List<EmlParser.EmailAttachment> attachments,
-            Map<Integer, String> indexToFilenameMap)
-            throws IOException {
-
-        if (document.getNumberOfPages() == 0 || attachments == null || attachments.isEmpty()) {
-            return;
-        }
-
-        AttachmentMarkerPositionFinder finder = new AttachmentMarkerPositionFinder();
-        finder.setSortByPosition(false); // Keep document order to maintain pairing
-        finder.getText(document);
-        List<MarkerPosition> markerPositions = finder.getPositions();
-
-        int annotationsToAdd = Math.min(markerPositions.size(), attachments.size());
-
-        for (int i = 0; i < annotationsToAdd; i++) {
-            MarkerPosition position = markerPositions.get(i);
-
-            String filenameNearMarker = position.getFilename();
-
-            EmlParser.EmailAttachment matchingAttachment =
-                    findAttachmentByFilename(attachments, filenameNearMarker);
-
-            if (matchingAttachment != null) {
-                String embeddedFilename =
-                        findEmbeddedFilenameForAttachment(matchingAttachment, indexToFilenameMap);
-
-                if (embeddedFilename != null) {
-                    PDPage page = document.getPage(position.getPageIndex());
-                    addAttachmentAnnotationToPageWithMapping(
-                            document,
-                            page,
-                            matchingAttachment,
-                            embeddedFilename,
-                            position.getX(),
-                            position.getY(),
-                            i);
-                } else {
-                    // No embedded filename found for attachment
-                }
-            } else {
-                // No matching attachment found for filename near marker
-            }
-        }
-    }
-
-    private static EmlParser.EmailAttachment findAttachmentByFilename(
-            List<EmlParser.EmailAttachment> attachments, String targetFilename) {
-        if (targetFilename == null || targetFilename.trim().isEmpty()) {
-            return null;
-        }
-
-        String normalizedTarget = normalizeFilename(targetFilename);
-
-        // First try exact match
-        for (EmlParser.EmailAttachment attachment : attachments) {
-            if (attachment.getFilename() != null) {
-                String normalizedAttachment = normalizeFilename(attachment.getFilename());
-                if (normalizedAttachment.equals(normalizedTarget)) {
-                    return attachment;
-                }
-            }
-        }
-
-        // Then try contains match
-        for (EmlParser.EmailAttachment attachment : attachments) {
-            if (attachment.getFilename() != null) {
-                String normalizedAttachment = normalizeFilename(attachment.getFilename());
-                if (normalizedAttachment.contains(normalizedTarget)
-                        || normalizedTarget.contains(normalizedAttachment)) {
-                    return attachment;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static String findEmbeddedFilenameForAttachment(
-            EmlParser.EmailAttachment attachment, Map<Integer, String> indexToFilenameMap) {
-
-        String attachmentFilename = attachment.getFilename();
-        if (attachmentFilename == null) {
-            return null;
-        }
-
-        for (Map.Entry<Integer, String> entry : indexToFilenameMap.entrySet()) {
-            String embeddedFilename = entry.getValue();
-            if (embeddedFilename != null
-                    && (embeddedFilename.equals(attachmentFilename)
-                            || embeddedFilename.contains(attachmentFilename)
-                            || attachmentFilename.contains(embeddedFilename))) {
-                return embeddedFilename;
-            }
-        }
-
-        return null;
-    }
-
-    private static String normalizeFilename(String filename) {
-        if (filename == null) return "";
-        return filename.toLowerCase()
-                .trim()
-                .replaceAll("\\s+", " ")
-                .replaceAll("[^a-zA-Z0-9._-]", "");
-    }
-
-    private static void addAttachmentAnnotationToPageWithMapping(
-            PDDocument document,
-            PDPage page,
-            EmlParser.EmailAttachment attachment,
-            String embeddedFilename,
-            float x,
-            float y,
-            int attachmentIndex)
-            throws IOException {
-
-        PDAnnotationFileAttachment fileAnnotation = new PDAnnotationFileAttachment();
-
-        PDRectangle rect = calculateAnnotationRectangle(page, x, y);
-        fileAnnotation.setRectangle(rect);
-
-        fileAnnotation.setPrinted(false);
-        fileAnnotation.setHidden(false);
-        fileAnnotation.setNoView(false);
-        fileAnnotation.setNoZoom(true);
-        fileAnnotation.setNoRotate(true);
-
-        try {
-            PDAppearanceDictionary appearance = new PDAppearanceDictionary();
-            PDAppearanceStream normalAppearance = new PDAppearanceStream(document);
-            normalAppearance.setBBox(new PDRectangle(0, 0, rect.getWidth(), rect.getHeight()));
-            appearance.setNormalAppearance(normalAppearance);
-            fileAnnotation.setAppearance(appearance);
-        } catch (RuntimeException e) {
-            fileAnnotation.setAppearance(null);
-        }
-
-        PDEmbeddedFilesNameTreeNode efTree =
-                document.getDocumentCatalog().getNames().getEmbeddedFiles();
-        if (efTree != null) {
-            Map<String, PDComplexFileSpecification> efMap = efTree.getNames();
-            if (efMap != null) {
-                PDComplexFileSpecification fileSpec = efMap.get(embeddedFilename);
-                if (fileSpec != null) {
-                    fileAnnotation.setFile(fileSpec);
-                } else {
-                    // Could not find embedded file
-                }
-            }
-        }
-
-        fileAnnotation.setContents(
-                "Attachment " + (attachmentIndex + 1) + ": " + attachment.getFilename());
-        fileAnnotation.setAnnotationName(
-                "EmbeddedFile_" + attachmentIndex + "_" + embeddedFilename);
-
-        page.getAnnotations().add(fileAnnotation);
-    }
-
-    private static boolean isAscii(String str) {
-        if (str == null) return true;
-        for (int i = 0; i < str.length(); i++) {
-            if (str.charAt(i) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
@@ -1,55 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-
-/** Utility class for detecting and handling PDF-related errors. */
-public class PdfErrorUtils {
-
-    /**
-     * Checks if an IOException indicates a corrupted PDF file.
-     *
-     * @param e the IOException to check
-     * @return true if the error indicates PDF corruption, false otherwise
-     */
-    public static boolean isCorruptedPdfError(IOException e) {
-        return isCorruptedPdfError(e.getMessage());
-    }
-
-    /**
-     * Checks if any Exception indicates a corrupted PDF file.
-     *
-     * @param e the Exception to check
-     * @return true if the error indicates PDF corruption, false otherwise
-     */
-    public static boolean isCorruptedPdfError(Exception e) {
-        return isCorruptedPdfError(e.getMessage());
-    }
-
-    /**
-     * Checks if an error message indicates a corrupted PDF file.
-     *
-     * @param message the error message to check
-     * @return true if the message indicates PDF corruption, false otherwise
-     */
-    private static boolean isCorruptedPdfError(String message) {
-        if (message == null) return false;
-
-        // Check for common corruption indicators
-        return message.contains("Missing root object specification")
-                || message.contains("Header doesn't contain versioninfo")
-                || message.contains("Expected trailer")
-                || message.contains("Invalid PDF")
-                || message.contains("Corrupted")
-                || message.contains("damaged")
-                || message.contains("Unknown dir object")
-                || message.contains("Can't dereference COSObject")
-                || message.contains("parseCOSString string should start with")
-                || message.contains("ICCBased colorspace array must have a stream")
-                || message.contains("1-based index not found")
-                || message.contains("Invalid dictionary, found:")
-                || message.contains("AES initialization vector not fully read")
-                || message.contains("BadPaddingException")
-                || message.contains("Given final block not properly padded")
-                || message.contains("End-of-File, expected line");
-    }
-}
@@ -1,59 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.StandardEnvironment;
-
-import stirling.software.common.configuration.InstallationPathConfig;
-
-class ApplicationPropertiesDynamicYamlPropertySourceTest {
-
-    @Test
-    void loads_yaml_into_environment() throws Exception {
-        // YAML-Config in Temp-Datei schreiben
-        String yaml =
-                ""
-                        + "ui:\n"
-                        + "  appName: \"My App\"\n"
-                        + "system:\n"
-                        + "  enableAnalytics: true\n";
-        Path tmp = Files.createTempFile("spdf-settings-", ".yml");
-        Files.writeString(tmp, yaml);
-
-        // Pfad per statischem Mock liefern
-        try (MockedStatic<InstallationPathConfig> mocked =
-                Mockito.mockStatic(InstallationPathConfig.class)) {
-            mocked.when(InstallationPathConfig::getSettingsPath).thenReturn(tmp.toString());
-
-            ConfigurableEnvironment env = new StandardEnvironment();
-            ApplicationProperties props = new ApplicationProperties();
-
-            props.dynamicYamlPropertySource(env); // fügt PropertySource an erster Stelle ein
-
-            assertEquals("My App", env.getProperty("ui.appName"));
-            assertEquals("true", env.getProperty("system.enableAnalytics"));
-        }
-    }
-
-    @Test
-    void throws_when_settings_file_missing() throws Exception {
-        String missing = "/path/does/not/exist/spdf.yml";
-        try (MockedStatic<InstallationPathConfig> mocked =
-                Mockito.mockStatic(InstallationPathConfig.class)) {
-            mocked.when(InstallationPathConfig::getSettingsPath).thenReturn(missing);
-
-            ConfigurableEnvironment env = new StandardEnvironment();
-            ApplicationProperties props = new ApplicationProperties();
-
-            assertThrows(IOException.class, () -> props.dynamicYamlPropertySource(env));
-        }
-    }
-}
@@ -1,248 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties.Driver;
-import stirling.software.common.model.ApplicationProperties.Premium;
-import stirling.software.common.model.ApplicationProperties.Security;
-import stirling.software.common.model.exception.UnsupportedProviderException;
-
-class ApplicationPropertiesLogicTest {
-
-    @Test
-    void system_isAnalyticsEnabled_null_false_true() {
-        ApplicationProperties.System sys = new ApplicationProperties.System();
-
-        sys.setEnableAnalytics(null);
-        assertFalse(sys.isAnalyticsEnabled());
-
-        sys.setEnableAnalytics(Boolean.FALSE);
-        assertFalse(sys.isAnalyticsEnabled());
-
-        sys.setEnableAnalytics(Boolean.TRUE);
-        assertTrue(sys.isAnalyticsEnabled());
-    }
-
-    @Test
-    void tempFileManagement_defaults_and_overrides() {
-        ApplicationProperties.TempFileManagement tfm =
-                new ApplicationProperties.TempFileManagement();
-
-        String expectedBase =
-                java.lang.System.getProperty("java.io.tmpdir").replaceAll("/+$", "")
-                        + "/stirling-pdf";
-        assertEquals(expectedBase, tfm.getBaseTmpDir());
-
-        String expectedLibre = expectedBase + "/libreoffice";
-        assertEquals(expectedLibre, tfm.getLibreofficeDir());
-
-        tfm.setBaseTmpDir("/custom/base");
-        assertEquals("/custom/base", tfm.getBaseTmpDir());
-
-        tfm.setLibreofficeDir("/opt/libre");
-        assertEquals("/opt/libre", tfm.getLibreofficeDir());
-    }
-
-    @Test
-    void oauth2_scope_parsing_and_validity() {
-        Security.OAUTH2 oauth2 = new Security.OAUTH2();
-        oauth2.setIssuer("https://issuer");
-        oauth2.setClientId("client");
-        oauth2.setClientSecret("secret");
-        oauth2.setUseAsUsername("email");
-        oauth2.setScopes("openid, profile ,email");
-        assertTrue(oauth2.isSettingsValid());
-    }
-
-    @Test
-    void security_login_method_flags() {
-        Security sec = new Security();
-
-        sec.getOauth2().setEnabled(true);
-        sec.getSaml2().setEnabled(true);
-
-        assertTrue(sec.isUserPass());
-        assertTrue(sec.isOauth2Active());
-        assertTrue(sec.isSaml2Active());
-
-        sec.setLoginMethod(Security.LoginMethods.NORMAL.toString());
-        assertTrue(sec.isUserPass());
-        assertFalse(sec.isOauth2Active());
-        assertFalse(sec.isSaml2Active());
-    }
-
-    @Test
-    void security_isAltLogin_reflects_oauth2_or_saml2() {
-        Security sec = new Security();
-
-        assertFalse(sec.isAltLogin());
-
-        sec.getOauth2().setEnabled(true);
-        sec.getSaml2().setEnabled(false);
-        assertTrue(sec.isAltLogin());
-
-        sec.getOauth2().setEnabled(false);
-        sec.getSaml2().setEnabled(true);
-        assertTrue(sec.isAltLogin());
-
-        sec.getOauth2().setEnabled(true);
-        sec.getSaml2().setEnabled(true);
-        assertTrue(sec.isAltLogin());
-    }
-
-    @Test
-    void oauth2_client_provider_mapping_and_unsupported() throws UnsupportedProviderException {
-        Security.OAUTH2.Client client = new Security.OAUTH2.Client();
-
-        assertNotNull(client.get("google"));
-        assertNotNull(client.get("github"));
-        assertNotNull(client.get("keycloak"));
-
-        UnsupportedProviderException ex =
-                assertThrows(UnsupportedProviderException.class, () -> client.get("unknown"));
-        assertTrue(ex.getMessage().toLowerCase().contains("not supported"));
-    }
-
-    @Test
-    void premium_google_drive_getters_return_empty_string_on_null_or_blank() {
-        Premium.ProFeatures.GoogleDrive gd = new Premium.ProFeatures.GoogleDrive();
-
-        assertEquals("", gd.getClientId());
-        assertEquals("", gd.getApiKey());
-        assertEquals("", gd.getAppId());
-
-        gd.setClientId(" id ");
-        gd.setApiKey(" key ");
-        gd.setAppId(" app ");
-        assertEquals(" id ", gd.getClientId());
-        assertEquals(" key ", gd.getApiKey());
-        assertEquals(" app ", gd.getAppId());
-    }
-
-    @Test
-    void ui_getters_return_null_for_blank() {
-        ApplicationProperties.Ui ui = new ApplicationProperties.Ui();
-        ui.setAppName("   ");
-        ui.setHomeDescription("");
-        ui.setAppNameNavbar(null);
-
-        assertNull(ui.getAppName());
-        assertNull(ui.getHomeDescription());
-        assertNull(ui.getAppNameNavbar());
-
-        ui.setAppName("Stirling-PDF");
-        ui.setHomeDescription("Home");
-        ui.setAppNameNavbar("Nav");
-        assertEquals("Stirling-PDF", ui.getAppName());
-        assertEquals("Home", ui.getHomeDescription());
-        assertEquals("Nav", ui.getAppNameNavbar());
-    }
-
-    @Test
-    void driver_toString_contains_driver_name() {
-        assertTrue(Driver.H2.toString().contains("h2"));
-        assertTrue(Driver.POSTGRESQL.toString().contains("postgresql"));
-    }
-
-    @Test
-    void session_limits_and_timeouts_have_reasonable_defaults() {
-        ApplicationProperties.ProcessExecutor pe = new ApplicationProperties.ProcessExecutor();
-
-        ApplicationProperties.ProcessExecutor.SessionLimit s = pe.getSessionLimit();
-        assertEquals(2, s.getQpdfSessionLimit());
-        assertEquals(1, s.getTesseractSessionLimit());
-        assertEquals(1, s.getLibreOfficeSessionLimit());
-        assertEquals(1, s.getPdfToHtmlSessionLimit());
-        assertEquals(8, s.getPythonOpenCvSessionLimit());
-        assertEquals(16, s.getWeasyPrintSessionLimit());
-        assertEquals(1, s.getInstallAppSessionLimit());
-        assertEquals(1, s.getCalibreSessionLimit());
-        assertEquals(8, s.getGhostscriptSessionLimit());
-        assertEquals(2, s.getOcrMyPdfSessionLimit());
-
-        ApplicationProperties.ProcessExecutor.TimeoutMinutes t = pe.getTimeoutMinutes();
-        assertEquals(30, t.getTesseractTimeoutMinutes());
-        assertEquals(30, t.getQpdfTimeoutMinutes());
-        assertEquals(30, t.getLibreOfficeTimeoutMinutes());
-        assertEquals(20, t.getPdfToHtmlTimeoutMinutes());
-        assertEquals(30, t.getPythonOpenCvTimeoutMinutes());
-        assertEquals(30, t.getWeasyPrintTimeoutMinutes());
-        assertEquals(60, t.getInstallAppTimeoutMinutes());
-        assertEquals(30, t.getCalibreTimeoutMinutes());
-        assertEquals(30, t.getGhostscriptTimeoutMinutes());
-        assertEquals(30, t.getOcrMyPdfTimeoutMinutes());
-    }
-
-    @Deprecated
-    @Test
-    void enterprise_metadata_defaults() {
-        ApplicationProperties.EnterpriseEdition ee = new ApplicationProperties.EnterpriseEdition();
-        ApplicationProperties.EnterpriseEdition.CustomMetadata eMeta = ee.getCustomMetadata();
-        eMeta.setCreator("  ");
-        eMeta.setProducer(null);
-        assertEquals("Stirling-PDF", eMeta.getCreator());
-        assertEquals("Stirling-PDF", eMeta.getProducer());
-    }
-
-    @Test
-    void premium_metadata_defaults() {
-        Premium.ProFeatures pf = new Premium.ProFeatures();
-        Premium.ProFeatures.CustomMetadata pMeta = pf.getCustomMetadata();
-        pMeta.setCreator("");
-        pMeta.setProducer("");
-        assertEquals("Stirling-PDF", pMeta.getCreator());
-        assertEquals("Stirling-PDF", pMeta.getProducer());
-    }
-
-    @Test
-    void premium_metadata_awesome() {
-        Premium.ProFeatures pf = new Premium.ProFeatures();
-        Premium.ProFeatures.CustomMetadata pMeta = pf.getCustomMetadata();
-        pMeta.setCreator("Awesome PDF Tool");
-        pMeta.setProducer("Awesome PDF Tool");
-        assertEquals("Awesome PDF Tool", pMeta.getCreator());
-        assertEquals("Awesome PDF Tool", pMeta.getProducer());
-    }
-
-    @Test
-    void string_isValid_handles_null_empty_blank_and_trimmed() {
-        ApplicationProperties.Security.OAUTH2 oauth2 = new ApplicationProperties.Security.OAUTH2();
-
-        assertFalse(oauth2.isValid((String) null, "issuer"));
-        assertFalse(oauth2.isValid("", "issuer"));
-        assertFalse(oauth2.isValid("   ", "issuer"));
-
-        assertTrue(oauth2.isValid("x", "issuer"));
-        assertTrue(oauth2.isValid("  x  ", "issuer")); // trimmt intern
-    }
-
-    @Test
-    void collection_isValid_handles_null_and_empty() {
-        ApplicationProperties.Security.OAUTH2 oauth2 = new ApplicationProperties.Security.OAUTH2();
-
-        Collection<String> nullColl = null;
-        Collection<String> empty = List.of();
-
-        assertFalse(oauth2.isValid(nullColl, "scopes"));
-        assertFalse(oauth2.isValid(empty, "scopes"));
-    }
-
-    @Test
-    void collection_isValid_true_when_non_empty_even_if_element_is_blank() {
-        ApplicationProperties.Security.OAUTH2 oauth2 = new ApplicationProperties.Security.OAUTH2();
-
-        // Aktuelles Verhalten: prüft NUR !isEmpty(), nicht Inhalt
-        Collection<String> oneBlank = new ArrayList<>();
-        oneBlank.add("   ");
-
-        assertTrue(
-                oauth2.isValid(oneBlank, "scopes"),
-                "Dokumentiert aktuelles Verhalten: nicht-leere Liste gilt als gültig, auch wenn Element leer/blank ist");
-    }
-}
@@ -1,80 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-
-class ApplicationPropertiesSaml2HttpTest {
-
-    @Test
-    void idpMetadataUri_http_is_resolved_via_mockwebserver() throws Exception {
-        try (MockWebServer server = new MockWebServer()) {
-            server.enqueue(
-                    new MockResponse()
-                            .setResponseCode(200)
-                            .addHeader("Content-Type", "application/xml")
-                            .setBody("<EntityDescriptor/>"));
-            server.start();
-
-            String url = server.url("/meta").toString();
-
-            var s = new ApplicationProperties.Security.SAML2();
-            s.setIdpMetadataUri(url);
-
-            try (InputStream in = s.getIdpMetadataUri()) {
-                String body = new String(in.readAllBytes(), StandardCharsets.UTF_8);
-                assertTrue(body.contains("EntityDescriptor"));
-            }
-        }
-    }
-
-    @Test
-    void idpMetadataUri_invalidUri_triggers_catch_and_throwsIOException() {
-        // Ungültige URI -> new URI(...) wirft URISyntaxException -> catch -> IOException
-        var s = new ApplicationProperties.Security.SAML2();
-        s.setIdpMetadataUri("http:##invalid uri"); // absichtlich kaputt (Leerzeichen + ##)
-
-        assertThrows(IOException.class, s::getIdpMetadataUri);
-    }
-
-    @Test
-    void spCert_else_branch_returns_FileSystemResource_for_filesystem_path() throws Exception {
-        var s = new ApplicationProperties.Security.SAML2();
-
-        // temporäre Datei simuliert "Filesystem"-Pfad (-> else-Zweig)
-        Path tmp = Files.createTempFile("spdf-spcert-", ".crt");
-        Files.writeString(tmp, "CERT");
-
-        s.setSpCert(tmp.toString());
-        Resource r = s.getSpCert();
-
-        assertNotNull(r);
-        assertTrue(r instanceof FileSystemResource, "Expected FileSystemResource for FS path");
-        assertTrue(r.exists(), "Temp file should exist");
-    }
-
-    @Test
-    void idpCert_else_branch_returns_FileSystemResource_even_if_missing() {
-        var s = new ApplicationProperties.Security.SAML2();
-
-        // bewusst nicht existierender Pfad -> else-Zweig wird trotzdem genommen
-        String missing = "/this/path/does/not/exist/idp.crt";
-        s.setIdpCert(missing);
-        Resource r = s.getIdpCert();
-
-        assertNotNull(r);
-        assertTrue(r instanceof FileSystemResource, "Expected FileSystemResource for FS path");
-        assertFalse(r.exists(), "Resource should not exist for missing file");
-    }
-}
@@ -1,55 +0,0 @@
-package stirling.software.common.model;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.core.io.Resource;
-
-class ApplicationPropertiesSaml2ResourceTest {
-
-    @Test
-    void idpMetadataUri_classpath_is_resolved() throws Exception {
-        var s = new ApplicationProperties.Security.SAML2();
-        s.setIdpMetadataUri("classpath:saml/dummy.txt");
-
-        try (InputStream in = s.getIdpMetadataUri()) {
-            assertNotNull(in, "Classpath InputStream should not be null");
-            String txt = new String(in.readAllBytes(), StandardCharsets.UTF_8);
-            assertTrue(txt.contains("ok"));
-        }
-    }
-
-    @Test
-    void spCert_idpCert_privateKey_null_classpath_and_filesystem() throws Exception {
-        var s = new ApplicationProperties.Security.SAML2();
-
-        s.setSpCert(null);
-        s.setIdpCert(null);
-        s.setPrivateKey(null);
-        assertNull(s.getSpCert());
-        assertNull(s.getIdpCert());
-        assertNull(s.getPrivateKey());
-
-        s.setSpCert("classpath:saml/dummy.txt");
-        s.setIdpCert("classpath:saml/dummy.txt");
-        s.setPrivateKey("classpath:saml/dummy.txt");
-        Resource sp = s.getSpCert();
-        Resource idp = s.getIdpCert();
-        Resource pk = s.getPrivateKey();
-        assertTrue(sp.exists());
-        assertTrue(idp.exists());
-        assertTrue(pk.exists());
-
-        Path tmp = Files.createTempFile("spdf-key-", ".pem");
-        Files.writeString(tmp, "KEY");
-        s.setPrivateKey(tmp.toString());
-        Resource pkFs = s.getPrivateKey();
-        assertNotNull(pkFs);
-        assertTrue(pkFs.exists());
-    }
-}
@@ -1 +0,0 @@
-ok
@@ -1,28 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import lombok.RequiredArgsConstructor;
-
-@Configuration
-@RequiredArgsConstructor
-public class WebMvcConfig implements WebMvcConfigurer {
-
-    private final EndpointInterceptor endpointInterceptor;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(endpointInterceptor);
-    }
-
-    // @Override
-    // public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    //     // Handler for external static resources - DISABLED in backend-only mode
-    //     registry.addResourceHandler("/**")
-    //             .addResourceLocations(
-    //                     "file:" + InstallationPathConfig.getStaticPath(), "classpath:/static/");
-    //     // .setCachePeriod(0); // Optional: disable caching
-    // }
-}
@@ -1,300 +0,0 @@
-package stirling.software.SPDF.controller.api;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.stream.Stream;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.model.Dependency;
-import stirling.software.SPDF.model.SignatureFile;
-import stirling.software.SPDF.service.SignatureService;
-import stirling.software.common.configuration.InstallationPathConfig;
-import stirling.software.common.configuration.RuntimePathConfig;
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.UserServiceInterface;
-import stirling.software.common.util.ExceptionUtils;
-import stirling.software.common.util.GeneralUtils;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/v1/ui-data")
-@Tag(name = "UI Data", description = "APIs for React UI data")
-public class UIDataController {
-
-    private final ApplicationProperties applicationProperties;
-    private final SignatureService signatureService;
-    private final UserServiceInterface userService;
-    private final ResourceLoader resourceLoader;
-    private final RuntimePathConfig runtimePathConfig;
-
-    public UIDataController(
-            ApplicationProperties applicationProperties,
-            SignatureService signatureService,
-            @Autowired(required = false) UserServiceInterface userService,
-            ResourceLoader resourceLoader,
-            RuntimePathConfig runtimePathConfig) {
-        this.applicationProperties = applicationProperties;
-        this.signatureService = signatureService;
-        this.userService = userService;
-        this.resourceLoader = resourceLoader;
-        this.runtimePathConfig = runtimePathConfig;
-    }
-
-    @GetMapping("/home")
-    @Operation(summary = "Get home page data")
-    public ResponseEntity<HomeData> getHomeData() {
-        String showSurvey = System.getenv("SHOW_SURVEY");
-        boolean showSurveyValue = showSurvey == null || "true".equalsIgnoreCase(showSurvey);
-
-        HomeData data = new HomeData();
-        data.setShowSurveyFromDocker(showSurveyValue);
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/licenses")
-    @Operation(summary = "Get third-party licenses data")
-    public ResponseEntity<LicensesData> getLicensesData() {
-        LicensesData data = new LicensesData();
-        Resource resource = new ClassPathResource("static/3rdPartyLicenses.json");
-
-        try {
-            InputStream is = resource.getInputStream();
-            String json = new String(is.readAllBytes(), StandardCharsets.UTF_8);
-            ObjectMapper mapper = new ObjectMapper();
-            Map<String, List<Dependency>> licenseData =
-                    mapper.readValue(json, new TypeReference<>() {});
-            data.setDependencies(licenseData.get("dependencies"));
-        } catch (IOException e) {
-            log.error("Failed to load licenses data", e);
-            data.setDependencies(Collections.emptyList());
-        }
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/pipeline")
-    @Operation(summary = "Get pipeline configuration data")
-    public ResponseEntity<PipelineData> getPipelineData() {
-        PipelineData data = new PipelineData();
-        List<String> pipelineConfigs = new ArrayList<>();
-        List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
-
-        if (new java.io.File(runtimePathConfig.getPipelineDefaultWebUiConfigs()).exists()) {
-            try (Stream<Path> paths =
-                    Files.walk(Paths.get(runtimePathConfig.getPipelineDefaultWebUiConfigs()))) {
-                List<Path> jsonFiles =
-                        paths.filter(Files::isRegularFile)
-                                .filter(p -> p.toString().endsWith(".json"))
-                                .toList();
-
-                for (Path jsonFile : jsonFiles) {
-                    String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
-                    pipelineConfigs.add(content);
-                }
-
-                for (String config : pipelineConfigs) {
-                    Map<String, Object> jsonContent =
-                            new ObjectMapper()
-                                    .readValue(config, new TypeReference<Map<String, Object>>() {});
-                    String name = (String) jsonContent.get("name");
-                    if (name == null || name.length() < 1) {
-                        String filename =
-                                jsonFiles
-                                        .get(pipelineConfigs.indexOf(config))
-                                        .getFileName()
-                                        .toString();
-                        name = filename.substring(0, filename.lastIndexOf('.'));
-                    }
-                    Map<String, String> configWithName = new HashMap<>();
-                    configWithName.put("json", config);
-                    configWithName.put("name", name);
-                    pipelineConfigsWithNames.add(configWithName);
-                }
-            } catch (IOException e) {
-                log.error("Failed to load pipeline configs", e);
-            }
-        }
-
-        if (pipelineConfigsWithNames.isEmpty()) {
-            Map<String, String> configWithName = new HashMap<>();
-            configWithName.put("json", "");
-            configWithName.put("name", "No preloaded configs found");
-            pipelineConfigsWithNames.add(configWithName);
-        }
-
-        data.setPipelineConfigsWithNames(pipelineConfigsWithNames);
-        data.setPipelineConfigs(pipelineConfigs);
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/sign")
-    @Operation(summary = "Get signature form data")
-    public ResponseEntity<SignData> getSignData() {
-        String username = "";
-        if (userService != null) {
-            username = userService.getCurrentUsername();
-        }
-
-        List<SignatureFile> signatures = signatureService.getAvailableSignatures(username);
-        List<FontResource> fonts = getFontNames();
-
-        SignData data = new SignData();
-        data.setSignatures(signatures);
-        data.setFonts(fonts);
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/ocr-pdf")
-    @Operation(summary = "Get OCR PDF data")
-    public ResponseEntity<OcrData> getOcrPdfData() {
-        List<String> languages = getAvailableTesseractLanguages();
-
-        OcrData data = new OcrData();
-        data.setLanguages(languages);
-
-        return ResponseEntity.ok(data);
-    }
-
-    private List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = applicationProperties.getSystem().getTessdataDir();
-        java.io.File[] files = new java.io.File(tessdataDir).listFiles();
-        if (files == null) {
-            return Collections.emptyList();
-        }
-        return Arrays.stream(files)
-                .filter(file -> file.getName().endsWith(".traineddata"))
-                .map(file -> file.getName().replace(".traineddata", ""))
-                .filter(lang -> !"osd".equalsIgnoreCase(lang))
-                .sorted()
-                .toList();
-    }
-
-    private List<FontResource> getFontNames() {
-        List<FontResource> fontNames = new ArrayList<>();
-        fontNames.addAll(getFontNamesFromLocation("classpath:static/fonts/*.woff2"));
-        fontNames.addAll(
-                getFontNamesFromLocation(
-                        "file:"
-                                + InstallationPathConfig.getStaticPath()
-                                + "fonts"
-                                + java.io.File.separator
-                                + "*"));
-        return fontNames;
-    }
-
-    private List<FontResource> getFontNamesFromLocation(String locationPattern) {
-        try {
-            Resource[] resources =
-                    GeneralUtils.getResourcesFromLocationPattern(locationPattern, resourceLoader);
-            return Arrays.stream(resources)
-                    .map(
-                            resource -> {
-                                try {
-                                    String filename = resource.getFilename();
-                                    if (filename != null) {
-                                        int lastDotIndex = filename.lastIndexOf('.');
-                                        if (lastDotIndex != -1) {
-                                            String name = filename.substring(0, lastDotIndex);
-                                            String extension = filename.substring(lastDotIndex + 1);
-                                            return new FontResource(name, extension);
-                                        }
-                                    }
-                                    return null;
-                                } catch (Exception e) {
-                                    throw ExceptionUtils.createRuntimeException(
-                                            "error.fontLoadingFailed",
-                                            "Error processing font file",
-                                            e);
-                                }
-                            })
-                    .filter(Objects::nonNull)
-                    .toList();
-        } catch (Exception e) {
-            throw ExceptionUtils.createRuntimeException(
-                    "error.fontDirectoryReadFailed", "Failed to read font directory", e);
-        }
-    }
-
-    // Data classes
-    @Data
-    public static class HomeData {
-        private boolean showSurveyFromDocker;
-    }
-
-    @Data
-    public static class LicensesData {
-        private List<Dependency> dependencies;
-    }
-
-    @Data
-    public static class PipelineData {
-        private List<Map<String, String>> pipelineConfigsWithNames;
-        private List<String> pipelineConfigs;
-    }
-
-    @Data
-    public static class SignData {
-        private List<SignatureFile> signatures;
-        private List<FontResource> fonts;
-    }
-
-    @Data
-    public static class OcrData {
-        private List<String> languages;
-    }
-
-    @Data
-    public static class FontResource {
-        private String name;
-        private String extension;
-        private String type;
-
-        public FontResource(String name, String extension) {
-            this.name = name;
-            this.extension = extension;
-            this.type = getFormatFromExtension(extension);
-        }
-
-        private static String getFormatFromExtension(String extension) {
-            switch (extension) {
-                case "ttf":
-                    return "truetype";
-                case "woff":
-                    return "woff";
-                case "woff2":
-                    return "woff2";
-                case "eot":
-                    return "embedded-opentype";
-                case "svg":
-                    return "svg";
-                default:
-                    return "";
-            }
-        }
-    }
-}
@@ -1,414 +0,0 @@
-package stirling.software.SPDF.controller.api.misc;
-
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import javax.imageio.ImageIO;
-
-import org.apache.pdfbox.multipdf.PDFMergerUtility;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.util.ExceptionUtils;
-import stirling.software.common.util.ProcessExecutor;
-import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.common.util.TempDirectory;
-import stirling.software.common.util.TempFile;
-import stirling.software.common.util.TempFileManager;
-import stirling.software.common.util.WebResponseUtils;
-
-@RestController
-@RequestMapping("/api/v1/misc")
-@Tag(name = "Misc", description = "Miscellaneous APIs")
-@Slf4j
-@RequiredArgsConstructor
-public class OCRController {
-
-    private final ApplicationProperties applicationProperties;
-    private final CustomPDFDocumentFactory pdfDocumentFactory;
-    private final TempFileManager tempFileManager;
-    private final EndpointConfiguration endpointConfiguration;
-
-    private boolean isOcrMyPdfEnabled() {
-        return endpointConfiguration.isGroupEnabled("OCRmyPDF");
-    }
-
-    private boolean isTesseractEnabled() {
-        return endpointConfiguration.isGroupEnabled("tesseract");
-    }
-
-    /** Gets the list of available Tesseract languages from the tessdata directory */
-    public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = applicationProperties.getSystem().getTessdataDir();
-        File[] files = new File(tessdataDir).listFiles();
-        if (files == null) {
-            return Collections.emptyList();
-        }
-        return Arrays.stream(files)
-                .filter(file -> file.getName().endsWith(".traineddata"))
-                .map(file -> file.getName().replace(".traineddata", ""))
-                .filter(lang -> !"osd".equalsIgnoreCase(lang))
-                .toList();
-    }
-
-    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
-    @Operation(
-            summary = "Process a PDF file with OCR",
-            description =
-                    "This endpoint processes a PDF file using OCR (Optical Character Recognition). "
-                            + "Users can specify languages, sidecar, deskew, clean, cleanFinal, ocrType, ocrRenderType, and removeImagesAfter options. "
-                            + "Uses OCRmyPDF if available, falls back to Tesseract. Input:PDF Output:PDF Type:SI-Conditional")
-    public ResponseEntity<byte[]> processPdfWithOCR(
-            @ModelAttribute ProcessPdfWithOcrRequest request)
-            throws IOException, InterruptedException {
-        MultipartFile inputFile = request.getFileInput();
-        List<String> selectedLanguages = request.getLanguages();
-        Boolean sidecar = request.isSidecar();
-        Boolean deskew = request.isDeskew();
-        Boolean clean = request.isClean();
-        Boolean cleanFinal = request.isCleanFinal();
-        String ocrType = request.getOcrType();
-        String ocrRenderType = request.getOcrRenderType();
-        Boolean removeImagesAfter = request.isRemoveImagesAfter();
-
-        if (selectedLanguages == null || selectedLanguages.isEmpty()) {
-            throw ExceptionUtils.createOcrLanguageRequiredException();
-        }
-
-        if (!"hocr".equals(ocrRenderType) && !"sandwich".equals(ocrRenderType)) {
-            throw new IOException("ocrRenderType wrong");
-        }
-
-        // Get available Tesseract languages
-        List<String> availableLanguages = getAvailableTesseractLanguages();
-
-        // Validate selected languages
-        selectedLanguages =
-                selectedLanguages.stream().filter(availableLanguages::contains).toList();
-
-        if (selectedLanguages.isEmpty()) {
-            throw ExceptionUtils.createOcrInvalidLanguagesException();
-        }
-
-        // Use try-with-resources for proper temp file management
-        try (TempFile tempInputFile = new TempFile(tempFileManager, ".pdf");
-                TempFile tempOutputFile = new TempFile(tempFileManager, ".pdf")) {
-
-            inputFile.transferTo(tempInputFile.getFile());
-
-            TempFile sidecarTextFile = null;
-
-            try {
-                // Use OCRmyPDF if available (no fallback - error if it fails)
-                if (isOcrMyPdfEnabled()) {
-                    if (sidecar != null && sidecar) {
-                        sidecarTextFile = new TempFile(tempFileManager, ".txt");
-                    }
-
-                    processWithOcrMyPdf(
-                            selectedLanguages,
-                            sidecar,
-                            deskew,
-                            clean,
-                            cleanFinal,
-                            ocrType,
-                            ocrRenderType,
-                            removeImagesAfter,
-                            tempInputFile.getPath(),
-                            tempOutputFile.getPath(),
-                            sidecarTextFile != null ? sidecarTextFile.getPath() : null);
-                    log.info("OCRmyPDF processing completed successfully");
-                }
-                // Use Tesseract only if OCRmyPDF is not available
-                else if (isTesseractEnabled()) {
-                    processWithTesseract(
-                            selectedLanguages,
-                            ocrType,
-                            tempInputFile.getPath(),
-                            tempOutputFile.getPath());
-                    log.info("Tesseract processing completed successfully");
-                } else {
-                    throw ExceptionUtils.createOcrToolsUnavailableException();
-                }
-
-                // Read the processed PDF file
-                byte[] pdfBytes = Files.readAllBytes(tempOutputFile.getPath());
-
-                // Return the OCR processed PDF as a response
-                String outputFilename =
-                        Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                        .replaceFirst("[.][^.]+$", "")
-                                + "_OCR.pdf";
-
-                if (sidecar != null && sidecar && sidecarTextFile != null) {
-                    // Create a zip file containing both the PDF and the text file
-                    String outputZipFilename =
-                            Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                            .replaceFirst("[.][^.]+$", "")
-                                    + "_OCR.zip";
-
-                    try (TempFile tempZipFile = new TempFile(tempFileManager, ".zip");
-                            ZipOutputStream zipOut =
-                                    new ZipOutputStream(
-                                            Files.newOutputStream(tempZipFile.getPath()))) {
-
-                        // Add PDF file to the zip
-                        ZipEntry pdfEntry = new ZipEntry(outputFilename);
-                        zipOut.putNextEntry(pdfEntry);
-                        zipOut.write(pdfBytes);
-                        zipOut.closeEntry();
-
-                        // Add text file to the zip
-                        ZipEntry txtEntry = new ZipEntry(outputFilename.replace(".pdf", ".txt"));
-                        zipOut.putNextEntry(txtEntry);
-                        Files.copy(sidecarTextFile.getPath(), zipOut);
-                        zipOut.closeEntry();
-
-                        zipOut.finish();
-
-                        byte[] zipBytes = Files.readAllBytes(tempZipFile.getPath());
-
-                        // Return the zip file containing both the PDF and the text file
-                        return WebResponseUtils.bytesToWebResponse(
-                                zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
-                    }
-                } else {
-                    // Return the OCR processed PDF as a response
-                    return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-                }
-
-            } finally {
-                // Clean up sidecar temp file if created
-                if (sidecarTextFile != null) {
-                    try {
-                        sidecarTextFile.close();
-                    } catch (Exception e) {
-                        log.warn("Failed to close sidecar temp file", e);
-                    }
-                }
-            }
-        }
-    }
-
-    private void processWithOcrMyPdf(
-            List<String> selectedLanguages,
-            Boolean sidecar,
-            Boolean deskew,
-            Boolean clean,
-            Boolean cleanFinal,
-            String ocrType,
-            String ocrRenderType,
-            Boolean removeImagesAfter,
-            Path tempInputFile,
-            Path tempOutputFile,
-            Path sidecarTextPath)
-            throws IOException, InterruptedException {
-
-        // Build OCRmyPDF command
-        String languageOption = String.join("+", selectedLanguages);
-
-        List<String> command =
-                new ArrayList<>(
-                        Arrays.asList(
-                                "ocrmypdf",
-                                "--verbose",
-                                "2",
-                                "--output-type",
-                                "pdf",
-                                "--pdf-renderer",
-                                ocrRenderType));
-
-        if (sidecar != null && sidecar && sidecarTextPath != null) {
-            command.add("--sidecar");
-            command.add(sidecarTextPath.toString());
-        }
-
-        if (deskew != null && deskew) {
-            command.add("--deskew");
-        }
-        if (clean != null && clean) {
-            command.add("--clean");
-        }
-        if (cleanFinal != null && cleanFinal) {
-            command.add("--clean-final");
-        }
-        if (ocrType != null && !"".equals(ocrType)) {
-            if ("skip-text".equals(ocrType)) {
-                command.add("--skip-text");
-            } else if ("force-ocr".equals(ocrType)) {
-                command.add("--force-ocr");
-            }
-        }
-
-        command.addAll(
-                Arrays.asList(
-                        "--language",
-                        languageOption,
-                        tempInputFile.toString(),
-                        tempOutputFile.toString()));
-
-        // Run CLI command
-        ProcessExecutorResult result =
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
-                        .runCommandWithOutputHandling(command);
-
-        if (result.getRc() != 0
-                && result.getMessages().contains("multiprocessing/synchronize.py")
-                && result.getMessages().contains("OSError: [Errno 38] Function not implemented")) {
-            command.add("--jobs");
-            command.add("1");
-            result =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
-                            .runCommandWithOutputHandling(command);
-        }
-
-        if (result.getRc() != 0) {
-            throw new IOException("OCRmyPDF failed with return code: " + result.getRc());
-        }
-
-        // Remove images from the OCR processed PDF if the flag is set to true
-        if (removeImagesAfter != null && removeImagesAfter) {
-            try (TempFile tempPdfWithoutImages = new TempFile(tempFileManager, "_no_images.pdf")) {
-                List<String> gsCommand =
-                        Arrays.asList(
-                                "gs",
-                                "-sDEVICE=pdfwrite",
-                                "-dFILTERIMAGE",
-                                "-o",
-                                tempPdfWithoutImages.getPath().toString(),
-                                tempOutputFile.toString());
-
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                        .runCommandWithOutputHandling(gsCommand);
-
-                // Replace output file with version without images
-                Files.copy(
-                        tempPdfWithoutImages.getPath(),
-                        tempOutputFile,
-                        java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-            }
-        }
-    }
-
-    private void processWithTesseract(
-            List<String> selectedLanguages, String ocrType, Path tempInputFile, Path tempOutputFile)
-            throws IOException, InterruptedException {
-
-        // Create temp directory for Tesseract processing
-        try (TempDirectory tempDir = new TempDirectory(tempFileManager)) {
-            File tempOutputDir = new File(tempDir.getPath().toFile(), "output");
-            File tempImagesDir = new File(tempDir.getPath().toFile(), "images");
-            File finalOutputFile = new File(tempDir.getPath().toFile(), "final_output.pdf");
-
-            // Create directories
-            tempOutputDir.mkdirs();
-            tempImagesDir.mkdirs();
-
-            PDFMergerUtility merger = new PDFMergerUtility();
-            merger.setDestinationFileName(finalOutputFile.toString());
-
-            try (PDDocument document = pdfDocumentFactory.load(tempInputFile.toFile())) {
-                PDFRenderer pdfRenderer = new PDFRenderer(document);
-                int pageCount = document.getNumberOfPages();
-
-                for (int pageNum = 0; pageNum < pageCount; pageNum++) {
-                    PDPage page = document.getPage(pageNum);
-                    boolean hasText = false;
-
-                    // Check for existing text
-                    try (PDDocument tempDoc = new PDDocument()) {
-                        tempDoc.addPage(page);
-                        PDFTextStripper stripper = new PDFTextStripper();
-                        hasText = !stripper.getText(tempDoc).trim().isEmpty();
-                    }
-
-                    boolean shouldOcr =
-                            switch (ocrType) {
-                                case "skip-text" -> !hasText;
-                                case "force-ocr" -> true;
-                                default -> true;
-                            };
-
-                    File pageOutputPath =
-                            new File(tempOutputDir, String.format("page_%d.pdf", pageNum));
-
-                    if (shouldOcr) {
-                        // Convert page to image
-                        BufferedImage image = pdfRenderer.renderImageWithDPI(pageNum, 300);
-                        File imagePath =
-                                new File(tempImagesDir, String.format("page_%d.png", pageNum));
-                        ImageIO.write(image, "png", imagePath);
-
-                        // Build OCR command
-                        List<String> command = new ArrayList<>();
-                        command.add("tesseract");
-                        command.add(imagePath.toString());
-                        command.add(
-                                new File(tempOutputDir, String.format("page_%d", pageNum))
-                                        .toString());
-                        command.add("-l");
-                        command.add(String.join("+", selectedLanguages));
-                        command.add("pdf"); // Always output PDF
-
-                        ProcessExecutorResult result =
-                                ProcessExecutor.getInstance(ProcessExecutor.Processes.TESSERACT)
-                                        .runCommandWithOutputHandling(command);
-
-                        if (result.getRc() != 0) {
-                            throw ExceptionUtils.createRuntimeException(
-                                    "error.commandFailed",
-                                    "{0} command failed with exit code: {1}",
-                                    null,
-                                    "Tesseract",
-                                    result.getRc());
-                        }
-
-                        // Add OCR'd PDF to merger
-                        merger.addSource(pageOutputPath);
-                    } else {
-                        // Save original page without OCR
-                        try (PDDocument pageDoc = new PDDocument()) {
-                            pageDoc.addPage(page);
-                            pageDoc.save(pageOutputPath);
-                            merger.addSource(pageOutputPath);
-                        }
-                    }
-                }
-            }
-
-            // Merge all pages into final PDF
-            merger.mergeDocuments(null);
-
-            // Copy final output to the expected location
-            Files.copy(
-                    finalOutputFile.toPath(),
-                    tempOutputFile,
-                    java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-        }
-    }
-}
@@ -1,133 +0,0 @@
-package stirling.software.SPDF.controller.api.misc;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.model.api.PDFFile;
-import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.util.ProcessExecutor;
-import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.common.util.TempFile;
-import stirling.software.common.util.TempFileManager;
-import stirling.software.common.util.WebResponseUtils;
-
-@RestController
-@RequestMapping("/api/v1/misc")
-@Tag(name = "Misc", description = "Miscellaneous APIs")
-@Slf4j
-@RequiredArgsConstructor
-public class RepairController {
-
-    private final CustomPDFDocumentFactory pdfDocumentFactory;
-    private final TempFileManager tempFileManager;
-    private final EndpointConfiguration endpointConfiguration;
-
-    private boolean isGhostscriptEnabled() {
-        return endpointConfiguration.isGroupEnabled("Ghostscript");
-    }
-
-    private boolean isQpdfEnabled() {
-        return endpointConfiguration.isGroupEnabled("qpdf");
-    }
-
-    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/repair")
-    @Operation(
-            summary = "Repair a PDF file",
-            description =
-                    "This endpoint repairs a given PDF file by running Ghostscript (primary), qpdf (fallback), or PDFBox (if no external tools available). The PDF is"
-                            + " first saved to a temporary location, repaired, read back, and then"
-                            + " returned as a response. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile file)
-            throws IOException, InterruptedException {
-        MultipartFile inputFile = file.getFileInput();
-
-        // Use TempFile with try-with-resources for automatic cleanup
-        try (TempFile tempInputFile = new TempFile(tempFileManager, ".pdf");
-                TempFile tempOutputFile = new TempFile(tempFileManager, ".pdf")) {
-
-            // Save the uploaded file to the temporary location
-            inputFile.transferTo(tempInputFile.getFile());
-
-            boolean repairSuccess = false;
-
-            // Try Ghostscript first if available
-            if (isGhostscriptEnabled()) {
-                try {
-                    List<String> gsCommand = new ArrayList<>();
-                    gsCommand.add("gs");
-                    gsCommand.add("-o");
-                    gsCommand.add(tempOutputFile.getPath().toString());
-                    gsCommand.add("-sDEVICE=pdfwrite");
-                    gsCommand.add(tempInputFile.getPath().toString());
-
-                    ProcessExecutorResult gsResult =
-                            ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                                    .runCommandWithOutputHandling(gsCommand);
-
-                    if (gsResult.getRc() == 0) {
-                        repairSuccess = true;
-                    }
-                } catch (Exception e) {
-                    // Log and continue to QPDF fallback
-                    log.warn("Ghostscript repair failed, trying QPDF fallback: ", e);
-                }
-            }
-
-            // Fallback to QPDF if Ghostscript failed or not available
-            if (!repairSuccess && isQpdfEnabled()) {
-                List<String> qpdfCommand = new ArrayList<>();
-                qpdfCommand.add("qpdf");
-                qpdfCommand.add("--replace-input"); // Automatically fixes problems it can
-                qpdfCommand.add("--qdf"); // Linearizes and normalizes PDF structure
-                qpdfCommand.add("--object-streams=disable"); // Can help with some corruptions
-                qpdfCommand.add(tempInputFile.getPath().toString());
-                qpdfCommand.add(tempOutputFile.getPath().toString());
-
-                ProcessExecutorResult qpdfResult =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF)
-                                .runCommandWithOutputHandling(qpdfCommand);
-
-                repairSuccess = true;
-            }
-
-            // Use PDFBox as last resort if no external tools are available
-            if (!repairSuccess) {
-                if (!isGhostscriptEnabled() && !isQpdfEnabled()) {
-                    // Basic PDFBox repair - load and save to fix structural issues
-                    try (var document = pdfDocumentFactory.load(tempInputFile.getFile())) {
-                        document.save(tempOutputFile.getFile());
-                        repairSuccess = true;
-                    }
-                } else {
-                    throw new IOException("PDF repair failed with available tools");
-                }
-            }
-
-            // Read the repaired PDF file
-            byte[] pdfBytes = pdfDocumentFactory.loadToBytes(tempOutputFile.getFile());
-
-            // Return the repaired PDF as a response
-            String outputFilename =
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_repaired.pdf";
-            return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-        }
-    }
-}
@@ -1,625 +0,0 @@
-/* Base Container Styles */
-.multi-tool-container {
-  max-width: 100vw;
-  margin: 0;
-  padding: 0 20px;
-}
-
-/* Form Elements */
-label {
-  text-align: left;
-  display: block;
-  padding: 0rem 0.25rem;
-  font-size: 1.25rem;
-}
-
-.form-control {
-  border-radius: 16px !important;
-  padding: 0.75rem;
-  border: 1px solid var(--theme-color-outline-variant);
-  flex-grow: 5;
-}
-
-/* Action Bar Styles */
-.mt-action-bar {
-  display: flex;
-  gap: 10px;
-  align-items: start;
-  border: none;
-  backdrop-filter: blur(2px);
-  top: 10px;
-  z-index: 11;
-  padding: 1.25rem;
-  border-radius: 2rem;
-  margin: 0px 25px;
-  justify-content: center;
-}
-
-.mt-action-bar > * {
-  padding-bottom: 0.5rem;
-}
-
-.mt-file-uploader {
-  width: 100%;
-}
-
-.mt-action-bar svg,
-.mt-action-btn svg {
-  width: 20px;
-  height: 20px;
-}
-
-.mt-action-bar .mt-filename {
-  width: 100%;
-  display: flex;
-  gap: 10px;
-}
-
-/* Action Button Styles */
-.mt-action-btn {
-  position: fixed;
-  bottom: 80px;
-  left: 50%;
-  transform: translateX(-50%);
-  border-radius: 2rem;
-  z-index: 12;
-  background-color: var(--md-sys-color-surface-container-low);
-  display: flex;
-  gap: 10px;
-  width: fit-content;
-  justify-content: center;
-  padding: 10px 20px;
-  transition: all 0.3s ease-in-out;
-}
-
-.mt-action-btn .btn {
-  width: 3.5rem;
-  height: 3.5rem;
-  border-radius: 20px;
-  padding: 0;
-  position: relative;
-}
-
-/* Card and Container Styles */
-.bg-card {
-  background-color: var(--md-sys-color-surface-5);
-  border-radius: 3rem;
-  padding: 15px 0;
-  margin-left: 55px;
-  margin-right: 20px;
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-}
-
-#pages-container-wrapper {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  padding: 0.75rem;
-  border-radius: 25px;
-  min-height: 275px;
-  margin: 0 0 20px 0;
-}
-
-#pages-container {
-  display: inline-flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  justify-content: flex-start;
-  width: fit-content;
-  max-width: 100%;
-}
-
-/* Scrollbar Styles */
-#pages-container-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-#pages-container-wrapper::-webkit-scrollbar-track {
-  background: var(--scroll-bar-color);
-}
-
-#pages-container-wrapper::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background: var(--scroll-bar-thumb);
-}
-
-#pages-container-wrapper::-webkit-scrollbar-thumb:hover {
-  background: var(--scroll-bar-thumb-hover);
-}
-
-/* Page Container Base Styles */
-.page-container {
-  display: inline-block;
-  list-style-type: none;
-  width: 260px;
-  height: 260px;
-  line-height: 50px;
-  margin-top: 15px;
-  box-sizing: border-box;
-  text-align: center;
-  aspect-ratio: 1;
-  position: relative;
-  user-select: none;
-  transition: width 0.3s ease-in-out;
-}
-
-/* Responsive Page Container Sizes */
-@media only screen and (max-width: 480px) {
-  .page-container {
-    width: calc(100vw - 90px);
-    height: calc(100vw - 90px);
-    max-width: 300px;
-    max-height: 300px;
-    margin: 5px auto;
-  }
-  #pages-container { gap: 10px; }
-}
-
-@media only screen and (min-width: 481px) and (max-width: 768px) {
-  .page-container {
-    width: calc((100vw - 120px - 12px) / 2);
-    height: calc((100vw - 120px - 12px) / 2);
-    max-width: 250px;
-    max-height: 250px;
-    margin: 6px;
-  }
-  #pages-container { gap: 12px; }
-}
-
-@media only screen and (min-width: 769px) and (max-width: 1199px) {
-  .page-container {
-    width: calc((100vw - 140px - 45px) / 3);
-    height: calc((100vw - 140px - 45px) / 3);
-    max-width: 220px;
-    max-height: 220px;
-    margin: 7px;
-  }
-  #pages-container { gap: 15px; }
-}
-
-@media only screen and (min-width: 1200px) and (max-width: 1280px) {
-  .page-container {
-    width: calc((100vw - 160px - 60px) / 4);
-    height: calc((100vw - 160px - 60px) / 4);
-    max-width: 200px;
-    max-height: 200px;
-    margin: 8px;
-  }
-  #pages-container { gap: 17px; }
-}
-
-@media only screen and (min-width: 1281px) {
-  .page-container {
-    width: calc((100vw - 180px - 80px) / 5);
-    height: calc((100vw - 180px - 80px) / 5);
-    max-width: 190px;
-    max-height: 190px;
-    margin: 10px;
-  }
-  #pages-container { gap: 20px; }
-}
-
-/* Split Page Styles */
-.page-container.split-before {
-  border-left: 1px dashed var(--md-sys-color-on-surface);
-  padding-left: -1px;
-}
-
-.page-container.split-before:first-child {
-  border-left: none;
-}
-
-.page-container:first-child .pdf-actions_split-file-button {
-  display: none;
-}
-
-/* RTL Language Support */
-.page-container:last-child:lang(ar),
-.page-container:last-child:lang(he),
-.page-container:last-child:lang(fa),
-.page-container:last-child:lang(ur),
-.page-container:last-child:lang(ckb),
-.page-container:last-child:lang(ks),
-.page-container:last-child:lang(kk),
-.page-container:last-child:lang(uz),
-.page-container:last-child:lang(ky),
-.page-container:last-child:lang(bal),
-.page-container:last-child:lang(dv),
-.page-container:last-child:lang(ps),
-.page-container:last-child:lang(sdg),
-.page-container:last-child:lang(syr),
-.page-container:last-child:lang(mzn),
-.page-container:last-child:lang(tgl),
-.page-container:last-child:lang(pnb),
-.page-container:last-child:lang(ug),
-.page-container:last-child:lang(nqo),
-.page-container:last-child:lang(bqi) {
-  margin-left: auto !important;
-  margin-right: 0 !important;
-}
-
-/* Page Image Styles */
-.page-container img {
-  max-width: calc(100% - 8px);
-  max-height: calc(100% - 8px);
-  display: block;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  translate: -50% -50%;
-  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384);
-  border-radius: 4px;
-  transition: rotate 0.3s;
-}
-
-/* Page Number Styles */
-.page-number {
-  position: absolute;
-  top: 5px;
-  left: 5px;
-  line-height: normal;
-  color: var(--md-sys-color-on-secondary);
-  background-color: rgba(162, 201, 255, 0.8);
-  padding: 6px 8px;
-  border-radius: 8px;
-  font-size: 16px;
-  z-index: 2;
-  font-weight: 450;
-}
-
-/* Tool Header and Button Styles */
-.tool-header {
-  margin: 0.5rem 1rem 1rem;
-}
-
-#select-pages-button {
-  opacity: 0.5;
-}
-
-#add-pdf-button {
-  margin: 0 auto;
-}
-
-/* Selected Pages Container Styles */
-.selected-pages-container {
-  background-color: var(--md-sys-color-surface);
-  border-radius: 16px;
-  padding: 15px;
-  width: 100%;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-  font-family: Arial, sans-serif;
-}
-
-.selected-pages-container h3 {
-  color: var(--md-sys-color-on-surface);
-  font-size: 1.2em;
-  margin-bottom: 10px;
-}
-
-.selected-pages-header {
-  margin-bottom: 15px;
-}
-
-.selected-pages-header h5 {
-  margin: 0 0 8px 0 !important;
-  font-size: 1.1rem;
-  font-weight: 600;
-  color: var(--md-sys-color-on-surface);
-}
-
-.selected-pages-header #csv-input {
-  width: 100%;
-  height: 2.5rem;
-  border-radius: 8px;
-  border: 1px solid var(--md-sys-color-outline);
-  background-color: var(--md-sys-color-surface);
-  color: var(--md-sys-color-on-surface);
-  padding: 0 12px;
-  font-size: 0.95rem;
-}
-
-.selected-pages-header #csv-input:focus {
-  outline: none;
-  border-color: var(--md-sys-color-primary);
-  box-shadow: 0 0 0 2px rgba(var(--md-sys-color-primary-rgb), 0.2);
-}
-
-/* Pages List Styles */
-.pages-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-  padding: 0;
-  list-style: none;
-  min-height: 0;
-  max-height: 10rem;
-  overflow: auto;
-}
-
-.page-item {
-  background-color: var(--md-sys-color-surface-container-low);
-  border-radius: 8px;
-  padding: 8px 12px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  font-weight: bold;
-  color: var(--md-sys-color-on-surface);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  width: 7rem;
-  height: 2.5rem;
-}
-
-.selected-page-number {
-  width: 4rem;
-  font-size: small;
-}
-
-.remove-btn {
-  cursor: pointer;
-  color: var(--md-sys-color-on-surface);
-  font-size: 1.2em;
-}
-
-.checkbox-container {
-  align-items: center;
-  justify-content: center;
-  display: flex;
-  flex-direction: column;
-}
-
-.checkbox-label {
-  font-size: medium;
-}
-
-/* Zoom Level Responsive Styles */
-@media only screen and (min-width: 2000px) {
-  .mt-action-btn {
-    gap: 12px;
-    padding: 12px 24px;
-    border-radius: 2.5rem;
-  }
-  .mt-action-btn .btn {
-    width: 4rem;
-    height: 4rem;
-    border-radius: 22px;
-  }
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 1.7rem;
-  }
-}
-
-@media only screen and (min-width: 2560px) {
-  .mt-action-btn {
-    gap: 15px;
-    padding: 15px 30px;
-    border-radius: 3rem;
-  }
-  .mt-action-btn .btn {
-    width: 5rem;
-    height: 5rem;
-    border-radius: 28px;
-  }
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 2.1rem;
-  }
-}
-
-@media only screen and (min-width: 3840px) {
-  .mt-action-btn {
-    gap: 20px;
-    padding: 20px 40px;
-    border-radius: 4rem;
-  }
-  .mt-action-btn .btn {
-    width: 7rem;
-    height: 7rem;
-    border-radius: 40px;
-  }
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 3rem;
-  }
-}
-
-@media only screen and (min-width: 7680px) {
-  .mt-action-btn {
-    gap: 40px;
-    padding: 40px 80px;
-    border-radius: 8rem;
-  }
-  .mt-action-btn .btn {
-    width: 14rem;
-    height: 14rem;
-    border-radius: 80px;
-  }
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 6rem;
-  }
-}
-
-/* Zoom-responsive Sidebar Styles */
-@media only screen and (max-width: 1280px) {
-  .container {
-    position: relative;
-  }
-
-  .mt-action-btn {
-    position: fixed !important;
-    left: 10px !important;
-    top: 80px !important;
-    bottom: 20px !important;
-    margin: 0 !important;
-    transform: none !important;
-    border-radius: 16px !important;
-    background-color: var(--md-sys-color-surface-container-low);
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-    backdrop-filter: blur(8px);
-    display: flex !important;
-    flex-direction: column !important;
-    align-items: center !important;
-    justify-content: center !important;
-    height: calc(100vh - 100px) !important;
-    overflow-y: auto !important;
-    scrollbar-width: none !important;
-    -ms-overflow-style: none !important;
-    z-index: 12;
-    width: 70px !important;
-    gap: 8px !important;
-    padding: 12px 8px !important;
-    box-sizing: border-box !important;
-  }
-
-  .mt-action-btn:has(.btn:nth-last-child(n+7)) {
-    justify-content: flex-start !important;
-  }
-
-  .mt-action-btn::-webkit-scrollbar {
-    display: none !important;
-  }
-
-  .mt-action-btn .btn {
-    width: 48px !important;
-    height: 48px !important;
-    border-radius: 12px !important;
-    padding: 0 !important;
-    margin: 0 !important;
-    flex-shrink: 0;
-    font-size: 16px !important;
-    box-sizing: border-box !important;
-  }
-
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 20px !important;
-    line-height: 1 !important;
-    display: flex !important;
-    align-items: center !important;
-    justify-content: center !important;
-    width: 100% !important;
-    height: 100% !important;
-    font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24 !important;
-  }
-
-  .multi-tool-container {
-    margin-left: 0 !important;
-    max-width: 100% !important;
-  }
-
-  .mt-action-bar {
-    margin-left: 25px !important;
-    margin-right: 25px !important;
-  }
-
-  .mt-action-btn:not(:has(*:nth-child(6))) {
-    justify-content: center !important;
-  }
-}
-
-/* Mobile and High Zoom Responsive Styles */
-@media only screen and (max-width: 960px) {
-  .mt-action-btn {
-    left: 8px !important;
-    top: 75px !important;
-    bottom: 15px !important;
-    height: calc(100vh - 90px) !important;
-  }
-}
-
-@media only screen and (max-width: 768px) {
-  .mt-action-btn {
-    left: 5px !important;
-    width: 60px !important;
-    top: calc(var(--navbar-height, 60px) + 10px) !important;
-    bottom: 10px !important;
-    height: calc(100vh - var(--navbar-height, 60px) - 20px) !important;
-  }
-
-  .mt-action-btn .btn {
-    width: 40px !important;
-    height: 40px !important;
-    box-sizing: border-box !important;
-  }
-
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 16px !important;
-  }
-
-  #pages-container {
-    margin: 0 auto !important;
-    display: flex !important;
-    flex-wrap: wrap !important;
-    justify-content: center !important;
-    width: 100% !important;
-  }
-
-  .page-container {
-    width: calc(100vw - 55px) !important;
-    height: calc(100vw - 60px) !important;
-    max-width: 350px !important;
-    max-height: 350px !important;
-    margin: 5px auto !important;
-  }
-}
-
-@media only screen and (max-width: 480px) {
-  .mt-action-btn {
-    left: 2px !important;
-    top: calc(var(--navbar-height, 60px) + 5px) !important;
-    bottom: 5px !important;
-    height: calc(100vh - var(--navbar-height, 60px) - 10px) !important;
-    width: 50px !important;
-    gap: 6px !important;
-    padding: 10px 6px !important;
-  }
-
-  .mt-action-btn .btn {
-    width: 32px !important;
-    height: 32px !important;
-    border-radius: 10px !important;
-    box-sizing: border-box !important;
-  }
-
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 14px !important;
-  }
-}
-
-@media only screen and (max-width: 384px) {
-  .mt-action-btn {
-    left: 2px !important;
-    top: calc(var(--navbar-height, 60px) + 5px) !important;
-    bottom: 5px !important;
-    height: calc(100vh - var(--navbar-height, 60px) - 10px) !important;
-    width: 40px !important;
-    gap: 4px !important;
-    padding: 8px 4px !important;
-  }
-
-  .mt-action-btn .btn {
-    width: 28px !important;
-    height: 28px !important;
-    border-radius: 8px !important;
-    box-sizing: border-box !important;
-  }
-
-  .mt-action-btn .btn .material-symbols-rounded {
-    font-size: 12px !important;
-  }
-
-  .page-container {
-    width: calc(100vw - 55px) !important;
-    height: calc(100vw - 60px) !important;
-    max-width: 280px !important;
-    max-height: 280px !important;
-    margin: 3px auto !important;
-  }
-
-  .page-container img {
-    max-width: calc(100% - 4px) !important;
-    max-height: calc(100% - 4px) !important;
-  }
-}
-
-
@@ -1,79 +0,0 @@
-:root {
-  /*  Colors */
-  --md-sys-color-primary: rgb(162 201 255);
-  --md-sys-color-surface-tint: rgb(162 201 255);
-  --md-sys-color-on-primary: rgb(0 49 92);
-  --md-sys-color-primary-container: rgb(0 118 208);
-  --md-sys-color-on-primary-container: rgb(255 255 255);
-  --md-sys-color-secondary: rgb(169 201 246);
-  --md-sys-color-on-secondary: rgb(12 49 87);
-  --md-sys-color-secondary-container: rgb(29 62 100);
-  --md-sys-color-on-secondary-container: rgb(180 210 255);
-  --md-sys-color-tertiary: rgb(193 194 248);
-  --md-sys-color-on-tertiary: rgb(42 44 88);
-  --md-sys-color-tertiary-container: rgb(110 112 161);
-  --md-sys-color-on-tertiary-container: rgb(255 255 255);
-  --md-sys-color-error: rgb(255 180 171);
-  --md-sys-color-on-error: rgb(105 0 5);
-  --md-sys-color-error-container: rgb(147 0 10);
-  --md-sys-color-on-error-container: rgb(255 218 214);
-  --md-sys-color-background: rgb(15 20 26);
-  --md-sys-color-on-background: rgb(223 226 235);
-  --md-sys-color-surface: rgb(15 20 26);
-  --md-sys-color-on-surface: rgb(223 226 235);
-  --md-sys-color-surface-variant: rgb(64 71 83);
-  --md-sys-color-on-surface-variant: rgb(192 199 213);
-  --md-sys-color-outline: rgb(138 145 158);
-  --md-sys-color-outline-variant: rgb(64 71 83);
-  --md-sys-color-shadow: rgb(0 0 0);
-  --md-sys-color-scrim: rgb(0 0 0);
-  --md-sys-color-inverse-surface: rgb(223 226 235);
-  --md-sys-color-inverse-on-surface: rgb(45 49 55);
-  --md-sys-color-inverse-primary: rgb(0 96 170);
-  --md-sys-color-primary-fixed: rgb(211 228 255);
-  --md-sys-color-on-primary-fixed: rgb(0 28 56);
-  --md-sys-color-primary-fixed-dim: rgb(162 201 255);
-  --md-sys-color-on-primary-fixed-variant: rgb(0 72 130);
-  --md-sys-color-secondary-fixed: rgb(211 228 255);
-  --md-sys-color-on-secondary-fixed: rgb(0 28 56);
-  --md-sys-color-secondary-fixed-dim: rgb(169 201 246);
-  --md-sys-color-on-secondary-fixed-variant: rgb(40 72 111);
-  --md-sys-color-tertiary-fixed: rgb(225 224 255);
-  --md-sys-color-on-tertiary-fixed: rgb(20 22 66);
-  --md-sys-color-tertiary-fixed-dim: rgb(193 194 248);
-  --md-sys-color-on-tertiary-fixed-variant: rgb(64 67 112);
-  --md-sys-color-surface-dim: rgb(15 20 26);
-  --md-sys-color-surface-bright: rgb(53 57 64);
-  --md-sys-color-surface-container-lowest: rgb(10 14 20);
-  --md-sys-color-surface-container-low: rgb(24 28 34);
-  --md-sys-color-surface-container: rgb(28 32 38);
-  --md-sys-color-surface-container-high: rgb(38 42 49);
-  --md-sys-color-surface-container-highest: rgb(49 53 60);
-  /* Tools Color */
-  --md-nav-section-color-opacity: 1;
-  --md-nav-on-section-color-opacity: 1;
-  --md-nav-section-color-sign: rgba(25, 101, 212, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-sign: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-organize: rgba(120, 130, 255, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-organize: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-convert: rgba(25, 177, 212, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-convert: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-convertto: rgba(104, 220, 149, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-convertto: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-security: rgba(255, 120, 146, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-security: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-other: rgba(72, 189, 84, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-other: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-advance: rgba(245, 84, 84, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-advance: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-image: rgba(212, 172, 25, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-image: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-word: rgba(61, 153, 245, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-word: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-section-color-ppt: rgba(255, 128, 0, var(--md-nav-section-color-opacity));
-  --md-nav-on-section-color-ppt: rgba(28, 27, 31, var(--md-nav-on-section-color-opacity));
-  --md-nav-color-on-separator: rgb(24 28 34);
-  --md-nav-background: rgb(15 20 26);
-  --favourite-add: #9ed18c;
-  --favourite-remove: palevioletred;
-}
@@ -1,67 +0,0 @@
-// Authentication utility for cookie-based JWT
-window.JWTManager = {
-
-    // Logout - clear cookies and redirect to login
-    logout: function() {
-
-        // Clear JWT cookie manually (fallback)
-        document.cookie = 'stirling_jwt=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT; SameSite=None; Secure';
-
-        // Perform logout request to clear server-side session
-        fetch('/logout', {
-            method: 'POST',
-            credentials: 'include'
-        }).then(response => {
-            if (response.redirected) {
-                window.location.href = response.url;
-            } else {
-                window.location.href = '/login?logout=true';
-            }
-        }).catch(() => {
-            // If logout fails, let server handle it
-            window.location.href = '/logout';
-        });
-    }
-};
-
-window.fetchWithCsrf = async function(url, options = {}) {
-    function getCsrfToken() {
-        const cookieValue = document.cookie
-            .split('; ')
-            .find(row => row.startsWith('XSRF-TOKEN='))
-            ?.split('=')[1];
-
-        if (cookieValue) {
-            return cookieValue;
-        }
-        const csrfElement = document.querySelector('input[name="_csrf"]');
-        return csrfElement ? csrfElement.value : null;
-    }
-
-    // Create a new options object to avoid modifying the passed object
-    const fetchOptions = { ...options };
-
-    // Ensure headers object exists
-    fetchOptions.headers = { ...options.headers };
-
-    // Add CSRF token if available
-    const csrfToken = getCsrfToken();
-    if (csrfToken) {
-        fetchOptions.headers['X-XSRF-TOKEN'] = csrfToken;
-    }
-
-    // Always include credentials to send JWT cookies
-    fetchOptions.credentials = 'include';
-
-    // Make the request
-    const response = await fetch(url, fetchOptions);
-
-    // Handle 401 responses (unauthorized)
-    if (response.status === 401) {
-        console.warn('Authentication failed, redirecting to login');
-        window.JWTManager.logout();
-        return response;
-    }
-
-    return response;
-}
@@ -1,390 +0,0 @@
-function compareVersions(version1, version2) {
-  const v1 = version1.split(".");
-  const v2 = version2.split(".");
-
-  for (let i = 0; i < v1.length || i < v2.length; i++) {
-    const n1 = parseInt(v1[i]) || 0;
-    const n2 = parseInt(v2[i]) || 0;
-
-    if (n1 > n2) {
-      return 1;
-    } else if (n1 < n2) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-function getDownloadUrl() {
-  // Only show download for non-Docker installations
-  if (machineType === 'Docker' || machineType === 'Kubernetes') {
-    return null;
-  }
-
-  const baseUrl = 'https://files.stirlingpdf.com/';
-
-  // Determine file based on machine type and security
-  if (machineType === 'Server-jar') {
-    return baseUrl + (activeSecurity ? 'Stirling-PDF-with-login.jar' : 'Stirling-PDF.jar');
-  }
-
-  // Client installations
-  if (machineType.startsWith('Client-')) {
-    const os = machineType.replace('Client-', ''); // win, mac, unix
-    const type = activeSecurity ? '-server-security' : '-server';
-
-    if (os === 'unix') {
-      return baseUrl + os + type + '.jar';
-    } else if (os === 'win') {
-      return baseUrl + os + '-installer.exe';
-    } else if (os === 'mac') {
-      return baseUrl + os + '-installer.dmg';
-    }
-  }
-
-  return null;
-}
-
-// Function to get translated priority text
-function getTranslatedPriority(priority) {
-  switch(priority?.toLowerCase()) {
-    case 'urgent': return updatePriorityUrgent;
-    case 'normal': return updatePriorityNormal;
-    case 'minor': return updatePriorityMinor;
-    case 'low': return updatePriorityLow;
-    default: return priority?.toUpperCase() || 'NORMAL';
-  }
-}
-
-async function getUpdateSummary() {
-  // Map Java License enum to API types
-  let type = 'normal';
-  if (licenseType === 'PRO') {
-    type = 'pro';
-  } else if (licenseType === 'ENTERPRISE') {
-    type = 'enterprise';
-  }
-  const url = `https://supabase.stirling.com/functions/v1/updates?from=${currentVersion}&type=${type}&login=${activeSecurity}&summary=true`;
-  console.log("Fetching update summary from:", url);
-  try {
-    const response = await fetch(url);
-    console.log("Response status:", response.status);
-    if (response.status === 200) {
-      const data = await response.json();
-      return data;
-    } else {
-      console.error("Failed to fetch update summary from Supabase:", response.status);
-      return null;
-    }
-  } catch (error) {
-    console.error("Failed to fetch update summary from Supabase:", error);
-    return null;
-  }
-}
-
-async function getFullUpdateInfo() {
-  // Map Java License enum to API types
-  let type = 'normal';
-  if (licenseType === 'PRO') {
-    type = 'pro';
-  } else if (licenseType === 'ENTERPRISE') {
-    type = 'enterprise';
-  }
-  const url = `https://supabase.stirling.com/functions/v1/updates?from=${currentVersion}&type=${type}&login=${activeSecurity}&summary=false`;
-  console.log("Fetching full update info from:", url);
-  try {
-    const response = await fetch(url);
-    console.log("Full update response status:", response.status);
-    if (response.status === 200) {
-      const data = await response.json();
-      return data;
-    } else {
-      console.error("Failed to fetch full update info from Supabase:", response.status);
-      return null;
-    }
-  } catch (error) {
-    console.error("Failed to fetch full update info from Supabase:", error);
-    return null;
-  }
-}
-
-async function getCurrentVersionFromBypass() {
-  const url = "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/master/build.gradle";
-  try {
-    const response = await fetch(url);
-    if (response.status === 200) {
-      const text = await response.text();
-      const versionRegex = /version\s*=\s*['"](\d+\.\d+\.\d+)['"]/;
-      const match = versionRegex.exec(text);
-      if (match) {
-        return match[1];
-      }
-    }
-    throw new Error("Version number not found");
-  } catch (error) {
-    console.error("Failed to fetch latest version from build.gradle:", error);
-    return ""; // Return an empty string if the fetch fails
-  }
-}
-
-async function checkForUpdate() {
-  // Initialize the update button as hidden
-  var updateBtn = document.getElementById("update-btn") || null;
-  var updateLink = document.getElementById("update-link") || null;
-  var updateLinkLegacy = document.getElementById("update-link-legacy") || null;
-  if (updateBtn !== null) {
-    updateBtn.style.display = "none";
-    updateBtn.classList.remove("btn-danger", "btn-warning", "btn-outline-primary");
-  }
-  if (updateLink !== null) {
-    updateLink.style.display = "none";
-  }
-  if (updateLinkLegacy !== null) {
-    console.log("hidden!");
-    if (!updateLinkLegacy.classList.contains("visually-hidden")) {
-      updateLinkLegacy.classList.add("visually-hidden");
-    }
-  }
-
-  const updateSummary = await getUpdateSummary();
-  if (!updateSummary) {
-    console.log("No update summary available");
-    return;
-  }
-
-  console.log("updateSummary=", updateSummary);
-  console.log("currentVersion=" + currentVersion);
-  console.log("latestVersion=" + updateSummary.latest_version);
-
-  if (updateSummary.latest_version && compareVersions(updateSummary.latest_version, currentVersion) > 0) {
-    const priority = updateSummary.max_priority || 'normal';
-
-    if (updateBtn != null) {
-      // Style button based on priority
-      if (priority === 'urgent') {
-        updateBtn.classList.add("btn-danger");
-        updateBtn.innerHTML = urgentUpdateAvailable;
-      } else if (priority === 'normal') {
-        updateBtn.classList.add("btn-warning");
-        updateBtn.innerHTML = updateAvailableText;
-      } else {
-        updateBtn.classList.add("btn-outline-primary");
-        updateBtn.innerHTML = updateAvailableText;
-      }
-
-      // Store summary for initial display
-      updateBtn.setAttribute('data-update-summary', JSON.stringify(updateSummary));
-      updateBtn.style.display = "block";
-
-      // Add click handler for update details modal
-      updateBtn.onclick = function(e) {
-        e.preventDefault();
-        showUpdateModal();
-      };
-    }
-    if (updateLink !== null) {
-      document.getElementById("update-link").style.display = "flex";
-    }
-    if (updateLinkLegacy !== null) {
-      document.getElementById("app-update").innerHTML = updateAvailable.replace("{0}", '<b>' + currentVersion + '</b>').replace("{1}", '<b>' + updateSummary.latest_version + '</b>');
-      if (updateLinkLegacy.classList.contains("visually-hidden")) {
-        updateLinkLegacy.classList.remove("visually-hidden");
-      }
-    }
-    console.log("visible");
-  } else {
-    if (updateLinkLegacy !== null) {
-      if (!updateLinkLegacy.classList.contains("visually-hidden")) {
-        updateLinkLegacy.classList.add("visually-hidden");
-      }
-    }
-    console.log("hidden");
-  }
-}
-
-async function showUpdateModal() {
-  // Close settings modal if open
-  const settingsModal = bootstrap.Modal.getInstance(document.getElementById('settingsModal'));
-  if (settingsModal) {
-    settingsModal.hide();
-  }
-
-  // Get summary data from button
-  const updateBtn = document.getElementById("update-btn");
-  const summaryData = JSON.parse(updateBtn.getAttribute('data-update-summary'));
-
-  // Utility function to escape HTML special characters
-  function escapeHtml(str) {
-    if (typeof str !== 'string') return str;
-    return str
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#39;')
-      .replace(/\//g, '&#x2F;');
-  }
-
-  // Create initial modal with loading state
-  const initialModalHtml = `
-    <div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="updateModalLabel" aria-hidden="true">
-      <div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable" role="document" style="max-height: 80vh;">
-        <div class="modal-content" style="max-height: 80vh;">
-          <div class="modal-header">
-            <h5 class="modal-title" id="updateModalLabel">${updateModalTitle}</h5>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
-              <span class="material-symbols-rounded">close</span>
-            </button>
-          </div>
-          <div class="modal-body" id="updateModalBody" style="max-height: 60vh; overflow-y: auto;">
-            <div class="update-summary mb-4">
-              <div class="row mb-3">
-                <div class="${summaryData.latest_stable_version ? 'col-4' : 'col-6'} text-center">
-                  <small class="text-muted">${updateCurrent}</small><br>
-                  <strong>${escapeHtml(currentVersion)}</strong>
-                </div>
-                <div class="${summaryData.latest_stable_version ? 'col-4' : 'col-6'} text-center">
-                  <small class="text-muted">${updateLatest}</small><br>
-                  <strong class="text-primary">${escapeHtml(summaryData.latest_version)}</strong>
-                </div>
-                ${summaryData.latest_stable_version ? `
-                <div class="col-4 text-center">
-                  <small class="text-muted">${updateLatestStable}</small><br>
-                  <strong class="text-success">${escapeHtml(summaryData.latest_stable_version)}</strong>
-                </div>
-                ` : ''}
-              </div>
-              <div class="alert ${summaryData.max_priority === 'urgent' ? 'alert-danger' : 'alert-warning'}" role="alert">
-                <strong>${updatePriority}:</strong> ${getTranslatedPriority(summaryData.max_priority)}
-                ${summaryData.recommended_action ? `<br><strong>${updateRecommendedAction}:</strong> ${escapeHtml(summaryData.recommended_action)}` : ''}
-              </div>
-            </div>
-
-            ${summaryData.any_breaking ? `
-              <div class="alert alert-warning" role="alert">
-                <h6><strong>${updateBreakingChangesDetected}</strong></h6>
-                <p>${updateBreakingChangesMessage}</p>
-              </div>
-            ` : ''}
-
-            ${summaryData.migration_guides && summaryData.migration_guides.length > 0 ? `
-              <div class="migration-guides mb-4">
-                <h6>${updateMigrationGuides}</h6>
-                <ul class="list-group">
-                  ${summaryData.migration_guides.map(guide => `
-                    <li class="list-group-item d-flex justify-content-between align-items-center">
-                      <div>
-                        <strong>${updateVersion} ${escapeHtml(guide.version)}:</strong> ${escapeHtml(guide.notes)}
-                      </div>
-                      <a href="${escapeHtml(guide.url)}" target="_blank" class="btn btn-sm btn-outline-primary">${updateViewGuide}</a>
-                    </li>
-                  `).join('')}
-                </ul>
-              </div>
-            ` : ''}
-
-            <div class="text-center">
-              <div class="spinner-border text-primary" role="status" id="loadingSpinner">
-                <span class="visually-hidden">${updateLoadingDetailedInfo}</span>
-              </div>
-              <p class="mt-2">${updateLoadingDetailedInfo}</p>
-            </div>
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">${updateClose}</button>
-            <a href="https://github.com/Stirling-Tools/Stirling-PDF/releases" target="_blank" class="btn btn-outline-primary">${updateViewAllReleases}</a>
-            ${getDownloadUrl() ? `<a href="${escapeHtml(getDownloadUrl())}" class="btn btn-success" target="_blank">${updateDownloadLatest}</a>` : ''}
-          </div>
-        </div>
-      </div>
-    </div>
-  `;
-
-  // Remove existing modal if present
-  const existingModal = document.getElementById('updateModal');
-  if (existingModal) {
-    existingModal.remove();
-  }
-
-  // Add modal to body
-  document.body.insertAdjacentHTML('beforeend', initialModalHtml);
-
-  // Show modal
-  const modal = new bootstrap.Modal(document.getElementById('updateModal'));
-  modal.show();
-
-  // Fetch full update info
-  const fullUpdateInfo = await getFullUpdateInfo();
-
-  // Update modal with full information
-  const modalBody = document.getElementById('updateModalBody');
-  if (fullUpdateInfo && fullUpdateInfo.new_versions) {
-   const storedMode = localStorage.getItem("dark-mode");
-    const isDarkMode = storedMode === "on" ||
-                      (storedMode === null && window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches);
-    const darkClasses = isDarkMode ? {
-      accordionItem: 'bg-dark border-secondary text-light',
-      accordionButton: 'bg-dark text-light border-secondary',
-      accordionBody: 'bg-dark text-light'
-    } : {
-      accordionItem: '',
-      accordionButton: '',
-      accordionBody: ''
-    };
-
-    const detailedVersionsHtml = `
-      <div class="detailed-versions mt-4">
-        <h6>${updateAvailableUpdates}</h6>
-        <div class="accordion" id="versionsAccordion">
-          ${fullUpdateInfo.new_versions.map((version, index) => `
-            <div class="accordion-item" style="border-color: var(--md-sys-color-outline);">
-                          <h2 class="accordion-header"  id="heading${index}">
-                             <button class="accordion-button ${index === 0 ? '' : 'collapsed'}" style="color: var(--md-sys-color-on-surface); background-color:
-             var(--md-sys-color-surface);" type="button" data-bs-toggle="collapse"
-                        data-bs-target="#collapse${index}" aria-expanded="${index === 0 ? 'true' : 'false'}" aria-controls="collapse${index}">
-                  <div class="d-flex justify-content-between w-100 me-3">
-                    <span><strong>${updateVersion} ${version.version}</strong></span>
-                    <span class="badge ${version.priority === 'urgent' ? 'bg-danger' : version.priority === 'normal' ? 'bg-warning' : 'bg-secondary'}">${getTranslatedPriority(version.priority)}</span>
-                  </div>
-                </button>
-              </h2>
-              <div id="collapse${index}" class="accordion-collapse collapse ${index === 0 ? 'show' : ''}"
-                  aria-labelledby="heading${index}" data-bs-parent="#versionsAccordion">
-                <div class="accordion-body"  style="color: var(--md-sys-color-on-surface); background-color:
-             var(--md-sys-color-surface-bright);">
-                  <h6>${version.announcement.title}</h6>
-                  <p>${version.announcement.message}</p>
-                  ${version.compatibility.breaking_changes ? `
-                    <div class="alert alert-warning alert-sm" role="alert">
-                      <small><strong>⚠️ ${updateBreakingChanges}</strong> ${version.compatibility.breaking_description || updateBreakingChangesDefault}</small>
-                      ${version.compatibility.migration_guide_url ? `<br><a href="${version.compatibility.migration_guide_url}" target="_blank" class="btn btn-sm btn-outline-warning mt-1">${updateMigrationGuide}</a>` : ''}
-                    </div>
-                  ` : ''}
-                </div>
-              </div>
-            </div>
-          `).join('')}
-        </div>
-      </div>
-    `;
-
-    // Remove loading spinner and add detailed info
-    const spinner = document.getElementById('loadingSpinner');
-    if (spinner) {
-      spinner.parentElement.remove();
-    }
-    modalBody.insertAdjacentHTML('beforeend', detailedVersionsHtml);
-
-      } else {
-    // Remove loading spinner if failed to load
-    const spinner = document.getElementById('loadingSpinner');
-    if (spinner) {
-      spinner.parentElement.innerHTML = `<p class="text-muted">${updateUnableToLoadDetails}</p>`;
-    }
-  }
-}
-
-document.addEventListener("DOMContentLoaded", (event) => {
-  checkForUpdate();
-});
@@ -1,44 +0,0 @@
-// JWT Authentication Management Script
-// This script handles cookie-based JWT authentication and page access control
-
-(function() {
-    // Clean up JWT token from URL parameters after OAuth/Login flows
-    function cleanupTokenFromUrl() {
-        const urlParams = new URLSearchParams(window.location.search);
-        const hasToken = urlParams.get('jwt') || urlParams.get('token');
-        if (hasToken) {
-            // Clean up URL by removing token parameter
-            // Token should now be set as cookie by server
-            urlParams.delete('jwt');
-            urlParams.delete('token');
-            const newUrl = window.location.pathname + (urlParams.toString() ? '?' + urlParams.toString() : '');
-            window.history.replaceState({}, '', newUrl);
-        }
-    }
-
-    // Initialize JWT handling when page loads
-    function initializeJWT() {
-        // Clean up any JWT tokens from URL (OAuth flow)
-        cleanupTokenFromUrl();
-
-        // Authentication is handled server-side
-        // If user is not authenticated, server will redirect to login
-        console.log('JWT initialization complete - authentication handled server-side');
-    }
-
-    // No form enhancement needed for cookie-based JWT
-    // Cookies are automatically sent with form submissions
-    function enhanceFormSubmissions() {
-        // Cookie-based JWT is automatically included in form submissions
-        // No additional processing needed
-    }
-
-    // Initialize when DOM is ready
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', function() {
-            initializeJWT();
-        });
-    } else {
-        initializeJWT();
-    }
-})();
@@ -1,156 +0,0 @@
-function toolsManager() {
-  const convertToPDF = document.querySelector('#groupConvertTo');
-  const convertFromPDF = document.querySelector('#groupConvertFrom');
-
-  if (convertToPDF && convertFromPDF) {
-    const itemsTo = Array.from(convertToPDF.querySelectorAll('.dropdown-item')).filter(
-      (item) => !item.querySelector('hr.dropdown-divider')
-    );
-    const itemsFrom = Array.from(convertFromPDF.querySelectorAll('.dropdown-item')).filter(
-      (item) => !item.querySelector('hr.dropdown-divider')
-    );
-
-    const totalItems = itemsTo.length + itemsFrom.length;
-
-    if (totalItems > 12) {
-      document.querySelectorAll('#convertGroup').forEach((element) => (element.style.display = 'none'));
-      document.querySelectorAll('#groupConvertTo').forEach((element) => (element.style.display = 'flex'));
-      document.querySelectorAll('#groupConvertFrom').forEach((element) => (element.style.display = 'flex'));
-    } else {
-      document.querySelectorAll('#convertGroup').forEach((element) => (element.style.display = 'flex'));
-      document.querySelectorAll('#groupConvertTo').forEach((element) => (element.style.display = 'none'));
-      document.querySelectorAll('#groupConvertFrom').forEach((element) => (element.style.display = 'none'));
-    }
-  }
-
-  document.querySelectorAll('.navbar-item').forEach((element) => {
-    if (!element.closest('#stacked')) {
-      const dropdownItems = element.querySelectorAll('.dropdown-item');
-      const items = Array.from(dropdownItems).filter((item) => !item.querySelector('hr.dropdown-divider'));
-
-      if (items.length === 0) {
-        if (
-          element.previousElementSibling &&
-          element.previousElementSibling.classList.contains('navbar-item') &&
-          element.previousElementSibling.classList.contains('nav-item-separator')
-        ) {
-          element.previousElementSibling.remove();
-        }
-        element.remove();
-      }
-    }
-  });
-}
-
-function setupDropdowns() {
-  const dropdowns = document.querySelectorAll('.navbar-nav > .nav-item.dropdown');
-
-  dropdowns.forEach((dropdown) => {
-    const toggle = dropdown.querySelector('[data-bs-toggle="dropdown"]');
-    if (!toggle) return;
-
-    // Skip search dropdown, it has its own logic
-    if (toggle.id === 'searchDropdown') {
-      return;
-    }
-
-    dropdown.addEventListener('show.bs.dropdown', () => {
-      // Find all other open dropdowns and hide them
-      const openDropdowns = document.querySelectorAll('.navbar-nav .dropdown-menu.show');
-      openDropdowns.forEach((menu) => {
-        const parentDropdown = menu.closest('.dropdown');
-        if (parentDropdown && parentDropdown !== dropdown) {
-          const parentToggle = parentDropdown.querySelector('[data-bs-toggle="dropdown"]');
-          if (parentToggle) {
-            // Get or create Bootstrap dropdown instance
-            let instance = bootstrap.Dropdown.getInstance(parentToggle);
-            if (!instance) {
-              instance = new bootstrap.Dropdown(parentToggle);
-            }
-            instance.hide();
-          }
-        }
-      });
-    });
-  });
-}
-
-window.tooltipSetup = () => {
-  const tooltipElements = document.querySelectorAll('[title]');
-
-  tooltipElements.forEach((element) => {
-    const tooltipText = element.getAttribute('title');
-    element.removeAttribute('title');
-    element.setAttribute('data-title', tooltipText);
-    const customTooltip = document.createElement('div');
-    customTooltip.className = 'btn-tooltip';
-    customTooltip.textContent = tooltipText;
-
-    document.body.appendChild(customTooltip);
-
-    element.addEventListener('mouseenter', (event) => {
-      if (window.innerWidth >= 1200) {
-        customTooltip.style.display = 'block';
-        customTooltip.style.left = `${event.pageX + 10}px`;
-        customTooltip.style.top = `${event.pageY + 10}px`;
-      }
-    });
-
-    element.addEventListener('mousemove', (event) => {
-      if (window.innerWidth >= 1200) {
-        customTooltip.style.left = `${event.pageX + 10}px`;
-        customTooltip.style.top = `${event.pageY + 10}px`;
-      }
-    });
-
-    element.addEventListener('mouseleave', () => {
-      customTooltip.style.display = 'none';
-    });
-  });
-};
-
-// Override the bootstrap dropdown styles for mobile
-function fixNavbarDropdownStyles() {
-  if (window.innerWidth < 1200) {
-    document.querySelectorAll('.navbar .dropdown-menu').forEach(function(menu) {
-      menu.style.transform = 'none';
-      menu.style.transformOrigin = 'none';
-      menu.style.left = '0';
-      menu.style.right = '0';
-      menu.style.maxWidth = '95vw';
-      menu.style.width = '100vw';
-      menu.style.marginBottom = '0';
-    });
-  } else {
-    document.querySelectorAll('.navbar .dropdown-menu').forEach(function(menu) {
-      menu.style.transform = '';
-      menu.style.transformOrigin = '';
-      menu.style.left = '';
-      menu.style.right = '';
-      menu.style.maxWidth = '';
-      menu.style.width = '';
-      menu.style.marginBottom = '';
-    });
-  }
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-  tooltipSetup();
-  setupDropdowns();
-  fixNavbarDropdownStyles();
-  // Setup logout button functionality
-  const logoutButton = document.querySelector('a[href="/logout"]');
-  if (logoutButton) {
-    logoutButton.addEventListener('click', function(event) {
-      event.preventDefault();
-      if (window.JWTManager) {
-        window.JWTManager.logout();
-      } else {
-        // Fallback if JWTManager is not available
-        window.location.href = '/logout';
-      }
-    });
-  }
-
-});
-window.addEventListener('resize', fixNavbarDropdownStyles);
@@ -1,818 +0,0 @@
-document.addEventListener("DOMContentLoaded", function () {
-  const bookmarksContainer = document.getElementById("bookmarks-container");
-  const errorMessageContainer = document.getElementById("error-message-container");
-  const addBookmarkBtn = document.getElementById("addBookmarkBtn");
-  const bookmarkDataInput = document.getElementById("bookmarkData");
-  let bookmarks = [];
-  let counter = 0; // Used for generating unique IDs
-
-  // callback function on file input change to extract bookmarks from PDF
-  async function getBookmarkDataFromPdf(event) {
-    if (!event.target.files || event.target.files.length === 0) {
-      return;
-    }
-
-    const formData = new FormData();
-    formData.append("file", event.target.files[0]);
-
-    try {
-      // Call the API to extract bookmarks using fetchWithCsrf for CSRF protection
-      const response = await fetchWithCsrf("/api/v1/general/extract-bookmarks", {
-        method: "POST",
-        body: formData,
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to fetch API: ${response.status} ${response.statusText}`);
-      }
-
-      const extractedBookmarks = await response.json();
-      return extractedBookmarks;
-    } catch (error) {
-      throw new Error("Error extracting bookmark data:", error);
-    }
-  }
-
-  // callback function on file input change to extract bookmarks from JSON
-  async function getBookmarkDataFromJson(event) {
-    if (!event.target.files || event.target.files.length === 0) {
-      return;
-    }
-
-    const file = event.target.files[0];
-
-    try {
-      const fileText = await file.text();
-      const jsonData = JSON.parse(fileText);
-      return jsonData;
-    } catch (error) {
-      throw new Error(`Error extracting bookmark data: error while reading or parsing JSON file: ${error.message}`);
-    }
-  }
-
-  // display new bookmark data given by a callback function that loads or fetches the data
-  async function loadBookmarks(getBookmarkDataCallback) {
-    // reset bookmarks
-    bookmarks = [];
-    updateBookmarksUI();
-    showLoadingIndicator();
-
-    try {
-      // Get new bookmarks from the callback
-      const newBookmarks = await getBookmarkDataCallback();
-
-      // Convert extracted bookmarks to our format with IDs
-      if (newBookmarks && newBookmarks.length > 0) {
-        bookmarks = newBookmarks.map(convertExtractedBookmark);
-      }
-    } catch (error) {
-      bookmarks = [];
-      throw new Error(`Error loading bookmarks: ${error}`);
-    } finally {
-      removeLoadingIndicator();
-      updateBookmarksUI();
-    }
-  }
-
-  // Add event listener to the file input to extract existing bookmarks
-  document.getElementById("fileInput-input").addEventListener("change", async function (event) {
-    try {
-      await loadBookmarks(async function () {
-        return getBookmarkDataFromPdf(event);
-      });
-    } catch {
-      showErrorMessage("Failed to extract bookmarks. You can still create new ones.");
-    }
-  });
-
-  function showLoadingIndicator() {
-    const loadingEl = document.createElement("div");
-    loadingEl.className = "alert alert-info";
-    loadingEl.textContent = "Loading bookmarks from PDF...";
-    loadingEl.id = "loading-bookmarks";
-    errorMessageContainer.innerHTML = "";
-    bookmarksContainer.innerHTML = "";
-    bookmarksContainer.appendChild(loadingEl);
-  }
-
-  function removeLoadingIndicator() {
-    const loadingEl = document.getElementById("loading-bookmarks");
-    if (loadingEl) {
-      loadingEl.remove();
-    }
-  }
-
-  function showErrorMessage(message) {
-    const errorEl = document.createElement("div");
-    errorEl.className = "alert alert-danger";
-    errorEl.textContent = message;
-    errorMessageContainer.appendChild(errorEl);
-  }
-
-  function showEmptyState() {
-    const emptyStateEl = document.createElement("div");
-    emptyStateEl.className = "empty-bookmarks mb-3";
-    emptyStateEl.innerHTML = `
-      <span class="material-symbols-rounded mb-2" style="font-size: 48px;">bookmark_add</span>
-      <h5>No bookmarks found</h5>
-      <p class="mb-3">This PDF doesn't have any bookmarks yet. Add your first bookmark to get started.</p>
-      <button type="button" class="btn btn-primary btn-add-first-bookmark">
-        <span class="material-symbols-rounded">add</span> Add First Bookmark
-      </button>
-    `;
-
-    // Add event listener to the "Add First Bookmark" button
-    emptyStateEl.querySelector(".btn-add-first-bookmark").addEventListener("click", function () {
-      addBookmark(null, "New Bookmark", 1);
-      emptyStateEl.remove();
-    });
-
-    bookmarksContainer.appendChild(emptyStateEl);
-  }
-
-  // Function to convert extracted bookmarks to our format with IDs
-  function convertExtractedBookmark(bookmark) {
-    counter++;
-    const result = {
-      id: Date.now() + counter, // Generate a unique ID
-      title: bookmark.title || "Untitled Bookmark",
-      pageNumber: bookmark.pageNumber || 1,
-      children: [],
-      expanded: false, // All bookmarks start collapsed for better visibility
-    };
-
-    // Convert children recursively
-    if (bookmark.children && bookmark.children.length > 0) {
-      result.children = bookmark.children.map((child) => {
-        return convertExtractedBookmark(child);
-      });
-    }
-
-    return result;
-  }
-
-  // Add bookmark button click handler
-  addBookmarkBtn.addEventListener("click", function (e) {
-    e.preventDefault();
-    addBookmark();
-  });
-
-  // Add form submit handler to update JSON data
-  document.getElementById("editTocForm").addEventListener("submit", function () {
-    updateBookmarkData();
-  });
-
-  function addBookmark(parent = null, title = "", pageNumber = 1) {
-    counter++;
-    const newBookmark = {
-      id: Date.now() + counter,
-      title: title || "New Bookmark",
-      pageNumber: pageNumber || 1,
-      children: [],
-      expanded: false, // New bookmarks start collapsed
-    };
-
-    if (parent === null) {
-      bookmarks.push(newBookmark);
-    } else {
-      const parentBookmark = findBookmark(bookmarks, parent);
-      if (parentBookmark) {
-        parentBookmark.children.push(newBookmark);
-        parentBookmark.expanded = true; // Auto-expand the parent when adding a child
-      } else {
-        // Add to root level if parent not found
-        bookmarks.push(newBookmark);
-      }
-    }
-
-    updateBookmarksUI();
-
-    // After updating UI, find and focus the new bookmark's title field
-    setTimeout(() => {
-      const newElement = document.querySelector(`[data-id="${newBookmark.id}"]`);
-      if (newElement) {
-        const titleInput = newElement.querySelector(".bookmark-title");
-        if (titleInput) {
-          titleInput.focus();
-          titleInput.select();
-        }
-        // Scroll to the new element
-        newElement.scrollIntoView({ behavior: "smooth", block: "center" });
-      }
-    }, 50);
-  }
-
-  function findBookmark(bookmarkArray, id) {
-    for (const bookmark of bookmarkArray) {
-      if (bookmark.id === id) {
-        return bookmark;
-      }
-      if (bookmark.children.length > 0) {
-        const found = findBookmark(bookmark.children, id);
-        if (found) return found;
-      }
-    }
-    return null;
-  }
-
-  // Find the parent bookmark of a given bookmark by ID
-  function findParentBookmark(bookmarkArray, id, parent = null) {
-    for (const bookmark of bookmarkArray) {
-      if (bookmark.id === id) {
-        return parent; // Return the parent ID (or null if top-level)
-      }
-
-      if (bookmark.children.length > 0) {
-        const found = findParentBookmark(bookmark.children, id, bookmark.id);
-        if (found !== undefined) return found;
-      }
-    }
-    return undefined; // Not found at this level
-  }
-
-  function removeBookmark(id) {
-    // Remove from top level
-    const index = bookmarks.findIndex((b) => b.id === id);
-    if (index !== -1) {
-      bookmarks.splice(index, 1);
-      updateBookmarksUI();
-      return;
-    }
-
-    // Remove from children
-    function removeFromChildren(bookmarkArray, id) {
-      for (const bookmark of bookmarkArray) {
-        const childIndex = bookmark.children.findIndex((b) => b.id === id);
-        if (childIndex !== -1) {
-          bookmark.children.splice(childIndex, 1);
-          return true;
-        }
-        if (removeFromChildren(bookmark.children, id)) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    if (removeFromChildren(bookmarks, id)) {
-      updateBookmarksUI();
-    }
-
-    // If no bookmarks left, show empty state
-    if (bookmarks.length === 0) {
-      showEmptyState();
-    }
-  }
-
-  function toggleBookmarkExpanded(id) {
-    const bookmark = findBookmark(bookmarks, id);
-    if (bookmark) {
-      bookmark.expanded = !bookmark.expanded;
-      updateBookmarksUI();
-    }
-  }
-
-  function updateBookmarkData() {
-    // Create a clean version without the IDs for submission
-    const cleanBookmarks = bookmarks.map(cleanBookmark);
-    bookmarkDataInput.value = JSON.stringify(cleanBookmarks);
-  }
-
-  function cleanBookmark(bookmark) {
-    return {
-      title: bookmark.title,
-      pageNumber: bookmark.pageNumber,
-      children: bookmark.children.map(cleanBookmark),
-    };
-  }
-
-  function updateBookmarksUI() {
-    if (!bookmarksContainer) {
-      return;
-    }
-
-    // Only clear the container if there are no error messages or loading indicators
-    if (!document.querySelector("#bookmarks-container .alert")) {
-      bookmarksContainer.innerHTML = "";
-    }
-
-    // Check if there are bookmarks to display
-    if (bookmarks.length === 0 && !document.querySelector(".empty-bookmarks")) {
-      showEmptyState();
-    } else {
-      // Remove empty state if it exists and there are bookmarks
-      const emptyState = document.querySelector(".empty-bookmarks");
-      if (emptyState && bookmarks.length > 0) {
-        emptyState.remove();
-      }
-
-      // Create bookmark elements
-      bookmarks.forEach((bookmark) => {
-        const bookmarkElement = createBookmarkElement(bookmark);
-        bookmarksContainer.appendChild(bookmarkElement);
-      });
-    }
-
-    updateBookmarkData();
-
-    // Initialize tooltips for dynamically added elements
-    if (typeof $ !== "undefined") {
-      $('[data-bs-toggle="tooltip"]').tooltip();
-    }
-  }
-
-  // Create the main bookmark element with collapsible interface
-  function createBookmarkElement(bookmark, level = 0) {
-    const bookmarkEl = document.createElement("div");
-    bookmarkEl.className = "bookmark-item";
-    bookmarkEl.dataset.id = bookmark.id;
-    bookmarkEl.dataset.level = level;
-
-    // Create the header (always visible part)
-    const header = createBookmarkHeader(bookmark, level);
-    bookmarkEl.appendChild(header);
-
-    // Create the content (collapsible part)
-    const content = document.createElement("div");
-    content.className = "bookmark-content";
-    if (!bookmark.expanded) {
-      content.style.display = "none";
-    }
-
-    // Main input row
-    const inputRow = createInputRow(bookmark);
-    content.appendChild(inputRow);
-    bookmarkEl.appendChild(content);
-
-    // Add children container if has children and expanded
-    if (bookmark.children && bookmark.children.length > 0) {
-      const childrenContainer = createChildrenContainer(bookmark, level);
-      if (bookmark.expanded) {
-        bookmarkEl.appendChild(childrenContainer);
-      }
-    }
-
-    return bookmarkEl;
-  }
-
-  // Create the header that's always visible
-  function createBookmarkHeader(bookmark, level) {
-    const header = document.createElement("div");
-    header.className = "bookmark-header";
-    if (!bookmark.expanded) {
-      header.classList.add("collapsed");
-    }
-
-    // Left side of header with expand/collapse and info
-    const headerLeft = document.createElement("div");
-    headerLeft.className = "d-flex align-items-center";
-
-    // Toggle expand/collapse icon with child count
-    const toggleContainer = document.createElement("div");
-    toggleContainer.className = "d-flex align-items-center";
-    toggleContainer.style.marginRight = "8px";
-
-    // Only show toggle if has children
-    if (bookmark.children && bookmark.children.length > 0) {
-      // Create toggle icon
-      const toggleIcon = document.createElement("span");
-      toggleIcon.className = "material-symbols-rounded toggle-icon me-1";
-      toggleIcon.textContent = "expand_more";
-      toggleIcon.style.cursor = "pointer";
-      toggleContainer.appendChild(toggleIcon);
-
-      // Add child count indicator
-      const childCount = document.createElement("span");
-      childCount.className = "badge rounded-pill";
-      // Use theme-appropriate badge color
-      const isDarkMode = document.documentElement.getAttribute("data-bs-theme") === "dark";
-      childCount.classList.add(isDarkMode ? "bg-info" : "bg-secondary");
-      childCount.style.fontSize = "0.7rem";
-      childCount.style.padding = "0.2em 0.5em";
-      childCount.textContent = bookmark.children.length;
-      childCount.setAttribute("data-bs-toggle", "tooltip");
-      childCount.setAttribute("data-bs-placement", "top");
-      childCount.title = `${bookmark.children.length} child bookmark${bookmark.children.length > 1 ? "s" : ""}`;
-      toggleContainer.appendChild(childCount);
-    } else {
-      // Add spacer if no children
-      const spacer = document.createElement("span");
-      spacer.style.width = "24px";
-      spacer.style.display = "inline-block";
-      toggleContainer.appendChild(spacer);
-    }
-
-    headerLeft.appendChild(toggleContainer);
-
-    // Level indicator for nested items
-    if (level > 0) {
-      // Add relationship indicator visual line
-      const relationshipIndicator = document.createElement("div");
-      relationshipIndicator.className = "bookmark-relationship-indicator";
-
-      const line = document.createElement("div");
-      line.className = "relationship-line";
-      relationshipIndicator.appendChild(line);
-
-      const arrow = document.createElement("div");
-      arrow.className = "relationship-arrow";
-      relationshipIndicator.appendChild(arrow);
-
-      header.appendChild(relationshipIndicator);
-
-      // Text indicator
-      const levelIndicator = document.createElement("span");
-      levelIndicator.className = "bookmark-level-indicator";
-      levelIndicator.textContent = `Child`;
-      headerLeft.appendChild(levelIndicator);
-    }
-
-    // Title preview
-    const titlePreview = document.createElement("span");
-    titlePreview.className = "bookmark-title-preview";
-    titlePreview.textContent = bookmark.title;
-    headerLeft.appendChild(titlePreview);
-
-    // Page number preview
-    const pagePreview = document.createElement("span");
-    pagePreview.className = "bookmark-page-preview";
-    pagePreview.textContent = `Page ${bookmark.pageNumber}`;
-    headerLeft.appendChild(pagePreview);
-
-    // Right side of header with action buttons
-    const headerRight = document.createElement("div");
-    headerRight.className = "bookmark-actions-header";
-
-    // Quick add buttons with clear visual distinction - using Stirling-PDF's tooltip system
-    const quickAddChildButton = createButton("subdirectory_arrow_right", "btn-add-child", "Add child bookmark", function (e) {
-      e.preventDefault();
-      e.stopPropagation();
-      addBookmark(bookmark.id);
-    });
-
-    const quickAddSiblingButton = createButton("add", "btn-add-sibling", "Add sibling bookmark", function (e) {
-      e.preventDefault();
-      e.stopPropagation();
-
-      // Find parent of current bookmark
-      const parentId = findParentBookmark(bookmarks, bookmark.id);
-      addBookmark(parentId, "", bookmark.pageNumber); // Same level as current bookmark
-    });
-
-    // Quick remove button
-    const quickRemoveButton = createButton("delete", "btn-outline-danger", "Remove bookmark", function (e) {
-      e.preventDefault();
-      e.stopPropagation();
-
-      if (
-        confirm(
-          "Are you sure you want to remove this bookmark" + (bookmark.children.length > 0 ? " and all its children?" : "?")
-        )
-      ) {
-        removeBookmark(bookmark.id);
-      }
-    });
-
-    headerRight.appendChild(quickAddChildButton);
-    headerRight.appendChild(quickAddSiblingButton);
-    headerRight.appendChild(quickRemoveButton);
-
-    // Assemble header
-    header.appendChild(headerLeft);
-    header.appendChild(headerRight);
-
-    // Add click handler for expansion toggle
-    header.addEventListener("click", function (e) {
-      // Only toggle if not clicking on buttons
-      if (!e.target.closest("button")) {
-        toggleBookmarkExpanded(bookmark.id);
-      }
-    });
-
-    return header;
-  }
-
-  function createInputRow(bookmark) {
-    const row = document.createElement("div");
-    row.className = "row";
-
-    // Title input
-    row.appendChild(createTitleInputElement(bookmark));
-
-    // Page input
-    row.appendChild(createPageInputElement(bookmark));
-
-    return row;
-  }
-
-  function createTitleInputElement(bookmark) {
-    const titleCol = document.createElement("div");
-    titleCol.className = "col-md-8";
-
-    const titleGroup = document.createElement("div");
-    titleGroup.className = "mb-3";
-
-    const titleLabel = document.createElement("label");
-    titleLabel.textContent = "Title";
-    titleLabel.className = "form-label";
-
-    const titleInput = document.createElement("input");
-    titleInput.type = "text";
-    titleInput.className = "form-control bookmark-title";
-    titleInput.value = bookmark.title;
-    titleInput.addEventListener("input", function () {
-      bookmark.title = this.value;
-      updateBookmarkData();
-
-      // Also update the preview in the header
-      const header = titleInput.closest(".bookmark-item").querySelector(".bookmark-title-preview");
-      if (header) {
-        header.textContent = this.value;
-      }
-    });
-
-    titleGroup.appendChild(titleLabel);
-    titleGroup.appendChild(titleInput);
-    titleCol.appendChild(titleGroup);
-
-    return titleCol;
-  }
-
-  function createPageInputElement(bookmark) {
-    const pageCol = document.createElement("div");
-    pageCol.className = "col-md-4";
-
-    const pageGroup = document.createElement("div");
-    pageGroup.className = "mb-3";
-
-    const pageLabel = document.createElement("label");
-    pageLabel.textContent = "Page";
-    pageLabel.className = "form-label";
-
-    const pageInput = document.createElement("input");
-    pageInput.type = "number";
-    pageInput.className = "form-control bookmark-page";
-    pageInput.value = bookmark.pageNumber;
-    pageInput.min = 1;
-    pageInput.addEventListener("input", function () {
-      bookmark.pageNumber = parseInt(this.value) || 1;
-      updateBookmarkData();
-
-      // Also update the preview in the header
-      const header = pageInput.closest(".bookmark-item").querySelector(".bookmark-page-preview");
-      if (header) {
-        header.textContent = `Page ${bookmark.pageNumber}`;
-      }
-    });
-
-    pageGroup.appendChild(pageLabel);
-    pageGroup.appendChild(pageInput);
-    pageCol.appendChild(pageGroup);
-
-    return pageCol;
-  }
-
-  function createButton(icon, className, title, clickHandler) {
-    const button = document.createElement("button");
-    button.type = "button";
-    button.className = `btn ${className} btn-bookmark-action`;
-    button.innerHTML = `<span class="material-symbols-rounded">${icon}</span>`;
-
-    // Use Bootstrap tooltips
-    button.setAttribute("data-bs-toggle", "tooltip");
-    button.setAttribute("data-bs-placement", "top");
-    button.title = title;
-
-    button.addEventListener("click", clickHandler);
-    return button;
-  }
-
-  function createChildrenContainer(bookmark, level) {
-    const childrenContainer = document.createElement("div");
-    childrenContainer.className = "bookmark-children";
-
-    bookmark.children.forEach((child) => {
-      childrenContainer.appendChild(createBookmarkElement(child, level + 1));
-    });
-
-    return childrenContainer;
-  }
-
-  // Update the add bookmark button appearance with clear visual cue
-  addBookmarkBtn.innerHTML = '<span class="material-symbols-rounded">add</span> Add Top-level Bookmark';
-  addBookmarkBtn.className = "btn btn-primary btn-add-bookmark top-level";
-
-  // Use Bootstrap tooltips
-  addBookmarkBtn.setAttribute("data-bs-toggle", "tooltip");
-  addBookmarkBtn.setAttribute("data-bs-placement", "top");
-  addBookmarkBtn.title = "Add a new top-level bookmark";
-
-  // Add icon to empty state button as well
-  const updateEmptyStateButton = function () {
-    const emptyStateBtn = document.querySelector(".btn-add-first-bookmark");
-    if (emptyStateBtn) {
-      emptyStateBtn.innerHTML = '<span class="material-symbols-rounded">add</span> Add First Bookmark';
-      emptyStateBtn.setAttribute("data-bs-toggle", "tooltip");
-      emptyStateBtn.setAttribute("data-bs-placement", "top");
-      emptyStateBtn.title = "Add first bookmark";
-
-      // Initialize tooltips for the empty state button
-      if (typeof $ !== "undefined") {
-        $('[data-bs-toggle="tooltip"]').tooltip();
-      }
-    }
-  };
-
-  // Initialize with an empty state if no bookmarks
-  if (bookmarks.length === 0) {
-    showEmptyState();
-    updateEmptyStateButton();
-  }
-
-  // Add bookmarks Import/Export functionality
-
-  // Import/Export button references
-  const importDefaultBtn = document.getElementById("importDefaultBtn");
-  const exportDefaultBtn = document.getElementById("exportDefaultBtn");
-  const importUploadJsonFileInput = document.getElementById("importUploadJsonFileInput");
-  const importPasteFromClipboardBtn = document.getElementById("importPasteFromClipboardBtn");
-  const exportDownloadJsonFileBtn = document.getElementById("exportDownloadJsonFileBtn");
-  const exportCopyToClipboardBtn = document.getElementById("exportCopyToClipboardBtn");
-
-  // display import/export from/to clipboard buttons if supported
-  if (navigator.clipboard && navigator.clipboard.readText) {
-    importPasteFromClipboardBtn.parentElement.classList.remove("d-none");
-  }
-  if (navigator.clipboard && navigator.clipboard.writeText) {
-    exportCopyToClipboardBtn.parentElement.classList.remove("d-none");
-  }
-
-  function flashButtonSuccess(button) {
-    const originalClass = button.className;
-
-    button.classList.remove("btn-outline-primary");
-    button.classList.add("btn-success", "success-flash");
-
-    setTimeout(() => {
-      button.className = originalClass;
-    }, 1000);
-  }
-
-  // Import handlers
-  async function handleJsonFileInputChange(event) {
-    try {
-      await loadBookmarks(async function () {
-        return getBookmarkDataFromJson(event);
-      });
-      flashButtonSuccess(importDefaultBtn);
-    } catch (error) {
-      console.error(`Failed to import bookmarks from JSON file: ${error.message}`);
-    }
-  }
-
-  async function importBookmarksFromClipboard() {
-    console.log("Importing bookmarks from clipboard...");
-
-    try {
-      await loadBookmarks(async function () {
-        const clipboardText = await navigator.clipboard.readText();
-        if (!clipboardText) return [];
-
-        return JSON.parse(clipboardText);
-      });
-      flashButtonSuccess(importDefaultBtn);
-    } catch (error) {
-      console.error(`Failed to import bookmarks from clipboard: ${error.message}`);
-    }
-  }
-
-  async function handleBookmarksPasteFromClipboard(event) {
-    // do not override normal paste behavior on input fields
-    if (event.target.tagName.toLowerCase() === "input") return;
-
-    try {
-      await loadBookmarks(async function () {
-        const clipboardText = event.clipboardData?.getData("text/plain");
-        if (!clipboardText) return [];
-
-        return JSON.parse(clipboardText);
-      });
-      flashButtonSuccess(importDefaultBtn);
-    } catch (error) {
-      console.error(`Failed to import bookmarks from clipboard (ctrl-v): ${error.message}`);
-    }
-  }
-
-  // Export handlers
-  async function exportBookmarksToJson() {
-    console.log("Exporting bookmarks to JSON...");
-
-    try {
-      const bookmarkData = bookmarkDataInput.value;
-      const blob = new Blob([bookmarkData], { type: "application/json" });
-      const url = URL.createObjectURL(blob);
-
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = "bookmarks.json";
-      document.body.appendChild(a);
-      a.click();
-
-      document.body.removeChild(a);
-      URL.revokeObjectURL(url);
-      flashButtonSuccess(exportDefaultBtn);
-    } catch (error) {
-      console.error(`Failed to export bookmarks to JSON: ${error.message}`);
-    }
-  }
-
-  async function exportBookmarksToClipboard() {
-    const bookmarkData = bookmarkDataInput.value;
-    try {
-      await navigator.clipboard.writeText(bookmarkData);
-      flashButtonSuccess(exportDefaultBtn);
-    } catch (error) {
-      console.error(`Failed to export bookmarks to clipboard: ${error.message}`);
-    }
-  }
-
-  async function handleBookmarksCopyToClipboard(event) {
-    // do not override normal copy behavior on input fields
-    if (event.target.tagName.toLowerCase() === "input") return;
-
-    const bookmarkData = bookmarkDataInput.value;
-
-    try {
-      event.clipboardData.setData("text/plain", bookmarkData);
-      event.preventDefault();
-      flashButtonSuccess(exportDefaultBtn);
-    } catch (error) {
-      console.error(`Failed to export bookmarks to clipboard (ctrl-c): ${error.message}`);
-    }
-  }
-
-  // register event listeners for import/export functions
-  importUploadJsonFileInput.addEventListener("change", handleJsonFileInputChange);
-  importPasteFromClipboardBtn.addEventListener("click", importBookmarksFromClipboard);
-  exportDownloadJsonFileBtn.addEventListener("click", exportBookmarksToJson);
-  exportCopyToClipboardBtn.addEventListener("click", exportBookmarksToClipboard);
-  document.body.addEventListener("copy", handleBookmarksCopyToClipboard);
-  document.body.addEventListener("paste", handleBookmarksPasteFromClipboard);
-  // set default actions
-  // importDefaultBtn is already handled by being a label for the file input
-  exportDefaultBtn.addEventListener("click", exportBookmarksToJson);
-
-  // Listen for theme changes to update badge colors
-  const observer = new MutationObserver(function (mutations) {
-    mutations.forEach(function (mutation) {
-      if (mutation.attributeName === "data-bs-theme") {
-        const isDarkMode = document.documentElement.getAttribute("data-bs-theme") === "dark";
-        document.querySelectorAll(".badge").forEach((badge) => {
-          badge.classList.remove("bg-secondary", "bg-info");
-          badge.classList.add(isDarkMode ? "bg-info" : "bg-secondary");
-        });
-      }
-    });
-  });
-
-  observer.observe(document.documentElement, { attributes: true });
-
-  // Add visual enhancement to clearly show the top-level/child relationship
-  document.addEventListener("mouseover", function (e) {
-    // When hovering over add buttons, highlight their relationship targets
-    const button = e.target.closest(".btn-add-child, .btn-add-sibling");
-    if (button) {
-      if (button.classList.contains("btn-add-child")) {
-        // Highlight parent-child relationship
-        const bookmarkItem = button.closest(".bookmark-item");
-        if (bookmarkItem) {
-          bookmarkItem.style.boxShadow = "0 0 0 2px var(--btn-add-child-border, #198754)";
-        }
-      } else if (button.classList.contains("btn-add-sibling")) {
-        // Highlight sibling relationship
-        const bookmarkItem = button.closest(".bookmark-item");
-        if (bookmarkItem) {
-          // Find siblings
-          const parent = bookmarkItem.parentElement;
-          const siblings = parent.querySelectorAll(":scope > .bookmark-item");
-          siblings.forEach((sibling) => {
-            if (sibling !== bookmarkItem) {
-              sibling.style.boxShadow = "0 0 0 2px var(--btn-add-sibling-border, #0d6efd)";
-            }
-          });
-        }
-      }
-    }
-  });
-
-  document.addEventListener("mouseout", function (e) {
-    // Remove highlights when not hovering
-    const button = e.target.closest(".btn-add-child, .btn-add-sibling");
-    if (button) {
-      // Remove all highlights
-      document.querySelectorAll(".bookmark-item").forEach((item) => {
-        item.style.boxShadow = "";
-      });
-    }
-  });
-});
@@ -1,143 +0,0 @@
-
-window.onload = function () {
-  var items = document.querySelectorAll(".dropdown-item, .nav-link");
-  var dummyContainer = document.createElement("div");
-  dummyContainer.style.position = "absolute";
-  dummyContainer.style.visibility = "hidden";
-  dummyContainer.style.whiteSpace = "nowrap"; // Ensure we measure full width
-  document.body.appendChild(dummyContainer);
-
-  var maxWidth = 0;
-
-  items.forEach(function (item) {
-    var clone = item.cloneNode(true);
-    dummyContainer.appendChild(clone);
-    var width = clone.offsetWidth;
-    if (width > maxWidth) {
-      maxWidth = width;
-    }
-    dummyContainer.removeChild(clone);
-  });
-
-  document.body.removeChild(dummyContainer);
-
-  // Store max width for later use
-  window.navItemMaxWidth = maxWidth;
-};
-
-document.querySelector("#navbarSearchInput").addEventListener("input", function (e) {
-  var searchText = e.target.value.trim().toLowerCase();
-  var items = document.querySelectorAll("a.dropdown-item[data-bs-tags]");
-  var resultsBox = document.querySelector("#searchResults");
-
-  resultsBox.innerHTML = "";
-
-  if (searchText !== "") {
-    var addedResults = new Set();
-
-    items.forEach(function (item) {
-      var titleElement = item.querySelector(".icon-text");
-      var iconElement = item.querySelector(".material-symbols-rounded, .icon");
-      var itemHref = item.getAttribute("href");
-      var tags = item.getAttribute("data-bs-tags") || "";
-
-      if (titleElement && iconElement && itemHref !== "#") {
-        var title = titleElement.innerText.trim();
-
-        if (
-          (title.toLowerCase().includes(searchText) || tags.toLowerCase().includes(searchText)) &&
-          !addedResults.has(itemHref)
-        ) {
-          var dropdownItem = document.createElement("div");
-          dropdownItem.className = "dropdown-item d-flex justify-content-between align-items-center";
-
-          var contentWrapper = document.createElement("div");
-          contentWrapper.className = "d-flex align-items-center flex-grow-1";
-          contentWrapper.style.textDecoration = "none";
-          contentWrapper.style.color = "inherit";
-
-          var divElement = item.querySelector("div");
-          if (divElement) {
-            var originalContent = divElement.cloneNode(true);
-            contentWrapper.appendChild(originalContent);
-          } else {
-            // Fallback: create content manually if div is not found
-            var fallbackContent = document.createElement("div");
-            fallbackContent.innerHTML = item.innerHTML;
-            contentWrapper.appendChild(fallbackContent);
-          }
-
-          contentWrapper.onclick = function () {
-            window.location.href = itemHref;
-          };
-
-          dropdownItem.appendChild(contentWrapper);
-          resultsBox.appendChild(dropdownItem);
-          addedResults.add(itemHref);
-        }
-      }
-    });
-  }
-
-  resultsBox.style.width = window.navItemMaxWidth + "px";
-});
-
-document.addEventListener('DOMContentLoaded', function () {
-  const searchDropdown = document.getElementById('searchDropdown');
-  const searchInput = document.getElementById('navbarSearchInput');
-
-  // Check if elements are missing and skip initialization if necessary
-  if (!searchDropdown || !searchInput) {
-    console.warn('Search dropdown or input not found. Skipping initialization.');
-    return;
-  }
-  const dropdownMenu = searchDropdown.querySelector('.dropdown-menu');
-  if (!dropdownMenu) {
-    console.warn('Dropdown menu not found within the search dropdown. Skipping initialization.');
-    return;
-  }
-
-  // Create a single dropdown instance
-  const dropdownInstance = new bootstrap.Dropdown(searchDropdown);
-
-  // Handle click for mobile
-  searchDropdown.addEventListener('click', function (e) {
-    e.preventDefault();
-    const isOpen = dropdownMenu.classList.contains('show');
-    // Close all other open dropdowns
-    document.querySelectorAll('.navbar-nav .dropdown-menu.show').forEach((menu) => {
-      if (menu !== dropdownMenu) {
-        const parentDropdown = menu.closest('.dropdown');
-        if (parentDropdown) {
-          const parentToggle = parentDropdown.querySelector('[data-bs-toggle="dropdown"]');
-          if (parentToggle) {
-            let instance = bootstrap.Dropdown.getInstance(parentToggle);
-            if (!instance) {
-              instance = new bootstrap.Dropdown(parentToggle);
-            }
-            instance.hide();
-          }
-        }
-      }
-    });
-    if (!isOpen) {
-      dropdownInstance.show();
-      setTimeout(() => searchInput.focus(), 150);
-    } else {
-      dropdownInstance.hide();
-    }
-  });
-
-  // Hide dropdown if it's open and user clicks outside
-  document.addEventListener('click', function (e) {
-    if (!searchDropdown.contains(e.target) && dropdownMenu.classList.contains('show')) {
-      dropdownInstance.hide();
-    }
-  });
-
-  // Keep dropdown open if search input is clicked
-  searchInput.addEventListener('click', function (e) {
-    e.stopPropagation();
-  });
-
-});
@@ -1,176 +0,0 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-  th:dir="#{language.direction}"
-  th:data-language="${#locale.toString()}"
-  xmlns:th="https://www.thymeleaf.org">
-
-  <head>
-    <th:block
-      th:insert="~{fragments/common :: head(title=#{editTableOfContents.title}, header=#{editTableOfContents.header})}">
-    </th:block>
-    <link rel="stylesheet"
-      th:href="@{'/css/edit-table-of-contents.css'}">
-  </head>
-
-  <body>
-    <div id="page-container">
-      <div id="content-wrap">
-        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-8 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon edit">bookmark_add</span>
-                <span class="tool-header-text"
-                  th:text="#{editTableOfContents.header}"></span>
-              </div>
-              <form th:action="@{'/api/v1/general/edit-table-of-contents'}"
-                method="post"
-                enctype="multipart/form-data"
-                id="editTocForm">
-                <div
-                  th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
-                </div>
-
-                <div class="mb-3 form-check">
-                  <input type="checkbox"
-                    class="form-check-input"
-                    id="replaceExisting"
-                    name="replaceExisting"
-                    checked>
-                  <label class="form-check-label"
-                    for="replaceExisting"
-                    th:text="#{editTableOfContents.replaceExisting}"></label>
-                  <input type="hidden"
-                    name="replaceExisting"
-                    value="false" />
-                </div>
-
-                <div class="bookmark-editor">
-                  <h5 th:text="#{editTableOfContents.editorTitle}"></h5>
-                  <p th:text="#{editTableOfContents.editorDesc}"></p>
-
-                  <div id="error-message-container">
-                    <!-- Error messages will be added here dynamically -->
-                  </div>
-
-                  <div id="bookmarks-container">
-                    <!-- Bookmarks will be added here dynamically -->
-                  </div>
-
-                  <div class="bookmark-actions">
-                    <button type="button"
-                      id="addBookmarkBtn"
-                      class="btn btn-outline-primary"
-                      th:text="#{editTableOfContents.addBookmark}"></button>
-
-                    <div class="d-flex flex-wrap justify-content-end gap-2">
-                      <!-- Import Split Button -->
-                      <div class="btn-group">
-                        <label
-                          id="importDefaultBtn"
-                          for="importUploadJsonFileInput"
-                          class="btn btn-outline-primary"
-                          style="border-top-left-radius: 1.25rem !important; border-bottom-left-radius: 1.25rem !important;"
-                          th:text="#{editTableOfContents.importBookmarksDefault}">
-                        </label>
-                        <button type="button"
-                          class="btn btn-outline-primary dropdown-toggle dropdown-toggle-split"
-                          data-bs-toggle="dropdown"
-                          aria-expanded="false">
-                          <span class="visually-hidden">Toggle Import Options</span>
-                        </button>
-                        <ul class="dropdown-menu">
-                          <li><label class="dropdown-item"
-                              id="importUploadJsonFileBtn"
-                              for="importUploadJsonFileInput"
-                              style="cursor: pointer;"
-                              th:text="#{editTableOfContents.importBookmarksFromJsonFile}"></label></li>
-                          <li class="d-none"><a class="dropdown-item"
-                              href="#bookmarks-container"
-                              id="importPasteFromClipboardBtn"
-                              th:text="#{editTableOfContents.importBookmarksFromClipboard}"></a></li>
-                        </ul>
-                      </div>
-
-                      <!-- Export Split Button -->
-                      <div class="btn-group">
-                        <button type="button"
-                          id="exportDefaultBtn"
-                          class="btn btn-outline-primary"
-                          th:text="#{editTableOfContents.exportBookmarksDefault}"></button>
-                        <button type="button"
-                          class="btn btn-outline-primary dropdown-toggle dropdown-toggle-split"
-                          data-bs-toggle="dropdown"
-                          aria-expanded="false">
-                          <span class="visually-hidden">Toggle Export Options</span>
-                        </button>
-                        <ul class="dropdown-menu">
-                          <li><a class="dropdown-item"
-                              href="#bookmarks-container"
-                              id="exportDownloadJsonFileBtn"
-                              th:text="#{editTableOfContents.exportBookmarksAsJson}"></a></li>
-                          <li class="d-none"><a class="dropdown-item"
-                              href="#bookmarks-container"
-                              id="exportCopyToClipboardBtn"
-                              th:text="#{editTableOfContents.exportBookmarksAsText}"></a></li>
-                        </ul>
-                      </div>
-                    </div>
-                  </div>
-
-                  <!-- Hidden field to store JSON data -->
-                  <input type="hidden"
-                    id="bookmarkData"
-                    name="bookmarkData"
-                    value="[]">
-                </div>
-
-                <p>
-                  <a class="btn btn-outline-primary"
-                    data-bs-toggle="collapse"
-                    href="#info"
-                    role="button"
-                    aria-expanded="false"
-                    aria-controls="info"
-                    th:text="#{info}"></a>
-                </p>
-                <div class="collapse"
-                  id="info">
-                  <p th:text="#{editTableOfContents.desc.1}"></p>
-                  <p th:text="#{editTableOfContents.desc.2}"></p>
-                  <p th:text="#{editTableOfContents.desc.3}"></p>
-                </div>
-
-                <br>
-                <button type="submit"
-                  id="submitBtn"
-                  class="btn btn-primary"
-                  th:text="#{editTableOfContents.submit}"></button>
-              </form>
-
-              <!-- Hidden file input for JSON import (outside of form)-->
-              <input type="file"
-                id="importUploadJsonFileInput"
-                accept="application/json"
-                style="display: none;">
-            </div>
-          </div>
-        </div>
-      </div>
-      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-    </div>
-
-    <script th:src="@{'/js/pages/edit-table-of-contents.js'}"></script>
-    <script>
-    document.addEventListener('DOMContentLoaded', function() {
-      // Initialize Bootstrap tooltips
-      if (typeof $ !== 'undefined') {
-        $('[data-bs-toggle="tooltip"]').tooltip();
-      }
-    });
-  </script>
-  </body>
-
-</html>
@@ -1,484 +0,0 @@
-package stirling.software.proprietary.controller.api;
-
-import static stirling.software.common.util.ProviderUtils.validateProvider;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.Security;
-import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.common.model.ApplicationProperties.Security.OAUTH2.Client;
-import stirling.software.common.model.ApplicationProperties.Security.SAML2;
-import stirling.software.common.model.FileInfo;
-import stirling.software.common.model.enumeration.Role;
-import stirling.software.common.model.oauth2.GitHubProvider;
-import stirling.software.common.model.oauth2.GoogleProvider;
-import stirling.software.common.model.oauth2.KeycloakProvider;
-import stirling.software.proprietary.audit.AuditEventType;
-import stirling.software.proprietary.audit.AuditLevel;
-import stirling.software.proprietary.config.AuditConfigurationProperties;
-import stirling.software.proprietary.model.Team;
-import stirling.software.proprietary.model.dto.TeamWithUserCountDTO;
-import stirling.software.proprietary.security.config.EnterpriseEndpoint;
-import stirling.software.proprietary.security.database.repository.SessionRepository;
-import stirling.software.proprietary.security.database.repository.UserRepository;
-import stirling.software.proprietary.security.model.Authority;
-import stirling.software.proprietary.security.model.SessionEntity;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.repository.TeamRepository;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.service.DatabaseService;
-import stirling.software.proprietary.security.service.TeamService;
-import stirling.software.proprietary.security.session.SessionPersistentRegistry;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/v1/proprietary/ui-data")
-@Tag(name = "Proprietary UI Data", description = "APIs for React UI data (Proprietary features)")
-@EnterpriseEndpoint
-public class ProprietaryUIDataController {
-
-    private final ApplicationProperties applicationProperties;
-    private final AuditConfigurationProperties auditConfig;
-    private final SessionPersistentRegistry sessionPersistentRegistry;
-    private final UserRepository userRepository;
-    private final TeamRepository teamRepository;
-    private final SessionRepository sessionRepository;
-    private final DatabaseService databaseService;
-    private final boolean runningEE;
-    private final ObjectMapper objectMapper;
-
-    public ProprietaryUIDataController(
-            ApplicationProperties applicationProperties,
-            AuditConfigurationProperties auditConfig,
-            SessionPersistentRegistry sessionPersistentRegistry,
-            UserRepository userRepository,
-            TeamRepository teamRepository,
-            SessionRepository sessionRepository,
-            DatabaseService databaseService,
-            ObjectMapper objectMapper,
-            @Qualifier("runningEE") boolean runningEE) {
-        this.applicationProperties = applicationProperties;
-        this.auditConfig = auditConfig;
-        this.sessionPersistentRegistry = sessionPersistentRegistry;
-        this.userRepository = userRepository;
-        this.teamRepository = teamRepository;
-        this.sessionRepository = sessionRepository;
-        this.databaseService = databaseService;
-        this.objectMapper = objectMapper;
-        this.runningEE = runningEE;
-    }
-
-    @GetMapping("/audit-dashboard")
-    @PreAuthorize("hasRole('ADMIN')")
-    @Operation(summary = "Get audit dashboard data")
-    public ResponseEntity<AuditDashboardData> getAuditDashboardData() {
-        AuditDashboardData data = new AuditDashboardData();
-        data.setAuditEnabled(auditConfig.isEnabled());
-        data.setAuditLevel(auditConfig.getAuditLevel());
-        data.setAuditLevelInt(auditConfig.getLevel());
-        data.setRetentionDays(auditConfig.getRetentionDays());
-        data.setAuditLevels(AuditLevel.values());
-        data.setAuditEventTypes(AuditEventType.values());
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/login")
-    @Operation(summary = "Get login page data")
-    public ResponseEntity<LoginData> getLoginData() {
-        LoginData data = new LoginData();
-        Map<String, String> providerList = new HashMap<>();
-        Security securityProps = applicationProperties.getSecurity();
-        OAUTH2 oauth = securityProps.getOauth2();
-
-        if (oauth != null && oauth.getEnabled()) {
-            if (oauth.isSettingsValid()) {
-                String firstChar = String.valueOf(oauth.getProvider().charAt(0));
-                String clientName =
-                        oauth.getProvider().replaceFirst(firstChar, firstChar.toUpperCase());
-                providerList.put("/oauth2/authorization/" + oauth.getProvider(), clientName);
-            }
-
-            Client client = oauth.getClient();
-            if (client != null) {
-                GoogleProvider google = client.getGoogle();
-                if (validateProvider(google)) {
-                    providerList.put(
-                            "/oauth2/authorization/" + google.getName(), google.getClientName());
-                }
-
-                GitHubProvider github = client.getGithub();
-                if (validateProvider(github)) {
-                    providerList.put(
-                            "/oauth2/authorization/" + github.getName(), github.getClientName());
-                }
-
-                KeycloakProvider keycloak = client.getKeycloak();
-                if (validateProvider(keycloak)) {
-                    providerList.put(
-                            "/oauth2/authorization/" + keycloak.getName(),
-                            keycloak.getClientName());
-                }
-            }
-        }
-
-        SAML2 saml2 = securityProps.getSaml2();
-        if (securityProps.isSaml2Active()
-                && applicationProperties.getSystem().getEnableAlphaFunctionality()
-                && applicationProperties.getPremium().isEnabled()) {
-            String samlIdp = saml2.getProvider();
-            String saml2AuthenticationPath = "/saml2/authenticate/" + saml2.getRegistrationId();
-
-            if (!applicationProperties.getPremium().getProFeatures().isSsoAutoLogin()) {
-                providerList.put(saml2AuthenticationPath, samlIdp + " (SAML 2)");
-            }
-        }
-
-        // Remove null entries
-        providerList
-                .entrySet()
-                .removeIf(entry -> entry.getKey() == null || entry.getValue() == null);
-
-        data.setProviderList(providerList);
-        data.setLoginMethod(securityProps.getLoginMethod());
-        data.setAltLogin(!providerList.isEmpty() && securityProps.isAltLogin());
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/admin-settings")
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @Operation(summary = "Get admin settings data")
-    public ResponseEntity<AdminSettingsData> getAdminSettingsData(Authentication authentication) {
-        List<User> allUsers = userRepository.findAllWithTeam();
-        Iterator<User> iterator = allUsers.iterator();
-        Map<String, String> roleDetails = Role.getAllRoleDetails();
-
-        Map<String, Boolean> userSessions = new HashMap<>();
-        Map<String, Date> userLastRequest = new HashMap<>();
-        int activeUsers = 0;
-        int disabledUsers = 0;
-
-        while (iterator.hasNext()) {
-            User user = iterator.next();
-            if (user != null) {
-                boolean shouldRemove = false;
-
-                // Check if user is an INTERNAL_API_USER
-                for (Authority authority : user.getAuthorities()) {
-                    if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
-                        shouldRemove = true;
-                        roleDetails.remove(Role.INTERNAL_API_USER.getRoleId());
-                        break;
-                    }
-                }
-
-                // Check if user is part of the Internal team
-                if (user.getTeam() != null
-                        && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-                    shouldRemove = true;
-                }
-
-                if (shouldRemove) {
-                    iterator.remove();
-                    continue;
-                }
-
-                // Session status and last request time
-                int maxInactiveInterval = sessionPersistentRegistry.getMaxInactiveInterval();
-                boolean hasActiveSession = false;
-                Date lastRequest = null;
-                Optional<SessionEntity> latestSession =
-                        sessionPersistentRegistry.findLatestSession(user.getUsername());
-
-                if (latestSession.isPresent()) {
-                    SessionEntity sessionEntity = latestSession.get();
-                    Date lastAccessedTime = sessionEntity.getLastRequest();
-                    Instant now = Instant.now();
-                    Instant expirationTime =
-                            lastAccessedTime
-                                    .toInstant()
-                                    .plus(maxInactiveInterval, ChronoUnit.SECONDS);
-
-                    if (now.isAfter(expirationTime)) {
-                        sessionPersistentRegistry.expireSession(sessionEntity.getSessionId());
-                    } else {
-                        hasActiveSession = !sessionEntity.isExpired();
-                    }
-                    lastRequest = sessionEntity.getLastRequest();
-                } else {
-                    lastRequest = new Date(0);
-                }
-
-                userSessions.put(user.getUsername(), hasActiveSession);
-                userLastRequest.put(user.getUsername(), lastRequest);
-
-                if (hasActiveSession) activeUsers++;
-                if (!user.isEnabled()) disabledUsers++;
-            }
-        }
-
-        // Sort users by active status and last request date
-        List<User> sortedUsers =
-                allUsers.stream()
-                        .sorted(
-                                (u1, u2) -> {
-                                    boolean u1Active = userSessions.get(u1.getUsername());
-                                    boolean u2Active = userSessions.get(u2.getUsername());
-                                    if (u1Active && !u2Active) return -1;
-                                    if (!u1Active && u2Active) return 1;
-
-                                    Date u1LastRequest =
-                                            userLastRequest.getOrDefault(
-                                                    u1.getUsername(), new Date(0));
-                                    Date u2LastRequest =
-                                            userLastRequest.getOrDefault(
-                                                    u2.getUsername(), new Date(0));
-                                    return u2LastRequest.compareTo(u1LastRequest);
-                                })
-                        .toList();
-
-        List<Team> allTeams =
-                teamRepository.findAll().stream()
-                        .filter(team -> !team.getName().equals(TeamService.INTERNAL_TEAM_NAME))
-                        .toList();
-
-        AdminSettingsData data = new AdminSettingsData();
-        data.setUsers(sortedUsers);
-        data.setCurrentUsername(authentication.getName());
-        data.setRoleDetails(roleDetails);
-        data.setUserSessions(userSessions);
-        data.setUserLastRequest(userLastRequest);
-        data.setTotalUsers(allUsers.size());
-        data.setActiveUsers(activeUsers);
-        data.setDisabledUsers(disabledUsers);
-        data.setTeams(allTeams);
-        data.setMaxPaidUsers(applicationProperties.getPremium().getMaxUsers());
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/account")
-    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-    @Operation(summary = "Get account page data")
-    public ResponseEntity<AccountData> getAccountData(Authentication authentication) {
-        if (authentication == null || !authentication.isAuthenticated()) {
-            return ResponseEntity.status(401).build();
-        }
-
-        Object principal = authentication.getPrincipal();
-        String username = null;
-        boolean isOAuth2Login = false;
-        boolean isSaml2Login = false;
-
-        if (principal instanceof UserDetails detailsUser) {
-            username = detailsUser.getUsername();
-        } else if (principal instanceof OAuth2User oAuth2User) {
-            username = oAuth2User.getName();
-            isOAuth2Login = true;
-        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal saml2User) {
-            username = saml2User.name();
-            isSaml2Login = true;
-        }
-
-        if (username == null) {
-            return ResponseEntity.status(401).build();
-        }
-
-        Optional<User> user = userRepository.findByUsernameIgnoreCaseWithSettings(username);
-        if (user.isEmpty()) {
-            return ResponseEntity.status(404).build();
-        }
-
-        String settingsJson;
-        try {
-            settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
-        } catch (JsonProcessingException e) {
-            log.error("Error converting settings map", e);
-            return ResponseEntity.status(500).build();
-        }
-
-        AccountData data = new AccountData();
-        data.setUsername(username);
-        data.setRole(user.get().getRolesAsString());
-        data.setSettings(settingsJson);
-        data.setChangeCredsFlag(user.get().isFirstLogin());
-        data.setOAuth2Login(isOAuth2Login);
-        data.setSaml2Login(isSaml2Login);
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/teams")
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @Operation(summary = "Get teams list data")
-    public ResponseEntity<TeamsData> getTeamsData() {
-        List<TeamWithUserCountDTO> allTeamsWithCounts = teamRepository.findAllTeamsWithUserCount();
-        List<TeamWithUserCountDTO> teamsWithCounts =
-                allTeamsWithCounts.stream()
-                        .filter(team -> !team.getName().equals(TeamService.INTERNAL_TEAM_NAME))
-                        .toList();
-
-        List<Object[]> teamActivities = sessionRepository.findLatestActivityByTeam();
-        Map<Long, Date> teamLastRequest = new HashMap<>();
-        for (Object[] result : teamActivities) {
-            Long teamId = (Long) result[0];
-            Date lastActivity = (Date) result[1];
-            teamLastRequest.put(teamId, lastActivity);
-        }
-
-        TeamsData data = new TeamsData();
-        data.setTeamsWithCounts(teamsWithCounts);
-        data.setTeamLastRequest(teamLastRequest);
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/teams/{id}")
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @Operation(summary = "Get team details data")
-    public ResponseEntity<TeamDetailsData> getTeamDetailsData(@PathVariable("id") Long id) {
-        Team team =
-                teamRepository
-                        .findById(id)
-                        .orElseThrow(() -> new RuntimeException("Team not found"));
-
-        if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return ResponseEntity.status(403).build();
-        }
-
-        List<User> teamUsers = userRepository.findAllByTeamId(id);
-        List<User> allUsers = userRepository.findAllWithTeam();
-        List<User> availableUsers =
-                allUsers.stream()
-                        .filter(
-                                user ->
-                                        (user.getTeam() == null
-                                                        || !user.getTeam().getId().equals(id))
-                                                && (user.getTeam() == null
-                                                        || !user.getTeam()
-                                                                .getName()
-                                                                .equals(
-                                                                        TeamService
-                                                                                .INTERNAL_TEAM_NAME)))
-                        .toList();
-
-        List<Object[]> userSessions = sessionRepository.findLatestSessionByTeamId(id);
-        Map<String, Date> userLastRequest = new HashMap<>();
-        for (Object[] result : userSessions) {
-            String username = (String) result[0];
-            Date lastRequest = (Date) result[1];
-            userLastRequest.put(username, lastRequest);
-        }
-
-        TeamDetailsData data = new TeamDetailsData();
-        data.setTeam(team);
-        data.setTeamUsers(teamUsers);
-        data.setAvailableUsers(availableUsers);
-        data.setUserLastRequest(userLastRequest);
-
-        return ResponseEntity.ok(data);
-    }
-
-    @GetMapping("/database")
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @Operation(summary = "Get database management data")
-    public ResponseEntity<DatabaseData> getDatabaseData() {
-        List<FileInfo> backupList = databaseService.getBackupList();
-        String dbVersion = databaseService.getH2Version();
-        boolean isVersionUnknown = "Unknown".equalsIgnoreCase(dbVersion);
-
-        DatabaseData data = new DatabaseData();
-        data.setBackupFiles(backupList);
-        data.setDatabaseVersion(dbVersion);
-        data.setVersionUnknown(isVersionUnknown);
-
-        return ResponseEntity.ok(data);
-    }
-
-    // Data classes
-    @Data
-    public static class AuditDashboardData {
-        private boolean auditEnabled;
-        private AuditLevel auditLevel;
-        private int auditLevelInt;
-        private int retentionDays;
-        private AuditLevel[] auditLevels;
-        private AuditEventType[] auditEventTypes;
-    }
-
-    @Data
-    public static class LoginData {
-        private Map<String, String> providerList;
-        private String loginMethod;
-        private boolean altLogin;
-    }
-
-    @Data
-    public static class AdminSettingsData {
-        private List<User> users;
-        private String currentUsername;
-        private Map<String, String> roleDetails;
-        private Map<String, Boolean> userSessions;
-        private Map<String, Date> userLastRequest;
-        private int totalUsers;
-        private int activeUsers;
-        private int disabledUsers;
-        private List<Team> teams;
-        private int maxPaidUsers;
-    }
-
-    @Data
-    public static class AccountData {
-        private String username;
-        private String role;
-        private String settings;
-        private boolean changeCredsFlag;
-        private boolean oAuth2Login;
-        private boolean saml2Login;
-    }
-
-    @Data
-    public static class TeamsData {
-        private List<TeamWithUserCountDTO> teamsWithCounts;
-        private Map<Long, Date> teamLastRequest;
-    }
-
-    @Data
-    public static class TeamDetailsData {
-        private Team team;
-        private List<User> teamUsers;
-        private List<User> availableUsers;
-        private Map<String, Date> userLastRequest;
-    }
-
-    @Data
-    public static class DatabaseData {
-        private List<FileInfo> backupFiles;
-        private String databaseVersion;
-        private boolean versionUnknown;
-    }
-}
@@ -1,22 +0,0 @@
-package stirling.software.proprietary.security;
-
-import java.io.IOException;
-
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-@Component
-public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
-    @Override
-    public void commence(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            AuthenticationException authException)
-            throws IOException {
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage());
-    }
-}
@@ -1,31 +0,0 @@
-package stirling.software.proprietary.security.configuration;
-
-import java.time.Duration;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.caffeine.CaffeineCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.github.benmanes.caffeine.cache.Caffeine;
-
-@Configuration
-@EnableCaching
-public class CacheConfig {
-
-    @Value("${security.jwt.keyRetentionDays}")
-    private int keyRetentionDays;
-
-    @Bean
-    public CacheManager cacheManager() {
-        CaffeineCacheManager cacheManager = new CaffeineCacheManager();
-        cacheManager.setCaffeine(
-                Caffeine.newBuilder()
-                        .maximumSize(1000) // Make configurable?
-                        .expireAfterWrite(Duration.ofDays(keyRetentionDays))
-                        .recordStats());
-        return cacheManager;
-    }
-}
@@ -1,633 +0,0 @@
-package stirling.software.proprietary.security.controller.api;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.HtmlUtils;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import jakarta.validation.Valid;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.util.GeneralUtils;
-import stirling.software.proprietary.security.model.api.admin.SettingValueResponse;
-import stirling.software.proprietary.security.model.api.admin.UpdateSettingValueRequest;
-import stirling.software.proprietary.security.model.api.admin.UpdateSettingsRequest;
-
-@Controller
-@Tag(name = "Admin Settings", description = "Admin-only Settings Management APIs")
-@RequestMapping("/api/v1/admin/settings")
-@RequiredArgsConstructor
-@PreAuthorize("hasRole('ROLE_ADMIN')")
-@Slf4j
-public class AdminSettingsController {
-
-    private final ApplicationProperties applicationProperties;
-    private final ObjectMapper objectMapper;
-
-    // Track settings that have been modified but not yet applied (require restart)
-    private static final ConcurrentHashMap<String, Object> pendingChanges =
-            new ConcurrentHashMap<>();
-
-    // Define specific sensitive field names that contain secret values
-    private static final Set<String> SENSITIVE_FIELD_NAMES =
-            new HashSet<>(
-                    Arrays.asList(
-                            // Passwords
-                            "password",
-                            "dbpassword",
-                            "mailpassword",
-                            "smtppassword",
-                            // OAuth/API secrets
-                            "clientsecret",
-                            "apisecret",
-                            "secret",
-                            // API tokens
-                            "apikey",
-                            "accesstoken",
-                            "refreshtoken",
-                            "token",
-                            // Specific secret keys (not all keys, and excluding premium.key)
-                            "key", // automaticallyGenerated.key
-                            "enterprisekey",
-                            "licensekey"));
-
-    @GetMapping
-    @Operation(
-            summary = "Get all application settings",
-            description =
-                    "Retrieve all current application settings. Use includePending=true to include settings that will take effect after restart. Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(responseCode = "200", description = "Settings retrieved successfully"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required")
-            })
-    public ResponseEntity<?> getSettings(
-            @RequestParam(value = "includePending", defaultValue = "false")
-                    boolean includePending) {
-        log.debug("Admin requested all application settings (includePending={})", includePending);
-
-        // Convert ApplicationProperties to Map
-        Map<String, Object> settings = objectMapper.convertValue(applicationProperties, Map.class);
-
-        if (includePending && !pendingChanges.isEmpty()) {
-            // Merge pending changes into the settings map
-            settings = mergePendingChanges(settings, pendingChanges);
-        }
-
-        // Mask sensitive fields after merging
-        Map<String, Object> maskedSettings = maskSensitiveFields(settings);
-
-        return ResponseEntity.ok(maskedSettings);
-    }
-
-    @GetMapping("/delta")
-    @Operation(
-            summary = "Get pending settings changes",
-            description =
-                    "Retrieve settings that have been modified but not yet applied (require restart). Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(
-                        responseCode = "200",
-                        description = "Pending changes retrieved successfully"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required")
-            })
-    public ResponseEntity<?> getSettingsDelta() {
-        Map<String, Object> response = new HashMap<>();
-        // Mask sensitive fields in pending changes
-        response.put("pendingChanges", maskSensitiveFields(new HashMap<>(pendingChanges)));
-        response.put("hasPendingChanges", !pendingChanges.isEmpty());
-        response.put("count", pendingChanges.size());
-
-        log.debug("Admin requested pending changes - found {} settings", pendingChanges.size());
-        return ResponseEntity.ok(response);
-    }
-
-    @PutMapping
-    @Operation(
-            summary = "Update application settings (delta updates)",
-            description =
-                    "Update specific application settings using dot notation keys. Only sends changed values. Changes take effect on restart. Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(responseCode = "200", description = "Settings updated successfully"),
-                @ApiResponse(responseCode = "400", description = "Invalid setting key or value"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required"),
-                @ApiResponse(
-                        responseCode = "500",
-                        description = "Failed to save settings to configuration file")
-            })
-    public ResponseEntity<String> updateSettings(
-            @Valid @RequestBody UpdateSettingsRequest request) {
-        try {
-            Map<String, Object> settings = request.getSettings();
-            if (settings == null || settings.isEmpty()) {
-                return ResponseEntity.badRequest().body("No settings provided to update");
-            }
-
-            int updatedCount = 0;
-            for (Map.Entry<String, Object> entry : settings.entrySet()) {
-                String key = entry.getKey();
-                Object value = entry.getValue();
-
-                if (!isValidSettingKey(key)) {
-                    return ResponseEntity.badRequest()
-                            .body("Invalid setting key format: " + HtmlUtils.htmlEscape(key));
-                }
-
-                log.info("Admin updating setting: {} = {}", key, value);
-                GeneralUtils.saveKeyToSettings(key, value);
-
-                // Track this as a pending change
-                pendingChanges.put(key, value);
-
-                updatedCount++;
-            }
-
-            return ResponseEntity.ok(
-                    String.format(
-                            "Successfully updated %d setting(s). Changes will take effect on application restart.",
-                            updatedCount));
-
-        } catch (IOException e) {
-            log.error("Failed to save settings to file: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(GENERIC_FILE_ERROR);
-
-        } catch (IllegalArgumentException e) {
-            log.error("Invalid setting key or value: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(GENERIC_INVALID_SETTING);
-        } catch (Exception e) {
-            log.error("Unexpected error while updating settings: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(GENERIC_SERVER_ERROR);
-        }
-    }
-
-    @GetMapping("/section/{sectionName}")
-    @Operation(
-            summary = "Get specific settings section",
-            description =
-                    "Retrieve settings for a specific section (e.g., security, system, ui). Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(
-                        responseCode = "200",
-                        description = "Section settings retrieved successfully"),
-                @ApiResponse(responseCode = "400", description = "Invalid section name"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required")
-            })
-    public ResponseEntity<?> getSettingsSection(@PathVariable String sectionName) {
-        try {
-            Object sectionData = getSectionData(sectionName);
-            if (sectionData == null) {
-                return ResponseEntity.badRequest()
-                        .body(
-                                "Invalid section name: "
-                                        + HtmlUtils.htmlEscape(sectionName)
-                                        + ". Valid sections: "
-                                        + String.join(", ", VALID_SECTION_NAMES));
-            }
-            log.debug("Admin requested settings section: {}", sectionName);
-            return ResponseEntity.ok(sectionData);
-        } catch (IllegalArgumentException e) {
-            log.error("Invalid section name {}: {}", sectionName, e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body("Invalid section name: " + HtmlUtils.htmlEscape(sectionName));
-        } catch (Exception e) {
-            log.error("Error retrieving section {}: {}", sectionName, e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body("Failed to retrieve section.");
-        }
-    }
-
-    @PutMapping("/section/{sectionName}")
-    @Operation(
-            summary = "Update specific settings section",
-            description = "Update all settings within a specific section. Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(
-                        responseCode = "200",
-                        description = "Section settings updated successfully"),
-                @ApiResponse(responseCode = "400", description = "Invalid section name or data"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required"),
-                @ApiResponse(responseCode = "500", description = "Failed to save settings")
-            })
-    public ResponseEntity<String> updateSettingsSection(
-            @PathVariable String sectionName, @Valid @RequestBody Map<String, Object> sectionData) {
-        try {
-            if (sectionData == null || sectionData.isEmpty()) {
-                return ResponseEntity.badRequest().body("No section data provided to update");
-            }
-
-            if (!isValidSectionName(sectionName)) {
-                return ResponseEntity.badRequest()
-                        .body(
-                                "Invalid section name: "
-                                        + HtmlUtils.htmlEscape(sectionName)
-                                        + ". Valid sections: "
-                                        + String.join(", ", VALID_SECTION_NAMES));
-            }
-
-            int updatedCount = 0;
-            for (Map.Entry<String, Object> entry : sectionData.entrySet()) {
-                String propertyKey = entry.getKey();
-                String fullKey = sectionName + "." + propertyKey;
-                Object value = entry.getValue();
-
-                if (!isValidSettingKey(fullKey)) {
-                    return ResponseEntity.badRequest()
-                            .body("Invalid setting key format: " + HtmlUtils.htmlEscape(fullKey));
-                }
-
-                log.info("Admin updating section setting: {} = {}", fullKey, value);
-                GeneralUtils.saveKeyToSettings(fullKey, value);
-
-                // Track this as a pending change
-                pendingChanges.put(fullKey, value);
-
-                updatedCount++;
-            }
-
-            String escapedSectionName = HtmlUtils.htmlEscape(sectionName);
-            return ResponseEntity.ok(
-                    String.format(
-                            "Successfully updated %d setting(s) in section '%s'. Changes will take effect on application restart.",
-                            updatedCount, escapedSectionName));
-
-        } catch (IOException e) {
-            log.error("Failed to save section settings to file: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(GENERIC_FILE_ERROR);
-        } catch (IllegalArgumentException e) {
-            log.error("Invalid section data: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(GENERIC_INVALID_SECTION);
-        } catch (Exception e) {
-            log.error("Unexpected error while updating section settings: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(GENERIC_SERVER_ERROR);
-        }
-    }
-
-    @GetMapping("/key/{key}")
-    @Operation(
-            summary = "Get specific setting value",
-            description =
-                    "Retrieve value for a specific setting key using dot notation. Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(
-                        responseCode = "200",
-                        description = "Setting value retrieved successfully"),
-                @ApiResponse(responseCode = "400", description = "Invalid setting key"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required")
-            })
-    public ResponseEntity<?> getSettingValue(@PathVariable String key) {
-        try {
-            if (!isValidSettingKey(key)) {
-                return ResponseEntity.badRequest()
-                        .body("Invalid setting key format: " + HtmlUtils.htmlEscape(key));
-            }
-
-            Object value = getSettingByKey(key);
-            if (value == null) {
-                return ResponseEntity.badRequest()
-                        .body("Setting key not found: " + HtmlUtils.htmlEscape(key));
-            }
-            log.debug("Admin requested setting: {}", key);
-            return ResponseEntity.ok(new SettingValueResponse(key, value));
-        } catch (IllegalArgumentException e) {
-            log.error("Invalid setting key {}: {}", key, e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body("Invalid setting key: " + HtmlUtils.htmlEscape(key));
-        } catch (Exception e) {
-            log.error("Error retrieving setting {}: {}", key, e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body("Failed to retrieve setting.");
-        }
-    }
-
-    @PutMapping("/key/{key}")
-    @Operation(
-            summary = "Update specific setting value",
-            description =
-                    "Update value for a specific setting key using dot notation. Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(responseCode = "200", description = "Setting updated successfully"),
-                @ApiResponse(responseCode = "400", description = "Invalid setting key or value"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required"),
-                @ApiResponse(responseCode = "500", description = "Failed to save setting")
-            })
-    public ResponseEntity<String> updateSettingValue(
-            @PathVariable String key, @Valid @RequestBody UpdateSettingValueRequest request) {
-        try {
-            if (!isValidSettingKey(key)) {
-                return ResponseEntity.badRequest()
-                        .body("Invalid setting key format: " + HtmlUtils.htmlEscape(key));
-            }
-
-            Object value = request.getValue();
-            log.info("Admin updating single setting: {} = {}", key, value);
-            GeneralUtils.saveKeyToSettings(key, value);
-
-            // Track this as a pending change
-            pendingChanges.put(key, value);
-
-            String escapedKey = HtmlUtils.htmlEscape(key);
-            return ResponseEntity.ok(
-                    String.format(
-                            "Successfully updated setting '%s'. Changes will take effect on application restart.",
-                            escapedKey));
-
-        } catch (IOException e) {
-            log.error("Failed to save setting to file: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(GENERIC_FILE_ERROR);
-        } catch (IllegalArgumentException e) {
-            log.error("Invalid setting key or value: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(GENERIC_INVALID_SETTING);
-        } catch (Exception e) {
-            log.error("Unexpected error while updating setting: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(GENERIC_SERVER_ERROR);
-        }
-    }
-
-    private Object getSectionData(String sectionName) {
-        if (sectionName == null || sectionName.trim().isEmpty()) {
-            return null;
-        }
-
-        return switch (sectionName.toLowerCase()) {
-            case "security" -> applicationProperties.getSecurity();
-            case "system" -> applicationProperties.getSystem();
-            case "ui" -> applicationProperties.getUi();
-            case "endpoints" -> applicationProperties.getEndpoints();
-            case "metrics" -> applicationProperties.getMetrics();
-            case "mail" -> applicationProperties.getMail();
-            case "premium" -> applicationProperties.getPremium();
-            case "processexecutor", "processExecutor" -> applicationProperties.getProcessExecutor();
-            case "autopipeline", "autoPipeline" -> applicationProperties.getAutoPipeline();
-            case "legal" -> applicationProperties.getLegal();
-            default -> null;
-        };
-    }
-
-    private boolean isValidSectionName(String sectionName) {
-        return getSectionData(sectionName) != null;
-    }
-
-    private static final java.util.Set<String> VALID_SECTION_NAMES =
-            java.util.Set.of(
-                    "security",
-                    "system",
-                    "ui",
-                    "endpoints",
-                    "metrics",
-                    "mail",
-                    "premium",
-                    "processExecutor",
-                    "processexecutor",
-                    "autoPipeline",
-                    "autopipeline",
-                    "legal");
-
-    // Pattern to validate safe property paths - only alphanumeric, dots, and underscores
-    private static final Pattern SAFE_KEY_PATTERN = Pattern.compile("^[a-zA-Z0-9._]+$");
-    private static final int MAX_NESTING_DEPTH = 10;
-
-    // Security: Generic error messages to prevent information disclosure
-    private static final String GENERIC_INVALID_SETTING = "Invalid setting key or value.";
-    private static final String GENERIC_INVALID_SECTION = "Invalid section data provided.";
-    private static final String GENERIC_SERVER_ERROR = "Internal server error occurred.";
-    private static final String GENERIC_FILE_ERROR =
-            "Failed to save settings to configuration file.";
-
-    private boolean isValidSettingKey(String key) {
-        if (key == null || key.trim().isEmpty()) {
-            return false;
-        }
-
-        // Check against pattern to prevent injection attacks
-        if (!SAFE_KEY_PATTERN.matcher(key).matches()) {
-            return false;
-        }
-
-        // Prevent excessive nesting depth
-        String[] parts = key.split("\\.");
-        if (parts.length > MAX_NESTING_DEPTH) {
-            return false;
-        }
-
-        // Ensure first part is a valid section name
-        if (parts.length > 0 && !VALID_SECTION_NAMES.contains(parts[0].toLowerCase())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private Object getSettingByKey(String key) {
-        if (key == null || key.trim().isEmpty()) {
-            return null;
-        }
-
-        String[] parts = key.split("\\.", 2);
-        if (parts.length < 2) {
-            return null;
-        }
-
-        String sectionName = parts[0];
-        String propertyPath = parts[1];
-        Object section = getSectionData(sectionName);
-
-        if (section == null) {
-            return null;
-        }
-
-        try {
-            return getNestedProperty(section, propertyPath, 0);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            log.warn("Failed to get nested property {}: {}", key, e.getMessage());
-            return null;
-        }
-    }
-
-    private Object getNestedProperty(Object obj, String propertyPath, int depth)
-            throws NoSuchFieldException, IllegalAccessException {
-        if (obj == null) {
-            return null;
-        }
-
-        // Prevent excessive recursion depth
-        if (depth > MAX_NESTING_DEPTH) {
-            throw new IllegalAccessException("Maximum nesting depth exceeded");
-        }
-
-        try {
-            // Use Jackson ObjectMapper for safer property access
-            @SuppressWarnings("unchecked")
-            Map<String, Object> objectMap = objectMapper.convertValue(obj, Map.class);
-
-            String[] parts = propertyPath.split("\\.", 2);
-            String currentProperty = parts[0];
-
-            if (!objectMap.containsKey(currentProperty)) {
-                throw new NoSuchFieldException("Property not found: " + currentProperty);
-            }
-
-            Object value = objectMap.get(currentProperty);
-
-            if (parts.length == 1) {
-                return value;
-            } else {
-                return getNestedProperty(value, parts[1], depth + 1);
-            }
-        } catch (IllegalArgumentException e) {
-            // If Jackson fails, the property doesn't exist or isn't accessible
-            throw new NoSuchFieldException("Property not accessible: " + propertyPath);
-        }
-    }
-
-    /**
-     * Recursively mask sensitive fields in settings map. Sensitive fields are replaced with a
-     * status indicator showing if they're configured.
-     */
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> maskSensitiveFields(Map<String, Object> settings) {
-        return maskSensitiveFieldsWithPath(settings, "");
-    }
-
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> maskSensitiveFieldsWithPath(
-            Map<String, Object> settings, String path) {
-        Map<String, Object> masked = new HashMap<>();
-
-        for (Map.Entry<String, Object> entry : settings.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-            String currentPath = path.isEmpty() ? key : path + "." + key;
-
-            if (value instanceof Map) {
-                // Recursively mask nested objects
-                masked.put(
-                        key, maskSensitiveFieldsWithPath((Map<String, Object>) value, currentPath));
-            } else if (isSensitiveFieldWithPath(key, currentPath)) {
-                // Mask sensitive fields with status indicator
-                masked.put(key, createMaskedValue(value));
-            } else {
-                // Keep non-sensitive fields as-is
-                masked.put(key, value);
-            }
-        }
-
-        return masked;
-    }
-
-    /** Check if a field name indicates sensitive data with full path context */
-    private boolean isSensitiveFieldWithPath(String fieldName, String fullPath) {
-        String lowerField = fieldName.toLowerCase();
-        String lowerPath = fullPath.toLowerCase();
-
-        // Don't mask premium.key specifically
-        if ("key".equals(lowerField) && "premium.key".equals(lowerPath)) {
-            return false;
-        }
-
-        // Direct match with sensitive field names
-        if (SENSITIVE_FIELD_NAMES.contains(lowerField)) {
-            return true;
-        }
-
-        // Check for fields containing 'password' or 'secret'
-        return lowerField.contains("password") || lowerField.contains("secret");
-    }
-
-    /** Create a masked representation for sensitive fields */
-    private Object createMaskedValue(Object originalValue) {
-        if (originalValue == null
-                || (originalValue instanceof String && ((String) originalValue).trim().isEmpty())) {
-            return originalValue; // Keep empty/null values as-is
-        } else {
-            return "********";
-        }
-    }
-
-    /** Merge pending changes into the settings map using dot notation keys */
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> mergePendingChanges(
-            Map<String, Object> settings, Map<String, Object> pendingChanges) {
-        // Create a deep copy of the settings to avoid modifying the original
-        Map<String, Object> mergedSettings = new HashMap<>(settings);
-
-        for (Map.Entry<String, Object> pendingEntry : pendingChanges.entrySet()) {
-            String dotNotationKey = pendingEntry.getKey();
-            Object pendingValue = pendingEntry.getValue();
-
-            // Split the dot notation key into parts
-            String[] keyParts = dotNotationKey.split("\\.");
-
-            // Navigate to the parent object and set the value
-            Map<String, Object> currentMap = mergedSettings;
-
-            // Navigate through all parts except the last one
-            for (int i = 0; i < keyParts.length - 1; i++) {
-                String keyPart = keyParts[i];
-
-                // Get or create the nested map
-                Object nested = currentMap.get(keyPart);
-                if (!(nested instanceof Map)) {
-                    // Create a new nested map if it doesn't exist or isn't a map
-                    nested = new HashMap<String, Object>();
-                    currentMap.put(keyPart, nested);
-                }
-                currentMap = (Map<String, Object>) nested;
-            }
-
-            // Set the final value
-            String finalKey = keyParts[keyParts.length - 1];
-            currentMap.put(finalKey, pendingValue);
-        }
-
-        return mergedSettings;
-    }
-}
@@ -1,204 +0,0 @@
-package stirling.software.proprietary.security.filter;
-
-import static stirling.software.common.util.RequestUriUtils.isStaticResource;
-import static stirling.software.proprietary.security.model.AuthenticationType.*;
-import static stirling.software.proprietary.security.model.AuthenticationType.SAML2;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Map;
-import java.util.Optional;
-
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.exception.UnsupportedProviderException;
-import stirling.software.proprietary.security.model.ApiKeyAuthenticationToken;
-import stirling.software.proprietary.security.model.AuthenticationType;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.model.exception.AuthenticationFailureException;
-import stirling.software.proprietary.security.service.CustomUserDetailsService;
-import stirling.software.proprietary.security.service.JwtServiceInterface;
-import stirling.software.proprietary.security.service.UserService;
-
-@Slf4j
-public class JwtAuthenticationFilter extends OncePerRequestFilter {
-
-    private final JwtServiceInterface jwtService;
-    private final UserService userService;
-    private final CustomUserDetailsService userDetailsService;
-    private final AuthenticationEntryPoint authenticationEntryPoint;
-    private final ApplicationProperties.Security securityProperties;
-
-    public JwtAuthenticationFilter(
-            JwtServiceInterface jwtService,
-            UserService userService,
-            CustomUserDetailsService userDetailsService,
-            AuthenticationEntryPoint authenticationEntryPoint,
-            ApplicationProperties.Security securityProperties) {
-        this.jwtService = jwtService;
-        this.userService = userService;
-        this.userDetailsService = userDetailsService;
-        this.authenticationEntryPoint = authenticationEntryPoint;
-        this.securityProperties = securityProperties;
-    }
-
-    @Override
-    protected void doFilterInternal(
-            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-        if (!jwtService.isJwtEnabled()) {
-            filterChain.doFilter(request, response);
-            return;
-        }
-        if (isStaticResource(request.getContextPath(), request.getRequestURI())) {
-            filterChain.doFilter(request, response);
-            return;
-        }
-
-        if (!apiKeyExists(request, response)) {
-            String jwtToken = jwtService.extractToken(request);
-
-            if (jwtToken == null) {
-                // Any unauthenticated requests should redirect to /login
-                String requestURI = request.getRequestURI();
-                String contextPath = request.getContextPath();
-
-                if (!requestURI.startsWith(contextPath + "/login")) {
-                    response.sendRedirect("/login");
-                    return;
-                }
-            }
-
-            try {
-                jwtService.validateToken(jwtToken);
-            } catch (AuthenticationFailureException e) {
-                jwtService.clearToken(response);
-                handleAuthenticationFailure(request, response, e);
-                return;
-            }
-
-            Map<String, Object> claims = jwtService.extractClaims(jwtToken);
-            String tokenUsername = claims.get("sub").toString();
-
-            try {
-                authenticate(request, claims);
-            } catch (SQLException | UnsupportedProviderException e) {
-                log.error("Error processing user authentication for user: {}", tokenUsername, e);
-                handleAuthenticationFailure(
-                        request,
-                        response,
-                        new AuthenticationFailureException(
-                                "Error processing user authentication", e));
-                return;
-            }
-        }
-
-        filterChain.doFilter(request, response);
-    }
-
-    private boolean apiKeyExists(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-
-        if (authentication == null || !authentication.isAuthenticated()) {
-            String apiKey = request.getHeader("X-API-KEY");
-
-            if (apiKey != null && !apiKey.isBlank()) {
-                try {
-                    Optional<User> user = userService.getUserByApiKey(apiKey);
-
-                    if (user.isEmpty()) {
-                        handleAuthenticationFailure(
-                                request,
-                                response,
-                                new AuthenticationFailureException("Invalid API Key"));
-                        return false;
-                    }
-
-                    authentication =
-                            new ApiKeyAuthenticationToken(
-                                    user.get(), apiKey, user.get().getAuthorities());
-                    SecurityContextHolder.getContext().setAuthentication(authentication);
-                    return true;
-                } catch (AuthenticationException e) {
-                    handleAuthenticationFailure(
-                            request,
-                            response,
-                            new AuthenticationFailureException("Invalid API Key", e));
-                    return false;
-                }
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    private void authenticate(HttpServletRequest request, Map<String, Object> claims)
-            throws SQLException, UnsupportedProviderException {
-        String username = claims.get("sub").toString();
-
-        if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
-            processUserAuthenticationType(claims, username);
-            UserDetails userDetails = userDetailsService.loadUserByUsername(username);
-
-            if (userDetails != null) {
-                UsernamePasswordAuthenticationToken authToken =
-                        new UsernamePasswordAuthenticationToken(
-                                userDetails, null, userDetails.getAuthorities());
-
-                authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                SecurityContextHolder.getContext().setAuthentication(authToken);
-            } else {
-                throw new UsernameNotFoundException("User not found: " + username);
-            }
-        }
-    }
-
-    private void processUserAuthenticationType(Map<String, Object> claims, String username)
-            throws SQLException, UnsupportedProviderException {
-        AuthenticationType authenticationType =
-                AuthenticationType.valueOf(claims.getOrDefault("authType", WEB).toString());
-        log.debug("Processing {} login for {} user", authenticationType, username);
-
-        switch (authenticationType) {
-            case OAUTH2 -> {
-                ApplicationProperties.Security.OAUTH2 oauth2Properties =
-                        securityProperties.getOauth2();
-                userService.processSSOPostLogin(
-                        username, oauth2Properties.getAutoCreateUser(), OAUTH2);
-            }
-            case SAML2 -> {
-                ApplicationProperties.Security.SAML2 saml2Properties =
-                        securityProperties.getSaml2();
-                userService.processSSOPostLogin(
-                        username, saml2Properties.getAutoCreateUser(), SAML2);
-            }
-        }
-    }
-
-    private void handleAuthenticationFailure(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            AuthenticationException authException)
-            throws IOException, ServletException {
-        authenticationEntryPoint.commence(request, response, authException);
-    }
-}
@@ -1,33 +0,0 @@
-package stirling.software.proprietary.security.model;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@ToString(onlyExplicitlyIncluded = true)
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class JwtVerificationKey implements Serializable {
-
-    @Serial private static final long serialVersionUID = 1L;
-
-    @ToString.Include private String keyId;
-
-    private String verifyingKey;
-
-    @ToString.Include private LocalDateTime createdAt;
-
-    public JwtVerificationKey(String keyId, String verifyingKey) {
-        this.keyId = keyId;
-        this.verifyingKey = verifyingKey;
-        this.createdAt = LocalDateTime.now();
-    }
-}
@@ -1,22 +0,0 @@
-package stirling.software.proprietary.security.model.api.admin;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(description = "Response containing a setting key and its current value")
-public class SettingValueResponse {
-
-    @Schema(
-            description = "The setting key in dot notation (e.g., 'system.enableAnalytics')",
-            example = "system.enableAnalytics")
-    private String key;
-
-    @Schema(description = "The current value of the setting", example = "true")
-    private Object value;
-}
@@ -1,16 +0,0 @@
-package stirling.software.proprietary.security.model.api.admin;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import jakarta.validation.constraints.NotNull;
-
-import lombok.Data;
-
-@Data
-@Schema(description = "Request to update a single setting value")
-public class UpdateSettingValueRequest {
-
-    @NotNull
-    @Schema(description = "The new value for the setting", example = "false")
-    private Object value;
-}
@@ -1,23 +0,0 @@
-package stirling.software.proprietary.security.model.api.admin;
-
-import java.util.Map;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-
-import lombok.Data;
-
-@Data
-@Schema(description = "Request to update multiple application settings using delta updates")
-public class UpdateSettingsRequest {
-
-    @NotNull
-    @NotEmpty
-    @Schema(
-            description =
-                    "Map of setting keys to their new values using dot notation. Only changed values need to be included for delta updates.",
-            example = "{\"system.enableAnalytics\": false, \"ui.appName\": \"My PDF Tool\"}")
-    private Map<String, Object> settings;
-}
@@ -1,13 +0,0 @@
-package stirling.software.proprietary.security.model.exception;
-
-import org.springframework.security.core.AuthenticationException;
-
-public class AuthenticationFailureException extends AuthenticationException {
-    public AuthenticationFailureException(String message) {
-        super(message);
-    }
-
-    public AuthenticationFailureException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
@@ -1,135 +0,0 @@
-package stirling.software.proprietary.security.saml2;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.security.saml2.provider.service.authentication.Saml2PostAuthenticationRequest;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.proprietary.security.service.JwtServiceInterface;
-
-@Slf4j
-public class JwtSaml2AuthenticationRequestRepository
-        implements Saml2AuthenticationRequestRepository<Saml2PostAuthenticationRequest> {
-    private final Map<String, String> tokenStore;
-    private final JwtServiceInterface jwtService;
-    private final RelyingPartyRegistrationRepository relyingPartyRegistrationRepository;
-
-    private static final String SAML_REQUEST_TOKEN = "stirling_saml_request_token";
-
-    public JwtSaml2AuthenticationRequestRepository(
-            Map<String, String> tokenStore,
-            JwtServiceInterface jwtService,
-            RelyingPartyRegistrationRepository relyingPartyRegistrationRepository) {
-        this.tokenStore = tokenStore;
-        this.jwtService = jwtService;
-        this.relyingPartyRegistrationRepository = relyingPartyRegistrationRepository;
-    }
-
-    @Override
-    public void saveAuthenticationRequest(
-            Saml2PostAuthenticationRequest authRequest,
-            HttpServletRequest request,
-            HttpServletResponse response) {
-        if (!jwtService.isJwtEnabled()) {
-            log.debug("V2 is not enabled, skipping SAMLRequest token storage");
-            return;
-        }
-
-        if (authRequest == null) {
-            removeAuthenticationRequest(request, response);
-            return;
-        }
-
-        Map<String, Object> claims = serializeSamlRequest(authRequest);
-        String token = jwtService.generateToken("", claims);
-        String relayState = authRequest.getRelayState();
-
-        tokenStore.put(relayState, token);
-        request.setAttribute(SAML_REQUEST_TOKEN, relayState);
-        response.addHeader(SAML_REQUEST_TOKEN, relayState);
-
-        log.debug("Saved SAMLRequest token with RelayState: {}", relayState);
-    }
-
-    @Override
-    public Saml2PostAuthenticationRequest loadAuthenticationRequest(HttpServletRequest request) {
-        String token = extractTokenFromStore(request);
-
-        if (token == null) {
-            log.debug("No SAMLResponse token found in RelayState");
-            return null;
-        }
-
-        Map<String, Object> claims = jwtService.extractClaims(token);
-        return deserializeSamlRequest(claims);
-    }
-
-    @Override
-    public Saml2PostAuthenticationRequest removeAuthenticationRequest(
-            HttpServletRequest request, HttpServletResponse response) {
-        Saml2PostAuthenticationRequest authRequest = loadAuthenticationRequest(request);
-
-        String relayStateId = request.getParameter("RelayState");
-        if (relayStateId != null) {
-            tokenStore.remove(relayStateId);
-            log.debug("Removed SAMLRequest token for RelayState ID: {}", relayStateId);
-        }
-
-        return authRequest;
-    }
-
-    private String extractTokenFromStore(HttpServletRequest request) {
-        String authnRequestId = request.getParameter("RelayState");
-
-        if (authnRequestId != null && !authnRequestId.isEmpty()) {
-            String token = tokenStore.get(authnRequestId);
-
-            if (token != null) {
-                tokenStore.remove(authnRequestId);
-                log.debug("Retrieved SAMLRequest token for RelayState ID: {}", authnRequestId);
-                return token;
-            } else {
-                log.warn("No SAMLRequest token found for RelayState ID: {}", authnRequestId);
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Object> serializeSamlRequest(Saml2PostAuthenticationRequest authRequest) {
-        Map<String, Object> claims = new HashMap<>();
-
-        claims.put("id", authRequest.getId());
-        claims.put("relyingPartyRegistrationId", authRequest.getRelyingPartyRegistrationId());
-        claims.put("authenticationRequestUri", authRequest.getAuthenticationRequestUri());
-        claims.put("samlRequest", authRequest.getSamlRequest());
-        claims.put("relayState", authRequest.getRelayState());
-
-        return claims;
-    }
-
-    private Saml2PostAuthenticationRequest deserializeSamlRequest(Map<String, Object> claims) {
-        String relyingPartyRegistrationId = (String) claims.get("relyingPartyRegistrationId");
-        RelyingPartyRegistration relyingPartyRegistration =
-                relyingPartyRegistrationRepository.findByRegistrationId(relyingPartyRegistrationId);
-
-        if (relyingPartyRegistration == null) {
-            return null;
-        }
-
-        return Saml2PostAuthenticationRequest.withRelyingPartyRegistration(relyingPartyRegistration)
-                .id((String) claims.get("id"))
-                .authenticationRequestUri((String) claims.get("authenticationRequestUri"))
-                .samlRequest((String) claims.get("samlRequest"))
-                .relayState((String) claims.get("relayState"))
-                .build();
-    }
-}
@@ -1,330 +0,0 @@
-package stirling.software.proprietary.security.service;
-
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseCookie;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.stereotype.Service;
-
-import io.github.pixee.security.Newlines;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.UnsupportedJwtException;
-import io.jsonwebtoken.security.SignatureException;
-
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.proprietary.security.model.JwtVerificationKey;
-import stirling.software.proprietary.security.model.exception.AuthenticationFailureException;
-import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-
-@Slf4j
-@Service
-public class JwtService implements JwtServiceInterface {
-
-    private static final String JWT_COOKIE_NAME = "stirling_jwt";
-    private static final String ISSUER = "Stirling PDF";
-    private static final long EXPIRATION = 3600000;
-
-    @Value("${stirling.security.jwt.secureCookie:true}")
-    private boolean secureCookie;
-
-    private final KeyPersistenceServiceInterface keyPersistenceService;
-    private final boolean v2Enabled;
-
-    @Autowired
-    public JwtService(
-            @Qualifier("v2Enabled") boolean v2Enabled,
-            KeyPersistenceServiceInterface keyPersistenceService) {
-        this.v2Enabled = v2Enabled;
-        this.keyPersistenceService = keyPersistenceService;
-    }
-
-    @Override
-    public String generateToken(Authentication authentication, Map<String, Object> claims) {
-        Object principal = authentication.getPrincipal();
-        String username = "";
-
-        if (principal instanceof UserDetails) {
-            username = ((UserDetails) principal).getUsername();
-        } else if (principal instanceof OAuth2User) {
-            username = ((OAuth2User) principal).getName();
-        } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) {
-            username = ((CustomSaml2AuthenticatedPrincipal) principal).getName();
-        }
-
-        return generateToken(username, claims);
-    }
-
-    @Override
-    public String generateToken(String username, Map<String, Object> claims) {
-        try {
-            JwtVerificationKey activeKey = keyPersistenceService.getActiveKey();
-            Optional<KeyPair> keyPairOpt = keyPersistenceService.getKeyPair(activeKey.getKeyId());
-
-            if (keyPairOpt.isEmpty()) {
-                throw new RuntimeException("Unable to retrieve key pair for active key");
-            }
-
-            KeyPair keyPair = keyPairOpt.get();
-
-            var builder =
-                    Jwts.builder()
-                            .claims(claims)
-                            .subject(username)
-                            .issuer(ISSUER)
-                            .issuedAt(new Date())
-                            .expiration(new Date(System.currentTimeMillis() + EXPIRATION))
-                            .signWith(keyPair.getPrivate(), Jwts.SIG.RS256);
-
-            String keyId = activeKey.getKeyId();
-            if (keyId != null) {
-                builder.header().keyId(keyId);
-            }
-
-            return builder.compact();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to generate token", e);
-        }
-    }
-
-    @Override
-    public void validateToken(String token) throws AuthenticationFailureException {
-        extractAllClaims(token);
-
-        if (isTokenExpired(token)) {
-            throw new AuthenticationFailureException("The token has expired");
-        }
-    }
-
-    @Override
-    public String extractUsername(String token) {
-        return extractClaim(token, Claims::getSubject);
-    }
-
-    @Override
-    public Map<String, Object> extractClaims(String token) {
-        Claims claims = extractAllClaims(token);
-        return new HashMap<>(claims);
-    }
-
-    @Override
-    public boolean isTokenExpired(String token) {
-        return extractExpiration(token).before(new Date());
-    }
-
-    private Date extractExpiration(String token) {
-        return extractClaim(token, Claims::getExpiration);
-    }
-
-    private <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
-        final Claims claims = extractAllClaims(token);
-        return claimsResolver.apply(claims);
-    }
-
-    private Claims extractAllClaims(String token) {
-        try {
-            String keyId = extractKeyId(token);
-            KeyPair keyPair;
-
-            if (keyId != null) {
-                Optional<KeyPair> specificKeyPair = keyPersistenceService.getKeyPair(keyId);
-
-                if (specificKeyPair.isPresent()) {
-                    keyPair = specificKeyPair.get();
-                } else {
-                    log.warn(
-                            "Key ID {} not found in keystore, token may have been signed with an expired key",
-                            keyId);
-
-                    if (keyId.equals(keyPersistenceService.getActiveKey().getKeyId())) {
-                        JwtVerificationKey verificationKey =
-                                keyPersistenceService.refreshActiveKeyPair();
-                        Optional<KeyPair> refreshedKeyPair =
-                                keyPersistenceService.getKeyPair(verificationKey.getKeyId());
-                        if (refreshedKeyPair.isPresent()) {
-                            keyPair = refreshedKeyPair.get();
-                        } else {
-                            throw new AuthenticationFailureException(
-                                    "Failed to retrieve refreshed key pair");
-                        }
-                    } else {
-                        // Try to use active key as fallback
-                        JwtVerificationKey activeKey = keyPersistenceService.getActiveKey();
-                        Optional<KeyPair> activeKeyPair =
-                                keyPersistenceService.getKeyPair(activeKey.getKeyId());
-                        if (activeKeyPair.isPresent()) {
-                            keyPair = activeKeyPair.get();
-                        } else {
-                            throw new AuthenticationFailureException(
-                                    "Failed to retrieve active key pair");
-                        }
-                    }
-                }
-            } else {
-                log.debug("No key ID in token header, trying all available keys");
-                // Try all available keys when no keyId is present
-                return tryAllKeys(token);
-            }
-
-            return Jwts.parser()
-                    .verifyWith(keyPair.getPublic())
-                    .build()
-                    .parseSignedClaims(token)
-                    .getPayload();
-        } catch (SignatureException e) {
-            log.warn("Invalid signature: {}", e.getMessage());
-            throw new AuthenticationFailureException("Invalid signature", e);
-        } catch (MalformedJwtException e) {
-            log.warn("Invalid token: {}", e.getMessage());
-            throw new AuthenticationFailureException("Invalid token", e);
-        } catch (ExpiredJwtException e) {
-            log.warn("The token has expired: {}", e.getMessage());
-            throw new AuthenticationFailureException("The token has expired", e);
-        } catch (UnsupportedJwtException e) {
-            log.warn("The token is unsupported: {}", e.getMessage());
-            throw new AuthenticationFailureException("The token is unsupported", e);
-        } catch (IllegalArgumentException e) {
-            log.warn("Claims are empty: {}", e.getMessage());
-            throw new AuthenticationFailureException("Claims are empty", e);
-        }
-    }
-
-    private Claims tryAllKeys(String token) throws AuthenticationFailureException {
-        // First try the active key
-        try {
-            JwtVerificationKey activeKey = keyPersistenceService.getActiveKey();
-            PublicKey publicKey =
-                    keyPersistenceService.decodePublicKey(activeKey.getVerifyingKey());
-            return Jwts.parser()
-                    .verifyWith(publicKey)
-                    .build()
-                    .parseSignedClaims(token)
-                    .getPayload();
-        } catch (SignatureException
-                | NoSuchAlgorithmException
-                | InvalidKeySpecException activeKeyException) {
-            log.debug("Active key failed, trying all available keys from cache");
-
-            // If active key fails, try all available keys from cache
-            List<JwtVerificationKey> allKeys =
-                    keyPersistenceService.getKeysEligibleForCleanup(
-                            LocalDateTime.now().plusDays(1));
-
-            for (JwtVerificationKey verificationKey : allKeys) {
-                try {
-                    PublicKey publicKey =
-                            keyPersistenceService.decodePublicKey(
-                                    verificationKey.getVerifyingKey());
-                    return Jwts.parser()
-                            .verifyWith(publicKey)
-                            .build()
-                            .parseSignedClaims(token)
-                            .getPayload();
-                } catch (SignatureException
-                        | NoSuchAlgorithmException
-                        | InvalidKeySpecException e) {
-                    log.debug(
-                            "Key {} failed to verify token, trying next key",
-                            verificationKey.getKeyId());
-                    // Continue to next key
-                }
-            }
-
-            throw new AuthenticationFailureException(
-                    "Token signature could not be verified with any available key",
-                    activeKeyException);
-        }
-    }
-
-    @Override
-    public String extractToken(HttpServletRequest request) {
-        Cookie[] cookies = request.getCookies();
-
-        if (cookies != null) {
-            for (Cookie cookie : cookies) {
-                if (JWT_COOKIE_NAME.equals(cookie.getName())) {
-                    return cookie.getValue();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public void addToken(HttpServletResponse response, String token) {
-        ResponseCookie cookie =
-                ResponseCookie.from(JWT_COOKIE_NAME, Newlines.stripAll(token))
-                        .httpOnly(true)
-                        .secure(secureCookie)
-                        .sameSite("Strict")
-                        .maxAge(EXPIRATION / 1000)
-                        .path("/")
-                        .build();
-
-        response.addHeader("Set-Cookie", cookie.toString());
-    }
-
-    @Override
-    public void clearToken(HttpServletResponse response) {
-        ResponseCookie cookie =
-                ResponseCookie.from(JWT_COOKIE_NAME, "")
-                        .httpOnly(true)
-                        .secure(secureCookie)
-                        .sameSite("None")
-                        .maxAge(0)
-                        .path("/")
-                        .build();
-
-        response.addHeader("Set-Cookie", cookie.toString());
-    }
-
-    @Override
-    public boolean isJwtEnabled() {
-        return v2Enabled;
-    }
-
-    private String extractKeyId(String token) {
-        try {
-            PublicKey signingKey =
-                    keyPersistenceService.decodePublicKey(
-                            keyPersistenceService.getActiveKey().getVerifyingKey());
-
-            String keyId =
-                    (String)
-                            Jwts.parser()
-                                    .verifyWith(signingKey)
-                                    .build()
-                                    .parse(token)
-                                    .getHeader()
-                                    .get("kid");
-            log.debug("Extracted key ID from token: {}", keyId);
-            return keyId;
-        } catch (Exception e) {
-            log.warn("Failed to extract key ID from token header: {}", e.getMessage());
-            return null;
-        }
-    }
-}
@@ -1,90 +0,0 @@
-package stirling.software.proprietary.security.service;
-
-import java.util.Map;
-
-import org.springframework.security.core.Authentication;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-public interface JwtServiceInterface {
-
-    /**
-     * Generate a JWT token for the authenticated user
-     *
-     * @param authentication Spring Security authentication object
-     * @return JWT token as a string
-     */
-    String generateToken(Authentication authentication, Map<String, Object> claims);
-
-    /**
-     * Generate a JWT token for a specific username
-     *
-     * @param username the username for which to generate the token
-     * @param claims additional claims to include in the token
-     * @return JWT token as a string
-     */
-    String generateToken(String username, Map<String, Object> claims);
-
-    /**
-     * Validate a JWT token
-     *
-     * @param token the JWT token to validate
-     * @return true if token is valid, false otherwise
-     */
-    void validateToken(String token);
-
-    /**
-     * Extract username from JWT token
-     *
-     * @param token the JWT token
-     * @return username extracted from token
-     */
-    String extractUsername(String token);
-
-    /**
-     * Extract all claims from JWT token
-     *
-     * @param token the JWT token
-     * @return map of claims
-     */
-    Map<String, Object> extractClaims(String token);
-
-    /**
-     * Check if token is expired
-     *
-     * @param token the JWT token
-     * @return true if token is expired, false otherwise
-     */
-    boolean isTokenExpired(String token);
-
-    /**
-     * Extract JWT token from HTTP request (header or cookie)
-     *
-     * @param request HTTP servlet request
-     * @return JWT token if found, null otherwise
-     */
-    String extractToken(HttpServletRequest request);
-
-    /**
-     * Add JWT token to HTTP response (header and cookie)
-     *
-     * @param response HTTP servlet response
-     * @param token JWT token to add
-     */
-    void addToken(HttpServletResponse response, String token);
-
-    /**
-     * Clear JWT token from HTTP response (remove cookie)
-     *
-     * @param response HTTP servlet response
-     */
-    void clearToken(HttpServletResponse response);
-
-    /**
-     * Check if JWT authentication is enabled
-     *
-     * @return true if JWT is enabled, false otherwise
-     */
-    boolean isJwtEnabled();
-}
@@ -1,88 +0,0 @@
-package stirling.software.proprietary.security.service;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.configuration.InstallationPathConfig;
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.model.JwtVerificationKey;
-
-@Slf4j
-@Service
-@ConditionalOnBooleanProperty("v2")
-public class KeyPairCleanupService {
-
-    private final KeyPersistenceService keyPersistenceService;
-    private final ApplicationProperties.Security.Jwt jwtProperties;
-
-    @Autowired
-    public KeyPairCleanupService(
-            KeyPersistenceService keyPersistenceService,
-            ApplicationProperties applicationProperties) {
-        this.keyPersistenceService = keyPersistenceService;
-        this.jwtProperties = applicationProperties.getSecurity().getJwt();
-    }
-
-    @Transactional
-    @PostConstruct
-    @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.DAYS)
-    public void cleanup() {
-        if (!jwtProperties.isEnableKeyCleanup() || !keyPersistenceService.isKeystoreEnabled()) {
-            return;
-        }
-
-        LocalDateTime cutoffDate =
-                LocalDateTime.now().minusDays(jwtProperties.getKeyRetentionDays());
-
-        List<JwtVerificationKey> eligibleKeys =
-                keyPersistenceService.getKeysEligibleForCleanup(cutoffDate);
-        if (eligibleKeys.isEmpty()) {
-            return;
-        }
-
-        log.info("Removing keys older than retention period");
-        removeKeys(eligibleKeys);
-        keyPersistenceService.refreshActiveKeyPair();
-    }
-
-    private void removeKeys(List<JwtVerificationKey> keys) {
-        keys.forEach(
-                key -> {
-                    try {
-                        keyPersistenceService.removeKey(key.getKeyId());
-                        removePrivateKey(key.getKeyId());
-                    } catch (IOException e) {
-                        log.warn("Failed to remove key: {}", key.getKeyId(), e);
-                    }
-                });
-    }
-
-    private void removePrivateKey(String keyId) throws IOException {
-        if (!keyPersistenceService.isKeystoreEnabled()) {
-            return;
-        }
-
-        Path privateKeyDirectory = Paths.get(InstallationPathConfig.getPrivateKeyPath());
-        Path keyFile = privateKeyDirectory.resolve(keyId + KeyPersistenceService.KEY_SUFFIX);
-
-        if (Files.exists(keyFile)) {
-            Files.delete(keyFile);
-            log.debug("Deleted private key: {}", keyFile);
-        }
-    }
-}
@@ -1,243 +0,0 @@
-package stirling.software.proprietary.security.service;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Base64;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.configuration.InstallationPathConfig;
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.model.JwtVerificationKey;
-
-@Slf4j
-@Service
-public class KeyPersistenceService implements KeyPersistenceServiceInterface {
-
-    public static final String KEY_SUFFIX = ".key";
-
-    private final ApplicationProperties.Security.Jwt jwtProperties;
-    private final CacheManager cacheManager;
-    private final Cache verifyingKeyCache;
-
-    private volatile JwtVerificationKey activeKey;
-
-    @Autowired
-    public KeyPersistenceService(
-            ApplicationProperties applicationProperties, CacheManager cacheManager) {
-        this.jwtProperties = applicationProperties.getSecurity().getJwt();
-        this.cacheManager = cacheManager;
-        this.verifyingKeyCache = cacheManager.getCache("verifyingKeys");
-    }
-
-    @PostConstruct
-    public void initializeKeystore() {
-        if (!isKeystoreEnabled()) {
-            return;
-        }
-
-        try {
-            ensurePrivateKeyDirectoryExists();
-            loadKeyPair();
-        } catch (Exception e) {
-            log.error("Failed to initialize keystore, using in-memory generation", e);
-        }
-    }
-
-    private void loadKeyPair() {
-        if (activeKey == null) {
-            generateAndStoreKeypair();
-        }
-    }
-
-    @Transactional
-    private JwtVerificationKey generateAndStoreKeypair() {
-        JwtVerificationKey verifyingKey = null;
-
-        try {
-            KeyPair keyPair = generateRSAKeypair();
-            String keyId = generateKeyId();
-
-            storePrivateKey(keyId, keyPair.getPrivate());
-            verifyingKey = new JwtVerificationKey(keyId, encodePublicKey(keyPair.getPublic()));
-            verifyingKeyCache.put(keyId, verifyingKey);
-            activeKey = verifyingKey;
-        } catch (IOException e) {
-            log.error("Failed to generate and store keypair", e);
-        }
-
-        return verifyingKey;
-    }
-
-    @Override
-    public JwtVerificationKey getActiveKey() {
-        if (activeKey == null) {
-            return generateAndStoreKeypair();
-        }
-        return activeKey;
-    }
-
-    @Override
-    public Optional<KeyPair> getKeyPair(String keyId) {
-        if (!isKeystoreEnabled()) {
-            return Optional.empty();
-        }
-
-        try {
-            JwtVerificationKey verifyingKey =
-                    verifyingKeyCache.get(keyId, JwtVerificationKey.class);
-
-            if (verifyingKey == null) {
-                log.warn("No signing key found in database for keyId: {}", keyId);
-                return Optional.empty();
-            }
-
-            PrivateKey privateKey = loadPrivateKey(keyId);
-            PublicKey publicKey = decodePublicKey(verifyingKey.getVerifyingKey());
-
-            return Optional.of(new KeyPair(publicKey, privateKey));
-        } catch (Exception e) {
-            log.error("Failed to load keypair for keyId: {}", keyId, e);
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    public boolean isKeystoreEnabled() {
-        return jwtProperties.isEnableKeystore();
-    }
-
-    @Override
-    public JwtVerificationKey refreshActiveKeyPair() {
-        return generateAndStoreKeypair();
-    }
-
-    @Override
-    @CacheEvict(
-            value = {"verifyingKeys"},
-            key = "#keyId",
-            condition = "#root.target.isKeystoreEnabled()")
-    public void removeKey(String keyId) {
-        verifyingKeyCache.evict(keyId);
-    }
-
-    @Override
-    public List<JwtVerificationKey> getKeysEligibleForCleanup(LocalDateTime cutoffDate) {
-        CaffeineCache caffeineCache = (CaffeineCache) verifyingKeyCache;
-        com.github.benmanes.caffeine.cache.Cache<Object, Object> nativeCache =
-                caffeineCache.getNativeCache();
-
-        log.debug(
-                "Cache size: {}, Checking {} keys for cleanup",
-                nativeCache.estimatedSize(),
-                nativeCache.asMap().size());
-
-        return nativeCache.asMap().values().stream()
-                .filter(value -> value instanceof JwtVerificationKey)
-                .map(value -> (JwtVerificationKey) value)
-                .filter(
-                        key -> {
-                            boolean eligible = key.getCreatedAt().isBefore(cutoffDate);
-                            log.debug(
-                                    "Key {} created at {}, eligible for cleanup: {}",
-                                    key.getKeyId(),
-                                    key.getCreatedAt(),
-                                    eligible);
-                            return eligible;
-                        })
-                .collect(Collectors.toList());
-    }
-
-    private String generateKeyId() {
-        return "jwt-key-"
-                + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss"));
-    }
-
-    private KeyPair generateRSAKeypair() {
-        KeyPairGenerator keyPairGenerator = null;
-
-        try {
-            keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-            keyPairGenerator.initialize(2048);
-        } catch (NoSuchAlgorithmException e) {
-            log.error("Failed to initialize RSA key pair generator", e);
-        }
-
-        return keyPairGenerator.generateKeyPair();
-    }
-
-    private void ensurePrivateKeyDirectoryExists() throws IOException {
-        Path keyPath = Paths.get(InstallationPathConfig.getPrivateKeyPath());
-
-        if (!Files.exists(keyPath)) {
-            Files.createDirectories(keyPath);
-        }
-    }
-
-    private void storePrivateKey(String keyId, PrivateKey privateKey) throws IOException {
-        Path keyFile =
-                Paths.get(InstallationPathConfig.getPrivateKeyPath()).resolve(keyId + KEY_SUFFIX);
-        String encodedKey = Base64.getEncoder().encodeToString(privateKey.getEncoded());
-        Files.writeString(keyFile, encodedKey);
-
-        // Set read/write to only the owner
-        keyFile.toFile().setReadable(true, true);
-        keyFile.toFile().setWritable(true, true);
-        keyFile.toFile().setExecutable(false, false);
-    }
-
-    private PrivateKey loadPrivateKey(String keyId)
-            throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
-        Path keyFile =
-                Paths.get(InstallationPathConfig.getPrivateKeyPath()).resolve(keyId + KEY_SUFFIX);
-
-        if (!Files.exists(keyFile)) {
-            throw new IOException("Private key not found: " + keyFile);
-        }
-
-        String encodedKey = Files.readString(keyFile);
-        byte[] keyBytes = Base64.getDecoder().decode(encodedKey);
-        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
-        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-
-        return keyFactory.generatePrivate(keySpec);
-    }
-
-    private String encodePublicKey(PublicKey publicKey) {
-        return Base64.getEncoder().encodeToString(publicKey.getEncoded());
-    }
-
-    public PublicKey decodePublicKey(String encodedKey)
-            throws NoSuchAlgorithmException, InvalidKeySpecException {
-        byte[] keyBytes = Base64.getDecoder().decode(encodedKey);
-        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
-        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-        return keyFactory.generatePublic(keySpec);
-    }
-}
@@ -1,29 +0,0 @@
-package stirling.software.proprietary.security.service;
-
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
-import stirling.software.proprietary.security.model.JwtVerificationKey;
-
-public interface KeyPersistenceServiceInterface {
-
-    JwtVerificationKey getActiveKey();
-
-    Optional<KeyPair> getKeyPair(String keyId);
-
-    boolean isKeystoreEnabled();
-
-    JwtVerificationKey refreshActiveKeyPair();
-
-    List<JwtVerificationKey> getKeysEligibleForCleanup(LocalDateTime cutoffDate);
-
-    void removeKey(String keyId);
-
-    PublicKey decodePublicKey(String encodedKey)
-            throws NoSuchAlgorithmException, InvalidKeySpecException;
-}
@@ -1,38 +0,0 @@
-package stirling.software.proprietary.security;
-
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import stirling.software.proprietary.security.model.exception.AuthenticationFailureException;
-
-@ExtendWith(MockitoExtension.class)
-class JwtAuthenticationEntryPointTest {
-
-    @Mock private HttpServletRequest request;
-
-    @Mock private HttpServletResponse response;
-
-    @Mock private AuthenticationFailureException authException;
-
-    @InjectMocks private JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
-
-    @Test
-    void testCommence() throws IOException {
-        String errorMessage = "Authentication failed";
-        when(authException.getMessage()).thenReturn(errorMessage);
-
-        jwtAuthenticationEntryPoint.commence(request, response, authException);
-
-        verify(response).sendError(HttpServletResponse.SC_UNAUTHORIZED, errorMessage);
-    }
-}
@@ -1,242 +0,0 @@
-package stirling.software.proprietary.security.filter;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.proprietary.security.model.exception.AuthenticationFailureException;
-import stirling.software.proprietary.security.service.CustomUserDetailsService;
-import stirling.software.proprietary.security.service.JwtServiceInterface;
-import stirling.software.proprietary.security.service.UserService;
-
-@Disabled
-@ExtendWith(MockitoExtension.class)
-class JwtAuthenticationFilterTest {
-
-    @Mock private JwtServiceInterface jwtService;
-
-    @Mock private CustomUserDetailsService userDetailsService;
-
-    @Mock private UserService userService;
-
-    @Mock private ApplicationProperties.Security securityProperties;
-
-    @Mock private HttpServletRequest request;
-
-    @Mock private HttpServletResponse response;
-
-    @Mock private FilterChain filterChain;
-
-    @Mock private UserDetails userDetails;
-
-    @Mock private SecurityContext securityContext;
-
-    @Mock private AuthenticationEntryPoint authenticationEntryPoint;
-
-    @InjectMocks private JwtAuthenticationFilter jwtAuthenticationFilter;
-
-    @Test
-    void shouldNotAuthenticateWhenJwtDisabled() throws ServletException, IOException {
-        when(jwtService.isJwtEnabled()).thenReturn(false);
-
-        jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-        verify(filterChain).doFilter(request, response);
-        verify(jwtService, never()).extractToken(any());
-    }
-
-    @Test
-    void shouldNotFilterWhenPageIsLogin() throws ServletException, IOException {
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getRequestURI()).thenReturn("/login");
-        when(request.getContextPath()).thenReturn("/login");
-
-        jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-        verify(filterChain, never()).doFilter(request, response);
-    }
-
-    @Test
-    void testDoFilterInternal() throws ServletException, IOException {
-        String token = "valid-jwt-token";
-        String newToken = "new-jwt-token";
-        String username = "testuser";
-        Map<String, Object> claims = Map.of("sub", username, "authType", "WEB");
-
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getContextPath()).thenReturn("/");
-        when(request.getRequestURI()).thenReturn("/protected");
-        when(jwtService.extractToken(request)).thenReturn(token);
-        doNothing().when(jwtService).validateToken(token);
-        when(jwtService.extractClaims(token)).thenReturn(claims);
-        when(userDetails.getAuthorities()).thenReturn(Collections.emptyList());
-        when(userDetailsService.loadUserByUsername(username)).thenReturn(userDetails);
-
-        try (MockedStatic<SecurityContextHolder> mockedSecurityContextHolder =
-                mockStatic(SecurityContextHolder.class)) {
-            UsernamePasswordAuthenticationToken authToken =
-                    new UsernamePasswordAuthenticationToken(
-                            userDetails, null, userDetails.getAuthorities());
-
-            when(securityContext.getAuthentication()).thenReturn(null).thenReturn(authToken);
-            mockedSecurityContextHolder
-                    .when(SecurityContextHolder::getContext)
-                    .thenReturn(securityContext);
-            when(jwtService.generateToken(
-                            any(UsernamePasswordAuthenticationToken.class), eq(claims)))
-                    .thenReturn(newToken);
-
-            jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-            verify(jwtService).validateToken(token);
-            verify(jwtService).extractClaims(token);
-            verify(userDetailsService).loadUserByUsername(username);
-            verify(securityContext)
-                    .setAuthentication(any(UsernamePasswordAuthenticationToken.class));
-            verify(jwtService)
-                    .generateToken(any(UsernamePasswordAuthenticationToken.class), eq(claims));
-            verify(jwtService).addToken(response, newToken);
-            verify(filterChain).doFilter(request, response);
-        }
-    }
-
-    @Test
-    void testDoFilterInternalWithMissingTokenForRootPath() throws ServletException, IOException {
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getRequestURI()).thenReturn("/");
-        when(request.getMethod()).thenReturn("GET");
-        when(jwtService.extractToken(request)).thenReturn(null);
-
-        jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-        verify(response).sendRedirect("/login");
-        verify(filterChain, never()).doFilter(request, response);
-    }
-
-    @Test
-    void validationFailsWithInvalidToken() throws ServletException, IOException {
-        String token = "invalid-jwt-token";
-
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getRequestURI()).thenReturn("/protected");
-        when(request.getContextPath()).thenReturn("/");
-        when(jwtService.extractToken(request)).thenReturn(token);
-        doThrow(new AuthenticationFailureException("Invalid token"))
-                .when(jwtService)
-                .validateToken(token);
-
-        jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-        verify(jwtService).validateToken(token);
-        verify(authenticationEntryPoint)
-                .commence(eq(request), eq(response), any(AuthenticationFailureException.class));
-        verify(filterChain, never()).doFilter(request, response);
-    }
-
-    @Test
-    void validationFailsWithExpiredToken() throws ServletException, IOException {
-        String token = "expired-jwt-token";
-
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getRequestURI()).thenReturn("/protected");
-        when(request.getContextPath()).thenReturn("/");
-        when(jwtService.extractToken(request)).thenReturn(token);
-        doThrow(new AuthenticationFailureException("The token has expired"))
-                .when(jwtService)
-                .validateToken(token);
-
-        jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-        verify(jwtService).validateToken(token);
-        verify(authenticationEntryPoint).commence(eq(request), eq(response), any());
-        verify(filterChain, never()).doFilter(request, response);
-    }
-
-    @Test
-    void exceptionThrown_WhenUserNotFound() throws ServletException, IOException {
-        String token = "valid-jwt-token";
-        String username = "nonexistentuser";
-        Map<String, Object> claims = Map.of("sub", username, "authType", "WEB");
-
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getRequestURI()).thenReturn("/protected");
-        when(request.getContextPath()).thenReturn("/");
-        when(jwtService.extractToken(request)).thenReturn(token);
-        doNothing().when(jwtService).validateToken(token);
-        when(jwtService.extractClaims(token)).thenReturn(claims);
-        when(userDetailsService.loadUserByUsername(username)).thenReturn(null);
-
-        try (MockedStatic<SecurityContextHolder> mockedSecurityContextHolder =
-                mockStatic(SecurityContextHolder.class)) {
-            when(securityContext.getAuthentication()).thenReturn(null);
-            mockedSecurityContextHolder
-                    .when(SecurityContextHolder::getContext)
-                    .thenReturn(securityContext);
-
-            UsernameNotFoundException result =
-                    assertThrows(
-                            UsernameNotFoundException.class,
-                            () ->
-                                    jwtAuthenticationFilter.doFilterInternal(
-                                            request, response, filterChain));
-
-            assertEquals("User not found: " + username, result.getMessage());
-            verify(userDetailsService).loadUserByUsername(username);
-            verify(filterChain, never()).doFilter(request, response);
-        }
-    }
-
-    @Test
-    void testAuthenticationEntryPointCalledWithCorrectException()
-            throws ServletException, IOException {
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(request.getRequestURI()).thenReturn("/protected");
-        when(request.getContextPath()).thenReturn("/");
-        when(jwtService.extractToken(request)).thenReturn(null);
-
-        jwtAuthenticationFilter.doFilterInternal(request, response, filterChain);
-
-        verify(authenticationEntryPoint)
-                .commence(
-                        eq(request),
-                        eq(response),
-                        argThat(
-                                exception ->
-                                        exception
-                                                .getMessage()
-                                                .equals("JWT is missing from the request")));
-        verify(filterChain, never()).doFilter(request, response);
-    }
-}
@@ -1,247 +0,0 @@
-package stirling.software.proprietary.security.saml2;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.NullAndEmptySource;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.saml2.provider.service.authentication.Saml2PostAuthenticationRequest;
-import org.springframework.security.saml2.provider.service.registration.AssertingPartyMetadata;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import stirling.software.proprietary.security.service.JwtServiceInterface;
-
-@ExtendWith(MockitoExtension.class)
-class JwtSaml2AuthenticationRequestRepositoryTest {
-
-    private static final String SAML_REQUEST_TOKEN = "stirling_saml_request_token";
-
-    private Map<String, String> tokenStore;
-
-    @Mock private JwtServiceInterface jwtService;
-
-    @Mock private RelyingPartyRegistrationRepository relyingPartyRegistrationRepository;
-
-    private JwtSaml2AuthenticationRequestRepository jwtSaml2AuthenticationRequestRepository;
-
-    @BeforeEach
-    void setUp() {
-        tokenStore = new ConcurrentHashMap<>();
-        jwtSaml2AuthenticationRequestRepository =
-                new JwtSaml2AuthenticationRequestRepository(
-                        tokenStore, jwtService, relyingPartyRegistrationRepository);
-    }
-
-    @Test
-    void saveAuthenticationRequest() {
-        var authRequest = mock(Saml2PostAuthenticationRequest.class);
-        var request = mock(MockHttpServletRequest.class);
-        var response = mock(MockHttpServletResponse.class);
-        String token = "testToken";
-        String id = "testId";
-        String relayState = "testRelayState";
-        String authnRequestUri = "example.com/authnRequest";
-        Map<String, Object> claims = Map.of();
-        String samlRequest = "testSamlRequest";
-        String relyingPartyRegistrationId = "stirling-pdf";
-
-        when(jwtService.isJwtEnabled()).thenReturn(true);
-        when(authRequest.getRelayState()).thenReturn(relayState);
-        when(authRequest.getId()).thenReturn(id);
-        when(authRequest.getAuthenticationRequestUri()).thenReturn(authnRequestUri);
-        when(authRequest.getSamlRequest()).thenReturn(samlRequest);
-        when(authRequest.getRelyingPartyRegistrationId()).thenReturn(relyingPartyRegistrationId);
-        when(jwtService.generateToken(eq(""), anyMap())).thenReturn(token);
-
-        jwtSaml2AuthenticationRequestRepository.saveAuthenticationRequest(
-                authRequest, request, response);
-
-        verify(request).setAttribute(SAML_REQUEST_TOKEN, relayState);
-        verify(response).addHeader(SAML_REQUEST_TOKEN, relayState);
-    }
-
-    @Test
-    void saveAuthenticationRequestWithNullRequest() {
-        var request = mock(MockHttpServletRequest.class);
-        var response = mock(MockHttpServletResponse.class);
-
-        jwtSaml2AuthenticationRequestRepository.saveAuthenticationRequest(null, request, response);
-
-        assertTrue(tokenStore.isEmpty());
-    }
-
-    @Test
-    void loadAuthenticationRequest() {
-        var request = mock(MockHttpServletRequest.class);
-        var relyingPartyRegistration = mock(RelyingPartyRegistration.class);
-        var assertingPartyMetadata = mock(AssertingPartyMetadata.class);
-        String relayState = "testRelayState";
-        String token = "testToken";
-        Map<String, Object> claims =
-                Map.of(
-                        "id", "testId",
-                        "relyingPartyRegistrationId", "stirling-pdf",
-                        "authenticationRequestUri", "example.com/authnRequest",
-                        "samlRequest", "testSamlRequest",
-                        "relayState", relayState);
-
-        when(request.getParameter("RelayState")).thenReturn(relayState);
-        when(jwtService.extractClaims(token)).thenReturn(claims);
-        when(relyingPartyRegistrationRepository.findByRegistrationId("stirling-pdf"))
-                .thenReturn(relyingPartyRegistration);
-        when(relyingPartyRegistration.getRegistrationId()).thenReturn("stirling-pdf");
-        when(relyingPartyRegistration.getAssertingPartyMetadata())
-                .thenReturn(assertingPartyMetadata);
-        when(assertingPartyMetadata.getSingleSignOnServiceLocation())
-                .thenReturn("https://example.com/sso");
-        tokenStore.put(relayState, token);
-
-        var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request);
-
-        assertNotNull(result);
-        assertFalse(tokenStore.containsKey(relayState));
-    }
-
-    @ParameterizedTest
-    @NullAndEmptySource
-    void loadAuthenticationRequestWithInvalidRelayState(String relayState) {
-        var request = mock(MockHttpServletRequest.class);
-        when(request.getParameter("RelayState")).thenReturn(relayState);
-
-        var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request);
-
-        assertNull(result);
-    }
-
-    @Test
-    void loadAuthenticationRequestWithNonExistentToken() {
-        var request = mock(MockHttpServletRequest.class);
-        when(request.getParameter("RelayState")).thenReturn("nonExistentRelayState");
-
-        var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request);
-
-        assertNull(result);
-    }
-
-    @Test
-    void loadAuthenticationRequestWithNullRelyingPartyRegistration() {
-        var request = mock(MockHttpServletRequest.class);
-        String relayState = "testRelayState";
-        String token = "testToken";
-        Map<String, Object> claims =
-                Map.of(
-                        "id", "testId",
-                        "relyingPartyRegistrationId", "stirling-pdf",
-                        "authenticationRequestUri", "example.com/authnRequest",
-                        "samlRequest", "testSamlRequest",
-                        "relayState", relayState);
-
-        when(request.getParameter("RelayState")).thenReturn(relayState);
-        when(jwtService.extractClaims(token)).thenReturn(claims);
-        when(relyingPartyRegistrationRepository.findByRegistrationId("stirling-pdf"))
-                .thenReturn(null);
-        tokenStore.put(relayState, token);
-
-        var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request);
-
-        assertNull(result);
-    }
-
-    @Test
-    void removeAuthenticationRequest() {
-        var request = mock(HttpServletRequest.class);
-        var response = mock(HttpServletResponse.class);
-        var relyingPartyRegistration = mock(RelyingPartyRegistration.class);
-        var assertingPartyMetadata = mock(AssertingPartyMetadata.class);
-        String relayState = "testRelayState";
-        String token = "testToken";
-        Map<String, Object> claims =
-                Map.of(
-                        "id", "testId",
-                        "relyingPartyRegistrationId", "stirling-pdf",
-                        "authenticationRequestUri", "example.com/authnRequest",
-                        "samlRequest", "testSamlRequest",
-                        "relayState", relayState);
-
-        when(request.getParameter("RelayState")).thenReturn(relayState);
-        when(jwtService.extractClaims(token)).thenReturn(claims);
-        when(relyingPartyRegistrationRepository.findByRegistrationId("stirling-pdf"))
-                .thenReturn(relyingPartyRegistration);
-        when(relyingPartyRegistration.getRegistrationId()).thenReturn("stirling-pdf");
-        when(relyingPartyRegistration.getAssertingPartyMetadata())
-                .thenReturn(assertingPartyMetadata);
-        when(assertingPartyMetadata.getSingleSignOnServiceLocation())
-                .thenReturn("https://example.com/sso");
-        tokenStore.put(relayState, token);
-
-        var result =
-                jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest(
-                        request, response);
-
-        assertNotNull(result);
-        assertFalse(tokenStore.containsKey(relayState));
-    }
-
-    @Test
-    void removeAuthenticationRequestWithNullRelayState() {
-        var request = mock(HttpServletRequest.class);
-        var response = mock(HttpServletResponse.class);
-        when(request.getParameter("RelayState")).thenReturn(null);
-
-        var result =
-                jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest(
-                        request, response);
-
-        assertNull(result);
-    }
-
-    @Test
-    void removeAuthenticationRequestWithNonExistentToken() {
-        var request = mock(HttpServletRequest.class);
-        var response = mock(HttpServletResponse.class);
-        when(request.getParameter("RelayState")).thenReturn("nonExistentRelayState");
-
-        var result =
-                jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest(
-                        request, response);
-
-        assertNull(result);
-    }
-
-    @Test
-    void removeAuthenticationRequestWithOnlyRelayState() {
-        var request = mock(HttpServletRequest.class);
-        var response = mock(HttpServletResponse.class);
-        String relayState = "testRelayState";
-
-        when(request.getParameter("RelayState")).thenReturn(relayState);
-
-        var result =
-                jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest(
-                        request, response);
-
-        assertNull(result);
-        assertFalse(tokenStore.containsKey(relayState));
-    }
-}
@@ -1,389 +0,0 @@
-package stirling.software.proprietary.security.service;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.contains;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.security.core.Authentication;
-
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import stirling.software.proprietary.security.model.JwtVerificationKey;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.model.exception.AuthenticationFailureException;
-
-@ExtendWith(MockitoExtension.class)
-class JwtServiceTest {
-
-    @Mock private Authentication authentication;
-
-    @Mock private User userDetails;
-
-    @Mock private HttpServletRequest request;
-
-    @Mock private HttpServletResponse response;
-
-    @Mock private KeyPersistenceServiceInterface keystoreService;
-
-    private JwtService jwtService;
-    private KeyPair testKeyPair;
-    private JwtVerificationKey testVerificationKey;
-
-    @BeforeEach
-    void setUp() throws NoSuchAlgorithmException {
-        // Generate a test keypair
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-        keyPairGenerator.initialize(2048);
-        testKeyPair = keyPairGenerator.generateKeyPair();
-
-        // Create test verification key
-        String encodedPublicKey =
-                Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded());
-        testVerificationKey = new JwtVerificationKey("test-key-id", encodedPublicKey);
-
-        jwtService = new JwtService(true, keystoreService);
-    }
-
-    @Test
-    void testGenerateTokenWithAuthentication() throws Exception {
-        String username = "testuser";
-
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn(username);
-
-        String token = jwtService.generateToken(authentication, Collections.emptyMap());
-
-        assertNotNull(token);
-        assertFalse(token.isEmpty());
-        assertEquals(username, jwtService.extractUsername(token));
-    }
-
-    @Test
-    void testGenerateTokenWithUsernameAndClaims() throws Exception {
-        String username = "testuser";
-        Map<String, Object> claims = new HashMap<>();
-        claims.put("role", "admin");
-        claims.put("department", "IT");
-
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn(username);
-
-        String token = jwtService.generateToken(authentication, claims);
-
-        assertNotNull(token);
-        assertFalse(token.isEmpty());
-        assertEquals(username, jwtService.extractUsername(token));
-
-        Map<String, Object> extractedClaims = jwtService.extractClaims(token);
-        assertEquals("admin", extractedClaims.get("role"));
-        assertEquals("IT", extractedClaims.get("department"));
-    }
-
-    @Test
-    void testValidateTokenSuccess() throws Exception {
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn("testuser");
-
-        String token = jwtService.generateToken(authentication, new HashMap<>());
-
-        assertDoesNotThrow(() -> jwtService.validateToken(token));
-    }
-
-    @Test
-    void testValidateTokenWithInvalidToken() throws Exception {
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-
-        assertThrows(
-                AuthenticationFailureException.class,
-                () -> {
-                    jwtService.validateToken("invalid-token");
-                });
-    }
-
-    @Test
-    void testValidateTokenWithMalformedToken() throws Exception {
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-
-        AuthenticationFailureException exception =
-                assertThrows(
-                        AuthenticationFailureException.class,
-                        () -> {
-                            jwtService.validateToken("malformed.token");
-                        });
-
-        assertTrue(exception.getMessage().contains("Invalid"));
-    }
-
-    @Test
-    void testValidateTokenWithEmptyToken() throws Exception {
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-
-        AuthenticationFailureException exception =
-                assertThrows(
-                        AuthenticationFailureException.class,
-                        () -> {
-                            jwtService.validateToken("");
-                        });
-
-        assertTrue(
-                exception.getMessage().contains("Claims are empty")
-                        || exception.getMessage().contains("Invalid"));
-    }
-
-    @Test
-    void testExtractUsername() throws Exception {
-        String username = "testuser";
-        User user = mock(User.class);
-        Map<String, Object> claims = Map.of("sub", "testuser", "authType", "WEB");
-
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(user);
-        when(user.getUsername()).thenReturn(username);
-
-        String token = jwtService.generateToken(authentication, claims);
-
-        assertEquals(username, jwtService.extractUsername(token));
-    }
-
-    @Test
-    void testExtractUsernameWithInvalidToken() throws Exception {
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-
-        assertThrows(
-                AuthenticationFailureException.class,
-                () -> jwtService.extractUsername("invalid-token"));
-    }
-
-    @Test
-    void testExtractClaims() throws Exception {
-        String username = "testuser";
-        Map<String, Object> claims = Map.of("role", "admin", "department", "IT");
-
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn(username);
-
-        String token = jwtService.generateToken(authentication, claims);
-        Map<String, Object> extractedClaims = jwtService.extractClaims(token);
-
-        assertEquals("admin", extractedClaims.get("role"));
-        assertEquals("IT", extractedClaims.get("department"));
-        assertEquals(username, extractedClaims.get("sub"));
-        assertEquals("Stirling PDF", extractedClaims.get("iss"));
-    }
-
-    @Test
-    void testExtractClaimsWithInvalidToken() throws Exception {
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-
-        assertThrows(
-                AuthenticationFailureException.class,
-                () -> jwtService.extractClaims("invalid-token"));
-    }
-
-    @Test
-    void testExtractTokenWithCookie() {
-        String token = "test-token";
-        Cookie[] cookies = {new Cookie("stirling_jwt", token)};
-        when(request.getCookies()).thenReturn(cookies);
-
-        assertEquals(token, jwtService.extractToken(request));
-    }
-
-    @Test
-    void testExtractTokenWithNoCookies() {
-        when(request.getCookies()).thenReturn(null);
-
-        assertNull(jwtService.extractToken(request));
-    }
-
-    @Test
-    void testExtractTokenWithWrongCookie() {
-        Cookie[] cookies = {new Cookie("OTHER_COOKIE", "value")};
-        when(request.getCookies()).thenReturn(cookies);
-
-        assertNull(jwtService.extractToken(request));
-    }
-
-    @Test
-    void testExtractTokenWithInvalidAuthorizationHeader() {
-        when(request.getCookies()).thenReturn(null);
-
-        assertNull(jwtService.extractToken(request));
-    }
-
-    @ParameterizedTest
-    @ValueSource(booleans = {true, false})
-    void testAddToken(boolean secureCookie) throws Exception {
-        String token = "test-token";
-
-        // Create new JwtService instance with the secureCookie parameter
-        JwtService testJwtService = createJwtServiceWithSecureCookie(secureCookie);
-
-        testJwtService.addToken(response, token);
-
-        verify(response).addHeader(eq("Set-Cookie"), contains("stirling_jwt=" + token));
-        verify(response).addHeader(eq("Set-Cookie"), contains("HttpOnly"));
-
-        if (secureCookie) {
-            verify(response).addHeader(eq("Set-Cookie"), contains("Secure"));
-        }
-    }
-
-    @Test
-    void testClearToken() {
-        jwtService.clearToken(response);
-
-        verify(response).addHeader(eq("Set-Cookie"), contains("stirling_jwt="));
-        verify(response).addHeader(eq("Set-Cookie"), contains("Max-Age=0"));
-    }
-
-    @Test
-    void testGenerateTokenWithKeyId() throws Exception {
-        String username = "testuser";
-        Map<String, Object> claims = new HashMap<>();
-
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn(username);
-
-        String token = jwtService.generateToken(authentication, claims);
-
-        assertNotNull(token);
-        assertFalse(token.isEmpty());
-        // Verify that the keystore service was called
-        verify(keystoreService).getActiveKey();
-        verify(keystoreService).getKeyPair("test-key-id");
-    }
-
-    @Test
-    void testTokenVerificationWithSpecificKeyId() throws Exception {
-        String username = "testuser";
-        Map<String, Object> claims = new HashMap<>();
-
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn(username);
-
-        // Generate token with key ID
-        String token = jwtService.generateToken(authentication, claims);
-
-        // Mock extraction of key ID and verification (lenient to avoid unused stubbing)
-        lenient()
-                .when(keystoreService.getKeyPair("test-key-id"))
-                .thenReturn(Optional.of(testKeyPair));
-
-        // Verify token can be validated
-        assertDoesNotThrow(() -> jwtService.validateToken(token));
-        assertEquals(username, jwtService.extractUsername(token));
-    }
-
-    @Test
-    void testTokenVerificationFallsBackToActiveKeyWhenKeyIdNotFound() throws Exception {
-        String username = "testuser";
-        Map<String, Object> claims = new HashMap<>();
-
-        // First, generate a token successfully
-        when(keystoreService.getActiveKey()).thenReturn(testVerificationKey);
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair));
-        when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey()))
-                .thenReturn(testKeyPair.getPublic());
-        when(authentication.getPrincipal()).thenReturn(userDetails);
-        when(userDetails.getUsername()).thenReturn(username);
-
-        String token = jwtService.generateToken(authentication, claims);
-
-        // Now mock the scenario for validation - key not found, but fallback works
-        // Create a fallback key pair that can be used
-        JwtVerificationKey fallbackKey =
-                new JwtVerificationKey(
-                        "fallback-key",
-                        Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded()));
-
-        // Mock the specific key lookup to fail, but the active key should work
-        when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.empty());
-        when(keystoreService.refreshActiveKeyPair()).thenReturn(fallbackKey);
-        when(keystoreService.getKeyPair("fallback-key")).thenReturn(Optional.of(testKeyPair));
-
-        // Should still work by falling back to the active keypair
-        assertDoesNotThrow(() -> jwtService.validateToken(token));
-        assertEquals(username, jwtService.extractUsername(token));
-
-        // Verify fallback logic was used
-        verify(keystoreService, atLeast(1)).getActiveKey();
-    }
-
-    private JwtService createJwtServiceWithSecureCookie(boolean secureCookie) throws Exception {
-        // Use reflection to create JwtService with custom secureCookie value
-        JwtService testService = new JwtService(true, keystoreService);
-
-        // Set the secureCookie field using reflection
-        java.lang.reflect.Field secureCookieField =
-                JwtService.class.getDeclaredField("secureCookie");
-        secureCookieField.setAccessible(true);
-        secureCookieField.set(testService, secureCookie);
-
-        return testService;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Stirling	3426f0cc40	final change	2025-07-11 13:13:15 +01:00
Anthony Stirling	0b32c5b856	Delete old comments as part of new execution,remove reactions	2025-07-11 13:00:39 +01:00
Anthony Stirling	817c28ff87	gitignore for configs	2025-07-11 12:50:00 +01:00
Anthony Stirling	ae1ac3d8d2	changes	2025-07-11 12:45:47 +01:00
Anthony Stirling	64c1048dec	remove duplicate build	2025-07-11 12:33:40 +01:00
a	f6db6ebd66	Merge branch 'V2DockerSupport' of git@github.com:Stirling-Tools/Stirling-PDF.git into V2DockerSupport	2025-07-11 12:31:37 +01:00
Anthony Stirling	b107ef9ce6	fix	2025-07-11 12:31:33 +01:00
Anthony StirlingandGitHub	fb5bfb8c23	Update PR-Auto-Deploy-V2.yml	2025-07-11 12:28:55 +01:00
Anthony Stirling	91918eb89b	docker test	2025-07-11 12:27:27 +01:00