progress

2025-10-12 14:06:13 +01:00
866 changed files with 6632 additions and 29140 deletions
@@ -31,15 +31,10 @@ jobs:
      project: ${{ steps.changes.outputs.project }}
      openapi: ${{ steps.changes.outputs.openapi }}
    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4.3.0

      - name: Check for file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@v3.0.2
        id: changes
        with:
          filters: .github/config/.files.yaml
@@ -56,19 +51,19 @@ jobs:
        spring-security: [true, false]
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
        with:
          egress-policy: audit
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4.3.0

      - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@v4.7.1
        with:
          java-version: ${{ matrix.jdk-version }}
          distribution: "temurin"
      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@v4.4.2
        with:
          gradle-version: 8.14
      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
@@ -94,7 +89,7 @@ jobs:
          done
      - name: Upload Test Reports
        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
          path: |
@@ -111,26 +106,26 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@v2.13.0
        with:
          egress-policy: audit

      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4.3.0

      - name: Set up JDK 17
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@v4.7.1
        with:
          java-version: "17"
          distribution: "temurin"
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - 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@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: openapi-docs
          path: ./SwaggerDoc.json
@@ -139,21 +134,19 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@v2.12.2
        with:
          egress-policy: audit
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4.2.2
      - name: Set up Node.js
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@v4.1.0
        with:
-          node-version: '22'
+          node-version: '20'
          cache: 'npm'
          cache-dependency-path: frontend/package-lock.json
      - name: Install frontend dependencies
        run: cd frontend && npm ci
-      - name: Type-check frontend
-        run: cd frontend && npm run prebuild && npm run typecheck:all
      - name: Lint frontend
        run: cd frontend && npm run lint
      - name: Build frontend
@@ -161,7 +154,7 @@ jobs:
      - name: Run frontend tests
        run: cd frontend && npm run test -- --run
      - name: Upload frontend build artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: frontend-build
          path: frontend/dist/
@@ -173,13 +166,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
        with:
          egress-policy: audit
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4.3.0
      - name: Set up JDK 17
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@v4.7.1
        with:
          java-version: "17"
          distribution: "temurin"
@@ -187,7 +180,7 @@ jobs:
        run: ./gradlew clean checkLicense
      - name: FAILED - check the licenses for compatibility
        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: dependencies-without-allowed-license.json
          path: build/reports/dependency-license/dependencies-without-allowed-license.json
@@ -214,15 +207,15 @@ jobs:

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

      - name: Checkout Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

      - name: Set up Java 17
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
          distribution: "temurin"
@@ -232,11 +225,11 @@ jobs:

      - name: Install Docker Compose
        run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
          sudo chmod +x /usr/local/bin/docker-compose

      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.12"
          cache: 'pip' # caching pip dependencies
@@ -263,21 +256,21 @@ jobs:
        docker-rev: ["Dockerfile", "Dockerfile.ultra-lite", "Dockerfile.fat"]
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
        with:
          egress-policy: audit

      - name: Checkout Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

      - name: Set up JDK 17
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
        with:
          java-version: "17"
          distribution: "temurin"

      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
        with:
          gradle-version: 8.14

@@ -115,46 +115,46 @@ Stirling-PDF currently supports 40 languages!

 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![83%](https://geps.dev/progress/83)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![32%](https://geps.dev/progress/32)   |
-| Basque (Euskara) (eu_ES)                     | ![18%](https://geps.dev/progress/18)   |
-| Bulgarian (Български) (bg_BG)                | ![35%](https://geps.dev/progress/35)   |
-| Catalan (Català) (ca_CA)                     | ![34%](https://geps.dev/progress/34)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![31%](https://geps.dev/progress/31)   |
-| Czech (Česky) (cs_CZ)                        | ![34%](https://geps.dev/progress/34)   |
-| Danish (Dansk) (da_DK)                       | ![30%](https://geps.dev/progress/30)   |
-| Dutch (Nederlands) (nl_NL)                   | ![30%](https://geps.dev/progress/30)   |
+| Arabic (العربية) (ar_AR)                        | ![95%](https://geps.dev/progress/95)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![35%](https://geps.dev/progress/35)   |
+| Basque (Euskara) (eu_ES)                     | ![20%](https://geps.dev/progress/20)   |
+| Bulgarian (Български) (bg_BG)                | ![39%](https://geps.dev/progress/39)   |
+| Catalan (Català) (ca_CA)                     | ![37%](https://geps.dev/progress/37)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![34%](https://geps.dev/progress/34)   |
+| Czech (Česky) (cs_CZ)                        | ![38%](https://geps.dev/progress/38)   |
+| Danish (Dansk) (da_DK)                       | ![34%](https://geps.dev/progress/34)   |
+| Dutch (Nederlands) (nl_NL)                   | ![34%](https://geps.dev/progress/34)   |
 | 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)                    | ![82%](https://geps.dev/progress/82)   |
-| German (Deutsch) (de_DE)                     | ![84%](https://geps.dev/progress/84)   |
-| Greek (Ελληνικά) (el_GR)                     | ![34%](https://geps.dev/progress/34)   |
-| Hindi (हिंदी) (hi_IN)                          | ![34%](https://geps.dev/progress/34)   |
-| Hungarian (Magyar) (hu_HU)                   | ![38%](https://geps.dev/progress/38)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![31%](https://geps.dev/progress/31)   |
-| Irish (Gaeilge) (ga_IE)                      | ![34%](https://geps.dev/progress/34)   |
-| Italian (Italiano) (it_IT)                   | ![84%](https://geps.dev/progress/84)   |
-| Japanese (日本語) (ja_JP)                    | ![62%](https://geps.dev/progress/62)   |
-| Korean (한국어) (ko_KR)                      | ![34%](https://geps.dev/progress/34)   |
-| Norwegian (Norsk) (no_NB)                    | ![32%](https://geps.dev/progress/32)   |
-| Persian (فارسی) (fa_IR)                      | ![34%](https://geps.dev/progress/34)   |
-| Polish (Polski) (pl_PL)                      | ![36%](https://geps.dev/progress/36)   |
-| Portuguese (Português) (pt_PT)               | ![34%](https://geps.dev/progress/34)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![83%](https://geps.dev/progress/83)   |
-| Romanian (Română) (ro_RO)                    | ![28%](https://geps.dev/progress/28)   |
-| Russian (Русский) (ru_RU)                    | ![83%](https://geps.dev/progress/83)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![37%](https://geps.dev/progress/37)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![85%](https://geps.dev/progress/85)   |
-| Slovakian (Slovensky) (sk_SK)                | ![26%](https://geps.dev/progress/26)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![36%](https://geps.dev/progress/36)   |
-| Spanish (Español) (es_ES)                    | ![84%](https://geps.dev/progress/84)   |
-| Swedish (Svenska) (sv_SE)                    | ![33%](https://geps.dev/progress/33)   |
-| Thai (ไทย) (th_TH)                           | ![31%](https://geps.dev/progress/31)   |
+| French (Français) (fr_FR)                    | ![93%](https://geps.dev/progress/93)   |
+| German (Deutsch) (de_DE)                     | ![95%](https://geps.dev/progress/95)   |
+| Greek (Ελληνικά) (el_GR)                     | ![38%](https://geps.dev/progress/38)   |
+| Hindi (हिंदी) (hi_IN)                          | ![38%](https://geps.dev/progress/38)   |
+| Hungarian (Magyar) (hu_HU)                   | ![42%](https://geps.dev/progress/42)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![34%](https://geps.dev/progress/34)   |
+| Irish (Gaeilge) (ga_IE)                      | ![38%](https://geps.dev/progress/38)   |
+| Italian (Italiano) (it_IT)                   | ![95%](https://geps.dev/progress/95)   |
+| Japanese (日本語) (ja_JP)                    | ![70%](https://geps.dev/progress/70)   |
+| Korean (한국어) (ko_KR)                      | ![38%](https://geps.dev/progress/38)   |
+| Norwegian (Norsk) (no_NB)                    | ![36%](https://geps.dev/progress/36)   |
+| Persian (فارسی) (fa_IR)                      | ![38%](https://geps.dev/progress/38)   |
+| Polish (Polski) (pl_PL)                      | ![40%](https://geps.dev/progress/40)   |
+| Portuguese (Português) (pt_PT)               | ![38%](https://geps.dev/progress/38)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![95%](https://geps.dev/progress/95)   |
+| Romanian (Română) (ro_RO)                    | ![32%](https://geps.dev/progress/32)   |
+| Russian (Русский) (ru_RU)                    | ![94%](https://geps.dev/progress/94)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![42%](https://geps.dev/progress/42)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![96%](https://geps.dev/progress/96)   |
+| Slovakian (Slovensky) (sk_SK)                | ![28%](https://geps.dev/progress/28)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![40%](https://geps.dev/progress/40)   |
+| Spanish (Español) (es_ES)                    | ![95%](https://geps.dev/progress/95)   |
+| Swedish (Svenska) (sv_SE)                    | ![37%](https://geps.dev/progress/37)   |
+| Thai (ไทย) (th_TH)                           | ![34%](https://geps.dev/progress/34)   |
 | Tibetan (བོད་ཡིག་) (bo_CN)                     | ![65%](https://geps.dev/progress/65) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![38%](https://geps.dev/progress/38)   |
-| Turkish (Türkçe) (tr_TR)                     | ![37%](https://geps.dev/progress/37)   |
-| Ukrainian (Українська) (uk_UA)               | ![36%](https://geps.dev/progress/36)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![28%](https://geps.dev/progress/28)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![42%](https://geps.dev/progress/42)   |
+| Turkish (Türkçe) (tr_TR)                     | ![41%](https://geps.dev/progress/41)   |
+| Ukrainian (Українська) (uk_UA)               | ![40%](https://geps.dev/progress/40)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![31%](https://geps.dev/progress/31)   |
 | Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |

 ## Stirling PDF Enterprise
@@ -87,7 +87,8 @@ public class AutoJobAspect {
                    },
                    timeout,
                    queueable,
-                    resourceWeight);
+                    resourceWeight,
+                    trackProgress);
        } else {
            // Use retry logic
            return executeWithRetries(
@@ -220,7 +221,8 @@ public class AutoJobAspect {
                },
                timeout,
                queueable,
-                resourceWeight);
+                resourceWeight,
+                trackProgress);
    }

    /**
@@ -74,7 +74,8 @@ public class AppConfig {

    @Bean(name = "appName")
    public String appName() {
-        return "Stirling PDF";
+        String homeTitle = applicationProperties.getUi().getAppName();
+        return (homeTitle != null) ? homeTitle : "Stirling PDF";
    }

    @Bean(name = "appVersion")
@@ -92,7 +93,9 @@ public class AppConfig {

    @Bean(name = "homeText")
    public String homeText() {
-        return "null";
+        return (applicationProperties.getUi().getHomeDescription() != null)
+                ? applicationProperties.getUi().getHomeDescription()
+                : "null";
    }

    @Bean(name = "languages")
@@ -107,8 +110,11 @@ public class AppConfig {

    @Bean(name = "navBarText")
    public String navBarText() {
-        String navBar = applicationProperties.getUi().getAppNameNavbar();
-        return (navBar != null) ? navBar : "Stirling PDF";
+        String defaultNavBar =
+                applicationProperties.getUi().getAppNameNavbar() != null
+                        ? applicationProperties.getUi().getAppNameNavbar()
+                        : applicationProperties.getUi().getAppName();
+        return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
    }

    @Bean(name = "enableAlphaFunctionality")
@@ -0,0 +1,44 @@
+package stirling.software.common.context;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+/**
+ * Holds contextual information for the currently executing job. Backed by a {@link ThreadLocal} so
+ * worker threads can retrieve the job ID and progress tracking preference while processing
+ * asynchronous work dispatched by {@link stirling.software.common.service.JobExecutorService
+ * JobExecutorService}.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class JobContextHolder {
+
+    private static final ThreadLocal<String> JOB_ID = new ThreadLocal<>();
+    private static final ThreadLocal<Boolean> PROGRESS_ENABLED = new ThreadLocal<>();
+
+    /** Store context for the current thread. */
+    public static void setContext(String jobId, boolean progressEnabled) {
+        if (jobId == null) {
+            clear();
+            return;
+        }
+        JOB_ID.set(jobId);
+        PROGRESS_ENABLED.set(progressEnabled);
+    }
+
+    /** Get the job ID bound to the current thread, or {@code null} if none. */
+    public static String getJobId() {
+        return JOB_ID.get();
+    }
+
+    /** Whether progress tracking is enabled for the current job (defaults to {@code false}). */
+    public static boolean isProgressEnabled() {
+        Boolean enabled = PROGRESS_ENABLED.get();
+        return enabled != null && enabled;
+    }
+
+    /** Remove all context associated with the current thread. */
+    public static void clear() {
+        JOB_ID.remove();
+        PROGRESS_ENABLED.remove();
+    }
+}
@@ -120,7 +120,6 @@ public class ApplicationProperties {
        private String loginMethod = "all";
        private String customGlobalAPIKey;
        private Jwt jwt = new Jwt();
-        private Validation validation = new Validation();

        public Boolean isAltLogin() {
            return saml2.getEnabled() || oauth2.getEnabled();
@@ -307,41 +306,7 @@ public class ApplicationProperties {
            private boolean enableKeyRotation = false;
            private boolean enableKeyCleanup = true;
            private int keyRetentionDays = 7;
-        }
-
-        @Data
-        public static class Validation {
-            private Trust trust = new Trust();
-            private boolean allowAIA = false;
-            private Aatl aatl = new Aatl();
-            private Eutl eutl = new Eutl();
-            private Revocation revocation = new Revocation();
-
-            @Data
-            public static class Trust {
-                private boolean serverAsAnchor = true;
-                private boolean useSystemTrust = false;
-                private boolean useMozillaBundle = false;
-                private boolean useAATL = false;
-                private boolean useEUTL = false;
-            }
-
-            @Data
-            public static class Aatl {
-                private String url = "https://trustlist.adobe.com/tl.pdf";
-            }
-
-            @Data
-            public static class Eutl {
-                private String lotlUrl = "https://ec.europa.eu/tools/lotl/eu-lotl.xml";
-                private boolean acceptTransitional = false;
-            }
-
-            @Data
-            public static class Revocation {
-                private String mode = "none";
-                private boolean hardFail = false;
-            }
+            private boolean secureCookie;
        }
    }

@@ -355,8 +320,6 @@ public class ApplicationProperties {
        private String tessdataDir;
        private Boolean enableAlphaFunctionality;
        private Boolean enableAnalytics;
-        private Boolean enablePosthog;
-        private Boolean enableScarf;
        private Datasource datasource;
        private Boolean disableSanitize;
        private int maxDPI;
@@ -365,23 +328,10 @@ public class ApplicationProperties {
        private CustomPaths customPaths = new CustomPaths();
        private String fileUploadLimit;
        private TempFileManagement tempFileManagement = new TempFileManagement();
-        private List<String> corsAllowedOrigins = new ArrayList<>();

        public boolean isAnalyticsEnabled() {
            return this.getEnableAnalytics() != null && this.getEnableAnalytics();
        }
-
-        public boolean isPosthogEnabled() {
-            // Treat null as enabled when analytics is enabled
-            return this.isAnalyticsEnabled()
-                    && (this.getEnablePosthog() == null || this.getEnablePosthog());
-        }
-
-        public boolean isScarfEnabled() {
-            // Treat null as enabled when analytics is enabled
-            return this.isAnalyticsEnabled()
-                    && (this.getEnableScarf() == null || this.getEnableScarf());
-        }
    }

    @Data
@@ -490,9 +440,21 @@ public class ApplicationProperties {

    @Data
    public static class Ui {
+        private String appName;
+        private String homeDescription;
        private String appNameNavbar;
        private List<String> languages;

+        public String getAppName() {
+            return appName != null && appName.trim().length() > 0 ? appName : null;
+        }
+
+        public String getHomeDescription() {
+            return homeDescription != null && homeDescription.trim().length() > 0
+                    ? homeDescription
+                    : null;
+        }
+
        public String getAppNameNavbar() {
            return appNameNavbar != null && appNameNavbar.trim().length() > 0
                    ? appNameNavbar
@@ -548,7 +510,6 @@ public class ApplicationProperties {
    @Data
    public static class Mail {
        private boolean enabled;
-        private boolean enableInvites = false;
        private String host;
        private int port;
        private String username;
@@ -41,6 +41,18 @@ public class JobResult {
    /** The actual result object, if not a file */
    private Object result;

+    /** Whether detailed progress tracking is enabled for this job. */
+    @Builder.Default private boolean trackProgress = true;
+
+    /** Most recent percentage update (0-100) if progress tracking is enabled. */
+    private Integer progressPercent;
+
+    /** Human readable progress message (e.g. current stage) when progress is enabled. */
+    private String progressMessage;
+
+    /** Timestamp of the last progress update. */
+    private LocalDateTime progressUpdatedAt;
+
    /**
     * Notes attached to this job for tracking purposes. Uses CopyOnWriteArrayList for thread safety
     * when notes are added concurrently.
@@ -54,11 +66,28 @@ public class JobResult {
     * @return A new JobResult
     */
    public static JobResult createNew(String jobId) {
-        return JobResult.builder()
-                .jobId(jobId)
-                .complete(false)
-                .createdAt(LocalDateTime.now())
-                .build();
+        return createNew(jobId, true);
+    }
+
+    /**
+     * Create a new JobResult with the given job ID and progress tracking preference.
+     *
+     * @param jobId The job ID
+     * @param trackProgress Whether detailed progress should be tracked
+     * @return A new JobResult
+     */
+    public static JobResult createNew(String jobId, boolean trackProgress) {
+        JobResult result =
+                JobResult.builder()
+                        .jobId(jobId)
+                        .complete(false)
+                        .createdAt(LocalDateTime.now())
+                        .trackProgress(trackProgress)
+                        .build();
+        if (trackProgress) {
+            result.updateProgressInternal(0, "Pending");
+        }
+        return result;
    }

    /**
@@ -70,6 +99,9 @@ public class JobResult {
        this.complete = true;
        this.result = result;
        this.completedAt = LocalDateTime.now();
+        if (trackProgress) {
+            updateProgressInternal(100, "Completed");
+        }
    }

    /**
@@ -81,6 +113,9 @@ public class JobResult {
        this.complete = true;
        this.error = error;
        this.completedAt = LocalDateTime.now();
+        if (trackProgress) {
+            updateProgressInternal(100, error != null ? error : "Failed");
+        }
    }

    /**
@@ -92,6 +127,9 @@ public class JobResult {
        this.complete = true;
        this.resultFiles = new ArrayList<>(resultFiles);
        this.completedAt = LocalDateTime.now();
+        if (trackProgress) {
+            updateProgressInternal(100, "Completed");
+        }
    }

    /**
@@ -161,4 +199,26 @@ public class JobResult {
    public List<String> getNotes() {
        return Collections.unmodifiableList(notes);
    }
+
+    /**
+     * Update the progress information if tracking is enabled.
+     *
+     * @param percent The percent complete (0-100)
+     * @param message Optional descriptive message
+     */
+    public void updateProgress(int percent, String message) {
+        if (!trackProgress) {
+            return;
+        }
+        updateProgressInternal(percent, message);
+    }
+
+    private void updateProgressInternal(int percent, String message) {
+        int clamped = Math.min(100, Math.max(0, percent));
+        this.progressPercent = clamped;
+        if (message != null && !message.isBlank()) {
+            this.progressMessage = message;
+        }
+        this.progressUpdatedAt = LocalDateTime.now();
+    }
 }
@@ -20,6 +20,7 @@ import jakarta.servlet.http.HttpServletRequest;

 import lombok.extern.slf4j.Slf4j;

+import stirling.software.common.context.JobContextHolder;
 import stirling.software.common.model.job.JobResponse;
 import stirling.software.common.util.ExecutorFactory;

@@ -65,7 +66,7 @@ public class JobExecutorService {
     * @return The response
     */
    public ResponseEntity<?> runJobGeneric(boolean async, Supplier<Object> work) {
-        return runJobGeneric(async, work, -1);
+        return runJobGeneric(async, work, -1, false, 50, true);
    }

    /**
@@ -78,7 +79,7 @@ public class JobExecutorService {
     */
    public ResponseEntity<?> runJobGeneric(
            boolean async, Supplier<Object> work, long customTimeoutMs) {
-        return runJobGeneric(async, work, customTimeoutMs, false, 50);
+        return runJobGeneric(async, work, customTimeoutMs, false, 50, true);
    }

    /**
@@ -96,7 +97,8 @@ public class JobExecutorService {
            Supplier<Object> work,
            long customTimeoutMs,
            boolean queueable,
-            int resourceWeight) {
+            int resourceWeight,
+            boolean trackProgress) {
        String jobId = UUID.randomUUID().toString();

        // Store the job ID in the request for potential use by other components
@@ -138,6 +140,8 @@ public class JobExecutorService {
                        && // Only async jobs can be queued
                        resourceMonitor.shouldQueueJob(resourceWeight);

+        boolean enableProgress = async && trackProgress;
+
        if (shouldQueue) {
            // Queue the job instead of executing immediately
            log.debug(
@@ -145,13 +149,18 @@ public class JobExecutorService {
                    jobId,
                    resourceWeight);

-            taskManager.createTask(jobId);
+            taskManager.createTask(jobId, trackProgress);
+
+            Supplier<Object> contextualWork = withJobContext(jobId, enableProgress, work);

            // Create a specialized wrapper that updates the TaskManager
            Supplier<Object> wrappedWork =
                    () -> {
                        try {
-                            Object result = work.get();
+                            if (enableProgress) {
+                                taskManager.updateProgress(jobId, 5, null);
+                            }
+                            Object result = contextualWork.get();
                            processJobResult(jobId, result);
                            return result;
                        } catch (Exception e) {
@@ -169,24 +178,49 @@ public class JobExecutorService {
            // Return immediately with job ID
            return ResponseEntity.ok().body(new JobResponse<>(true, jobId, null));
        } else if (async) {
-            taskManager.createTask(jobId);
+            taskManager.createTask(jobId, trackProgress);
            executor.execute(
-                    () -> {
-                        try {
-                            log.debug(
-                                    "Running async job {} with timeout {} ms", jobId, timeoutToUse);
+                    () ->
+                            runWithJobContext(
+                                    jobId,
+                                    enableProgress,
+                                    () -> {
+                                        try {
+                                            log.debug(
+                                                    "Running async job {} with timeout {} ms",
+                                                    jobId,
+                                                    timeoutToUse);

-                            // Execute with timeout
-                            Object result = executeWithTimeout(() -> work.get(), timeoutToUse);
-                            processJobResult(jobId, result);
-                        } catch (TimeoutException te) {
-                            log.error("Job {} timed out after {} ms", jobId, timeoutToUse);
-                            taskManager.setError(jobId, "Job timed out");
-                        } catch (Exception e) {
-                            log.error("Error executing job {}: {}", jobId, e.getMessage(), e);
-                            taskManager.setError(jobId, e.getMessage());
-                        }
-                    });
+                                            Supplier<Object> contextualWork =
+                                                    withJobContext(jobId, enableProgress, work);
+
+                                            if (enableProgress) {
+                                                taskManager.updateProgress(jobId, 5, null);
+                                            }
+
+                                            // Execute with timeout
+                                            Object result =
+                                                    executeWithTimeout(
+                                                            contextualWork,
+                                                            timeoutToUse,
+                                                            jobId,
+                                                            enableProgress);
+                                            processJobResult(jobId, result);
+                                        } catch (TimeoutException te) {
+                                            log.error(
+                                                    "Job {} timed out after {} ms",
+                                                    jobId,
+                                                    timeoutToUse);
+                                            taskManager.setError(jobId, "Job timed out");
+                                        } catch (Exception e) {
+                                            log.error(
+                                                    "Error executing job {}: {}",
+                                                    jobId,
+                                                    e.getMessage(),
+                                                    e);
+                                            taskManager.setError(jobId, e.getMessage());
+                                        }
+                                    }));

            return ResponseEntity.ok().body(new JobResponse<>(true, jobId, null));
        } else {
@@ -194,7 +228,9 @@ public class JobExecutorService {
                log.debug("Running sync job with timeout {} ms", timeoutToUse);

                // Execute with timeout
-                Object result = executeWithTimeout(() -> work.get(), timeoutToUse);
+                Supplier<Object> contextualWork = withJobContext(jobId, enableProgress, work);
+                Object result =
+                        executeWithTimeout(contextualWork, timeoutToUse, jobId, enableProgress);

                // If the result is already a ResponseEntity, return it directly
                if (result instanceof ResponseEntity) {
@@ -452,12 +488,14 @@ public class JobExecutorService {
     * @throws TimeoutException If the execution times out
     * @throws Exception If the supplier throws an exception
     */
-    private <T> T executeWithTimeout(Supplier<T> supplier, long timeoutMs)
+    private <T> T executeWithTimeout(
+            Supplier<T> supplier, long timeoutMs, String jobId, boolean progressEnabled)
            throws TimeoutException, Exception {
        // Use the same executor as other async jobs for consistency
        // This ensures all operations run on the same thread pool
        java.util.concurrent.CompletableFuture<T> future =
-                java.util.concurrent.CompletableFuture.supplyAsync(supplier, executor);
+                java.util.concurrent.CompletableFuture.supplyAsync(
+                        withJobContext(jobId, progressEnabled, supplier), executor);

        try {
            return future.get(timeoutMs, TimeUnit.MILLISECONDS);
@@ -473,4 +511,62 @@ public class JobExecutorService {
            throw new Exception("Execution was interrupted", e);
        }
    }
+
+    /** Backwards compatible helper used by tests via reflection. */
+    @SuppressWarnings("unused")
+    private <T> T executeWithTimeout(Supplier<T> supplier, long timeoutMs)
+            throws TimeoutException, Exception {
+        return executeWithTimeout(
+                supplier,
+                timeoutMs,
+                JobContextHolder.getJobId(),
+                JobContextHolder.isProgressEnabled());
+    }
+
+    private <T> Supplier<T> withJobContext(
+            String jobId, boolean progressEnabled, Supplier<T> delegate) {
+        if (jobId == null) {
+            return delegate;
+        }
+        return () -> {
+            String previousJobId = JobContextHolder.getJobId();
+            boolean previousProgress = JobContextHolder.isProgressEnabled();
+
+            JobContextHolder.setContext(jobId, progressEnabled);
+            try {
+                return delegate.get();
+            } finally {
+                if (previousJobId == null) {
+                    JobContextHolder.clear();
+                } else {
+                    JobContextHolder.setContext(previousJobId, previousProgress);
+                }
+            }
+        };
+    }
+
+    private void runWithJobContext(String jobId, boolean progressEnabled, Runnable runnable) {
+        if (jobId == null) {
+            runnable.run();
+            return;
+        }
+        Runnable contextualRunnable =
+                () -> {
+                    String previousJobId = JobContextHolder.getJobId();
+                    boolean previousProgress = JobContextHolder.isProgressEnabled();
+
+                    JobContextHolder.setContext(jobId, progressEnabled);
+                    try {
+                        runnable.run();
+                    } finally {
+                        if (previousJobId == null) {
+                            JobContextHolder.clear();
+                        } else {
+                            JobContextHolder.setContext(previousJobId, previousProgress);
+                        }
+                    }
+                };
+
+        contextualRunnable.run();
+    }
 }
@@ -0,0 +1,56 @@
+package stirling.software.common.service;
+
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+
+import stirling.software.common.context.JobContextHolder;
+
+/**
+ * Convenience service that exposes a simple API for updating progress information from within job
+ * handlers executed through {@link JobExecutorService}. The service automatically ties progress
+ * updates to the current job (if any) and no-ops when progress tracking is disabled.
+ */
+@Service
+@RequiredArgsConstructor
+public class JobProgressService {
+
+    private final TaskManager taskManager;
+
+    /** Update the progress percentage for the current job. */
+    public boolean updateProgress(int percent, String message) {
+        String jobId = JobContextHolder.getJobId();
+        if (jobId == null || !JobContextHolder.isProgressEnabled()) {
+            return false;
+        }
+        return taskManager.updateProgress(jobId, percent, message);
+    }
+
+    /**
+     * Create a simple tracker that can be used to report progress across a fixed number of steps.
+     * When progress tracking is disabled for the current job, the returned tracker will be a
+     * lightweight no-op implementation.
+     */
+    public JobProgressTracker tracker(int totalSteps) {
+        return tracker(totalSteps, null);
+    }
+
+    /**
+     * Create a tracker and optionally publish an initial message. Useful for multi-stage pipelines
+     * where the initial state should be visible to clients.
+     */
+    public JobProgressTracker tracker(int totalSteps, String initialMessage) {
+        String jobId = JobContextHolder.getJobId();
+        boolean enabled = JobContextHolder.isProgressEnabled();
+
+        if (jobId == null || !enabled || totalSteps <= 0) {
+            return JobProgressTracker.disabled();
+        }
+
+        if (initialMessage != null && !initialMessage.isBlank()) {
+            taskManager.updateProgress(jobId, 0, initialMessage);
+        }
+
+        return new JobProgressTracker(taskManager, jobId, totalSteps, true);
+    }
+}
@@ -0,0 +1,81 @@
+package stirling.software.common.service;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Utility that helps controllers report progress in a structured way by distributing the 0-100%
+ * range across a finite number of logical steps.
+ */
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+public class JobProgressTracker {
+
+    private final TaskManager taskManager;
+    private final String jobId;
+    private final int totalSteps;
+    private final boolean enabled;
+
+    private int completedSteps;
+
+    static JobProgressTracker disabled() {
+        return new JobProgressTracker(null, null, 1, false);
+    }
+
+    /** Whether the tracker will emit updates. */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /** Advance the tracker by one step. */
+    public void advance() {
+        advanceBy(1, null);
+    }
+
+    /** Advance the tracker by {@code steps} steps. */
+    public void advanceBy(int steps, String message) {
+        if (!enabled) {
+            return;
+        }
+        int safeSteps = Math.max(0, steps);
+        completedSteps = Math.min(totalSteps, completedSteps + safeSteps);
+        publish(message);
+    }
+
+    /** Advance the tracker by {@code steps} steps without a message. */
+    public void advanceBy(int steps) {
+        advanceBy(steps, null);
+    }
+
+    /** Explicitly set the completed steps count. */
+    public void setStepsCompleted(int stepsCompleted, String message) {
+        if (!enabled) {
+            return;
+        }
+        completedSteps = Math.max(0, Math.min(totalSteps, stepsCompleted));
+        publish(message);
+    }
+
+    /** Explicitly set completed steps without a message. */
+    public void setStepsCompleted(int stepsCompleted) {
+        setStepsCompleted(stepsCompleted, null);
+    }
+
+    /** Mark the tracker as complete and emit a final message. */
+    public void complete(String message) {
+        if (!enabled) {
+            return;
+        }
+        completedSteps = totalSteps;
+        taskManager.updateProgress(jobId, 100, message);
+    }
+
+    /** Mark the tracker as complete without a message. */
+    public void complete() {
+        complete(null);
+    }
+
+    private void publish(String message) {
+        int percent = (int) Math.floor(((double) completedSteps / (double) totalSteps) * 100);
+        taskManager.updateProgress(jobId, percent, message);
+    }
+}
@@ -56,7 +56,7 @@ public class PostHogService {
    }

    private void captureSystemInfo() {
-        if (!applicationProperties.getSystem().isPosthogEnabled()) {
+        if (!applicationProperties.getSystem().isAnalyticsEnabled()) {
            return;
        }
        try {
@@ -67,7 +67,7 @@ public class PostHogService {
    }

    public void captureEvent(String eventName, Map<String, Object> properties) {
-        if (!applicationProperties.getSystem().isPosthogEnabled()) {
+        if (!applicationProperties.getSystem().isAnalyticsEnabled()) {
            return;
        }

@@ -325,16 +325,13 @@ public class PostHogService {
                properties,
                "system_enableAnalytics",
                applicationProperties.getSystem().isAnalyticsEnabled());
-        addIfNotEmpty(
-                properties,
-                "system_enablePosthog",
-                applicationProperties.getSystem().isPosthogEnabled());
-        addIfNotEmpty(
-                properties,
-                "system_enableScarf",
-                applicationProperties.getSystem().isScarfEnabled());

        // Capture UI properties
+        addIfNotEmpty(properties, "ui_appName", applicationProperties.getUi().getAppName());
+        addIfNotEmpty(
+                properties,
+                "ui_homeDescription",
+                applicationProperties.getUi().getHomeDescription());
        addIfNotEmpty(
                properties, "ui_appNameNavbar", applicationProperties.getUi().getAppNameNavbar());

@@ -65,7 +65,17 @@ public class TaskManager {
     * @param jobId The job ID
     */
    public void createTask(String jobId) {
-        jobResults.put(jobId, JobResult.createNew(jobId));
+        createTask(jobId, true);
+    }
+
+    /**
+     * Create a new task with the given job ID and progress tracking preference
+     *
+     * @param jobId The job ID
+     * @param trackProgress Whether detailed progress updates should be stored
+     */
+    public void createTask(String jobId, boolean trackProgress) {
+        jobResults.put(jobId, JobResult.createNew(jobId, trackProgress));
        log.debug("Created task with job ID: {}", jobId);
    }

@@ -165,6 +175,11 @@ public class TaskManager {
                && jobResult.getError() == null) {
            // If no result or error has been set, mark it as complete with an empty result
            jobResult.completeWithResult("Task completed successfully");
+        } else {
+            // Ensure progress is set to 100% with "Completed" message
+            if (jobResult.isTrackProgress()) {
+                jobResult.updateProgress(100, "Completed");
+            }
        }
        log.debug("Marked job ID: {} as complete", jobId);
    }
@@ -209,6 +224,33 @@ public class TaskManager {
        return false;
    }

+    /**
+     * Update the progress information for a task.
+     *
+     * @param jobId The job ID
+     * @param percent Percentage complete (0-100)
+     * @param message Descriptive message for the current stage
+     * @return true if the progress update was accepted
+     */
+    public boolean updateProgress(String jobId, int percent, String message) {
+        JobResult jobResult = jobResults.get(jobId);
+        if (jobResult == null) {
+            log.debug("Ignoring progress update for unknown job ID: {}", jobId);
+            return false;
+        }
+
+        if (!jobResult.isTrackProgress()) {
+            log.trace("Progress tracking disabled for job ID: {}", jobId);
+            return false;
+        }
+
+        jobResult.updateProgress(percent, message);
+        log.debug(
+                "Updated progress for job {} to {}% with message: {}",
+                jobId, jobResult.getProgressPercent(), message);
+        return true;
+    }
+
    /**
     * Get statistics about all jobs in the system
     *
@@ -6,6 +6,4 @@ public interface UserServiceInterface {
    String getCurrentUsername();

    long getTotalUsersCount();
-
-    boolean isCurrentUserAdmin();
 }
@@ -1,29 +0,0 @@
-package stirling.software.common.util;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Captures application command-line arguments at startup so they can be reused for restart
- * operations. This allows the application to restart with the same configuration.
- */
-@Slf4j
-@Component
-public class AppArgsCapture implements ApplicationRunner {
-
-    public static final AtomicReference<List<String>> APP_ARGS = new AtomicReference<>(List.of());
-
-    @Override
-    public void run(ApplicationArguments args) {
-        APP_ARGS.set(List.of(args.getSourceArgs()));
-        log.debug(
-                "Captured {} application arguments for restart capability",
-                args.getSourceArgs().length);
-    }
-}
@@ -1,84 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.File;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import lombok.extern.slf4j.Slf4j;
-
-/** Utility class to locate JAR files at runtime for restart operations */
-@Slf4j
-public class JarPathUtil {
-
-    /**
-     * Gets the path to the currently running JAR file
-     *
-     * @return Path to the current JAR, or null if not running from a JAR
-     */
-    public static Path currentJar() {
-        try {
-            Path jar =
-                    Paths.get(
-                                    JarPathUtil.class
-                                            .getProtectionDomain()
-                                            .getCodeSource()
-                                            .getLocation()
-                                            .toURI())
-                            .toAbsolutePath();
-
-            // Check if we're actually running from a JAR (not from IDE/classes directory)
-            if (jar.toString().endsWith(".jar")) {
-                log.debug("Current JAR located at: {}", jar);
-                return jar;
-            } else {
-                log.warn("Not running from JAR, current location: {}", jar);
-                return null;
-            }
-        } catch (URISyntaxException e) {
-            log.error("Failed to determine current JAR location", e);
-            return null;
-        }
-    }
-
-    /**
-     * Gets the path to the restart-helper.jar file Expected to be in the same directory as the main
-     * JAR
-     *
-     * @return Path to restart-helper.jar, or null if not found
-     */
-    public static Path restartHelperJar() {
-        Path appJar = currentJar();
-        if (appJar == null) {
-            return null;
-        }
-
-        Path helperJar = appJar.getParent().resolve("restart-helper.jar");
-
-        if (Files.isRegularFile(helperJar)) {
-            log.debug("Restart helper JAR located at: {}", helperJar);
-            return helperJar;
-        } else {
-            log.warn("Restart helper JAR not found at: {}", helperJar);
-            return null;
-        }
-    }
-
-    /**
-     * Gets the java binary path for the current JVM
-     *
-     * @return Path to java executable
-     */
-    public static String javaExecutable() {
-        String javaHome = System.getProperty("java.home");
-        String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
-
-        // On Windows, add .exe extension
-        if (System.getProperty("os.name").toLowerCase().contains("win")) {
-            javaBin += ".exe";
-        }
-
-        return javaBin;
-    }
-}
@@ -1,6 +1,7 @@
 package stirling.software.common.annotations;

 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.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -72,6 +73,8 @@ class AutoJobPostMappingIntegrationTest {

    @Captor private ArgumentCaptor<Integer> resourceWeightCaptor;

+    @Captor private ArgumentCaptor<Boolean> trackProgressCaptor;
+
    @Test
    void shouldExecuteWithCustomParameters() throws Throwable {
        // Given
@@ -91,7 +94,12 @@ class AutoJobPostMappingIntegrationTest {
        when(fileStorage.retrieveFile("test-file-id")).thenReturn(mockFile);

        when(jobExecutorService.runJobGeneric(
-                        anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
+                        anyBoolean(),
+                        any(Supplier.class),
+                        anyLong(),
+                        anyBoolean(),
+                        anyInt(),
+                        anyBoolean()))
                .thenReturn(ResponseEntity.ok("success"));

        // When
@@ -106,12 +114,14 @@ class AutoJobPostMappingIntegrationTest {
                        workCaptor.capture(),
                        timeoutCaptor.capture(),
                        queueableCaptor.capture(),
-                        resourceWeightCaptor.capture());
+                        resourceWeightCaptor.capture(),
+                        trackProgressCaptor.capture());

        assertTrue(asyncCaptor.getValue(), "Async should be true");
        assertEquals(60000L, timeoutCaptor.getValue(), "Timeout should be 60000ms");
        assertTrue(queueableCaptor.getValue(), "Queueable should be true");
        assertEquals(75, resourceWeightCaptor.getValue(), "Resource weight should be 75");
+        assertTrue(trackProgressCaptor.getValue(), "Track progress should propagate");

        // Test that file was resolved
        assertNotNull(pdfFile.getFileInput(), "File input should be set");
@@ -135,7 +145,12 @@ class AutoJobPostMappingIntegrationTest {

        // Mock jobExecutorService to execute the work immediately
        when(jobExecutorService.runJobGeneric(
-                        anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
+                        anyBoolean(),
+                        any(Supplier.class),
+                        anyLong(),
+                        anyBoolean(),
+                        anyInt(),
+                        anyBoolean()))
                .thenAnswer(
                        invocation -> {
                            Supplier<Object> work = invocation.getArgument(1);
@@ -150,6 +165,16 @@ class AutoJobPostMappingIntegrationTest {

        // Verify that proceed was called twice (initial attempt + 1 retry)
        verify(joinPoint, times(2)).proceed(any());
+
+        verify(jobExecutorService)
+                .runJobGeneric(
+                        asyncCaptor.capture(),
+                        workCaptor.capture(),
+                        timeoutCaptor.capture(),
+                        queueableCaptor.capture(),
+                        resourceWeightCaptor.capture(),
+                        trackProgressCaptor.capture());
+        assertFalse(trackProgressCaptor.getValue(), "Track progress should be false when disabled");
    }

    @Test
@@ -168,7 +193,12 @@ class AutoJobPostMappingIntegrationTest {

        // Mock job executor to return a successful response
        when(jobExecutorService.runJobGeneric(
-                        anyBoolean(), any(Supplier.class), anyLong(), anyBoolean(), anyInt()))
+                        anyBoolean(),
+                        any(Supplier.class),
+                        anyLong(),
+                        anyBoolean(),
+                        anyInt(),
+                        anyBoolean()))
                .thenReturn(ResponseEntity.ok("success"));

        // When
@@ -112,11 +112,19 @@ class ApplicationPropertiesLogicTest {
    @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());
    }

@@ -94,7 +94,7 @@ class JobExecutorServiceTest {
        assertNotNull(jobResponse.getJobId());

        // Verify task manager was called
-        verify(taskManager).createTask(jobIdCaptor.capture());
+        verify(taskManager).createTask(jobIdCaptor.capture(), eq(true));
    }

    @Test
@@ -129,7 +129,8 @@ class JobExecutorServiceTest {
        when(jobQueue.queueJob(anyString(), eq(80), any(), anyLong())).thenReturn(future);

        // When
-        ResponseEntity<?> response = jobExecutorService.runJobGeneric(true, work, 5000, true, 80);
+        ResponseEntity<?> response =
+                jobExecutorService.runJobGeneric(true, work, 5000, true, 80, true);

        // Then
        assertEquals(HttpStatus.OK, response.getStatusCode());
@@ -137,7 +138,7 @@ class JobExecutorServiceTest {

        // Verify job was queued
        verify(jobQueue).queueJob(anyString(), eq(80), any(), eq(5000L));
-        verify(taskManager).createTask(anyString());
+        verify(taskManager).createTask(anyString(), eq(true));
    }

    @Test
@@ -0,0 +1,83 @@
+package stirling.software.common.service;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import stirling.software.common.context.JobContextHolder;
+
+class JobProgressServiceTest {
+
+    @Mock private TaskManager taskManager;
+
+    private JobProgressService jobProgressService;
+
+    private AutoCloseable mocks;
+
+    @BeforeEach
+    void setUp() {
+        mocks = MockitoAnnotations.openMocks(this);
+        jobProgressService = new JobProgressService(taskManager);
+        JobContextHolder.clear();
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        JobContextHolder.clear();
+        mocks.close();
+    }
+
+    @Test
+    void updateProgressReturnsFalseWhenNoContext() {
+        boolean updated = jobProgressService.updateProgress(10, "Stage");
+        assertFalse(updated);
+        verify(taskManager, never()).updateProgress(anyString(), anyInt(), anyString());
+    }
+
+    @Test
+    void updateProgressDelegatesToTaskManager() {
+        JobContextHolder.setContext("job-123", true);
+        when(taskManager.updateProgress("job-123", 20, "Processing")).thenReturn(true);
+
+        boolean updated = jobProgressService.updateProgress(20, "Processing");
+
+        assertTrue(updated);
+        verify(taskManager).updateProgress("job-123", 20, "Processing");
+    }
+
+    @Test
+    void trackerNoOpsWhenDisabled() {
+        JobContextHolder.setContext("job-123", false);
+        JobProgressTracker tracker = jobProgressService.tracker(5, "Start");
+
+        assertFalse(tracker.isEnabled());
+        tracker.advanceBy(1, "Step");
+        tracker.complete("Done");
+
+        verify(taskManager, never()).updateProgress(anyString(), anyInt(), anyString());
+    }
+
+    @Test
+    void trackerPublishesProgress() {
+        JobContextHolder.setContext("job-123", true);
+        JobProgressTracker tracker = jobProgressService.tracker(4, "Starting");
+
+        assertTrue(tracker.isEnabled());
+        verify(taskManager).updateProgress("job-123", 0, "Starting");
+
+        tracker.advanceBy(1, "25 percent");
+        tracker.advanceBy(1, "50 percent");
+        tracker.setStepsCompleted(3, "75 percent");
+        tracker.complete("Done");
+
+        verify(taskManager).updateProgress("job-123", 25, "25 percent");
+        verify(taskManager).updateProgress("job-123", 50, "50 percent");
+        verify(taskManager).updateProgress("job-123", 75, "75 percent");
+        verify(taskManager).updateProgress("job-123", 100, "Done");
+    }
+}
@@ -50,6 +50,9 @@ class TaskManagerTest {
        assertEquals(jobId, result.getJobId());
        assertFalse(result.isComplete());
        assertNotNull(result.getCreatedAt());
+        assertTrue(result.isTrackProgress());
+        assertEquals(0, result.getProgressPercent());
+        assertEquals("Pending", result.getProgressMessage());
    }

    @Test
@@ -68,6 +71,8 @@ class TaskManagerTest {
        assertTrue(result.isComplete());
        assertEquals(resultObject, result.getResult());
        assertNotNull(result.getCompletedAt());
+        assertEquals(100, result.getProgressPercent());
+        assertEquals("Completed", result.getProgressMessage());
    }

    @Test
@@ -120,6 +125,8 @@ class TaskManagerTest {
        assertTrue(result.isComplete());
        assertEquals(errorMessage, result.getError());
        assertNotNull(result.getCompletedAt());
+        assertEquals(100, result.getProgressPercent());
+        assertEquals(errorMessage, result.getProgressMessage());
    }

    @Test
@@ -138,6 +145,7 @@ class TaskManagerTest {
        assertNotNull(result);
        assertTrue(result.isComplete());
        assertEquals(resultObject, result.getResult());
+        assertEquals(100, result.getProgressPercent());
    }

    @Test
@@ -154,6 +162,8 @@ class TaskManagerTest {
        assertNotNull(result);
        assertTrue(result.isComplete());
        assertEquals("Task completed successfully", result.getResult());
+        assertEquals(100, result.getProgressPercent());
+        assertEquals("Completed", result.getProgressMessage());
    }

    @Test
@@ -305,4 +315,45 @@ class TaskManagerTest {
        // Assert
        assertFalse(result);
    }
+
+    @Test
+    void testCreateTaskWithoutProgressTracking() {
+        String jobId = UUID.randomUUID().toString();
+        taskManager.createTask(jobId, false);
+
+        JobResult result = taskManager.getJobResult(jobId);
+        assertNotNull(result);
+        assertFalse(result.isTrackProgress());
+        assertNull(result.getProgressPercent());
+        assertNull(result.getProgressMessage());
+    }
+
+    @Test
+    void testUpdateProgress() {
+        String jobId = UUID.randomUUID().toString();
+        taskManager.createTask(jobId);
+
+        boolean updated = taskManager.updateProgress(jobId, 50, "Halfway there");
+
+        assertTrue(updated);
+        JobResult result = taskManager.getJobResult(jobId);
+        assertEquals(50, result.getProgressPercent());
+        assertEquals("Halfway there", result.getProgressMessage());
+        assertNotNull(result.getProgressUpdatedAt());
+    }
+
+    @Test
+    void testUpdateProgressReturnsFalseWhenJobMissing() {
+        boolean updated = taskManager.updateProgress("missing", 10, "Stage");
+        assertFalse(updated);
+    }
+
+    @Test
+    void testUpdateProgressIgnoredWhenTrackingDisabled() {
+        String jobId = UUID.randomUUID().toString();
+        taskManager.createTask(jobId, false);
+
+        boolean updated = taskManager.updateProgress(jobId, 75, "Stage");
+        assertFalse(updated);
+    }
 }
@@ -1,49 +1,22 @@
 package stirling.software.SPDF.config;

 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

 import lombok.RequiredArgsConstructor;

-import stirling.software.common.model.ApplicationProperties;
-
@Configuration
@RequiredArgsConstructor
 public class WebMvcConfig implements WebMvcConfigurer {

    private final EndpointInterceptor endpointInterceptor;
-    private final ApplicationProperties applicationProperties;

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
        registry.addInterceptor(endpointInterceptor);
    }

-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        // Only configure CORS if allowed origins are specified
-        if (applicationProperties.getSystem() != null
-                && applicationProperties.getSystem().getCorsAllowedOrigins() != null
-                && !applicationProperties.getSystem().getCorsAllowedOrigins().isEmpty()) {
-
-            String[] allowedOrigins =
-                    applicationProperties
-                            .getSystem()
-                            .getCorsAllowedOrigins()
-                            .toArray(new String[0]);
-
-            registry.addMapping("/**")
-                    .allowedOrigins(allowedOrigins)
-                    .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
-                    .allowedHeaders("*")
-                    .allowCredentials(true)
-                    .maxAge(3600);
-        }
-        // If no origins are configured, CORS is not enabled (secure by default)
-    }
-
    // @Override
    // public void addResourceHandlers(ResourceHandlerRegistry registry) {
    //     // Handler for external static resources - DISABLED in backend-only mode
@@ -22,12 +22,15 @@ import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.AnalysisApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;

@AnalysisApi
@RequiredArgsConstructor
 public class AnalysisController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/page-count", consumes = "multipart/form-data")
    @JsonDataResponse
@@ -89,12 +92,22 @@ public class AnalysisController {
        try (PDDocument document = pdfDocumentFactory.load(file.getFileInput())) {
            List<Map<String, Float>> dimensions = new ArrayList<>();
            PDPageTree pages = document.getPages();
+            JobProgressTracker progressTracker =
+                    jobProgressService.tracker(Math.max(1, pages.getCount()));
+            boolean trackProgress = progressTracker.isEnabled();

            for (PDPage page : pages) {
                Map<String, Float> pageDim = new HashMap<>();
                pageDim.put("width", page.getBBox().getWidth());
                pageDim.put("height", page.getBBox().getHeight());
                dimensions.add(pageDim);
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
+            }
+
+            if (trackProgress) {
+                progressTracker.complete();
            }
            return dimensions;
        }
@@ -134,13 +147,24 @@ public class AnalysisController {
            Map<String, Object> annotInfo = new HashMap<>();
            int totalAnnotations = 0;
            Map<String, Integer> annotationTypes = new HashMap<>();
+            PDPageTree pages = document.getPages();
+            JobProgressTracker progressTracker =
+                    jobProgressService.tracker(Math.max(1, pages.getCount()));
+            boolean trackProgress = progressTracker.isEnabled();

-            for (PDPage page : document.getPages()) {
+            for (PDPage page : pages) {
                for (PDAnnotation annot : page.getAnnotations()) {
                    totalAnnotations++;
                    String subType = annot.getSubtype();
                    annotationTypes.merge(subType, 1, Integer::sum);
                }
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
+            }
+
+            if (trackProgress) {
+                progressTracker.complete();
            }

            annotInfo.put("totalCount", totalAnnotations);
@@ -160,10 +184,22 @@ public class AnalysisController {
            Map<String, Object> fontInfo = new HashMap<>();
            Set<String> fontNames = new HashSet<>();

-            for (PDPage page : document.getPages()) {
+            PDPageTree pages = document.getPages();
+            JobProgressTracker progressTracker =
+                    jobProgressService.tracker(Math.max(1, pages.getCount()));
+            boolean trackProgress = progressTracker.isEnabled();
+
+            for (PDPage page : pages) {
                for (COSName font : page.getResources().getFontNames()) {
                    fontNames.add(font.getName());
                }
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
+            }
+
+            if (trackProgress) {
+                progressTracker.complete();
            }

            fontInfo.put("fontCount", fontNames.size());
@@ -28,6 +28,8 @@ import lombok.RequiredArgsConstructor;
 import stirling.software.SPDF.model.api.general.BookletImpositionRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -37,6 +39,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class BookletImpositionController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/booklet-imposition", consumes = "multipart/form-data")
    @Operation(
@@ -68,21 +71,31 @@ public class BookletImpositionController {
        PDDocument sourceDocument = pdfDocumentFactory.load(file);
        int totalPages = sourceDocument.getNumberOfPages();

+        List<Side> sides = saddleStitchSides(totalPages, doubleSided, duplexPass, flipOnShortEdge);
+        JobProgressTracker progressTracker = jobProgressService.tracker(Math.max(1, sides.size()));
+        boolean trackProgress = progressTracker.isEnabled();
+
        // Create proper booklet with signature-based page ordering
        PDDocument newDocument =
                createSaddleBooklet(
                        sourceDocument,
-                        totalPages,
                        addBorder,
                        spineLocation,
                        addGutter,
                        gutterSize,
                        doubleSided,
                        duplexPass,
-                        flipOnShortEdge);
+                        flipOnShortEdge,
+                        sides,
+                        progressTracker,
+                        trackProgress);

        sourceDocument.close();

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        newDocument.save(baos);
        newDocument.close();
@@ -154,14 +167,16 @@ public class BookletImpositionController {

    private PDDocument createSaddleBooklet(
            PDDocument src,
-            int totalPages,
            boolean addBorder,
            String spineLocation,
            boolean addGutter,
            float gutterSize,
            boolean doubleSided,
            String duplexPass,
-            boolean flipOnShortEdge)
+            boolean flipOnShortEdge,
+            List<Side> sides,
+            JobProgressTracker progressTracker,
+            boolean trackProgress)
            throws IOException {

        PDDocument dst = pdfDocumentFactory.createNewDocumentBasedOnOldDocument(src);
@@ -176,8 +191,6 @@ public class BookletImpositionController {
        if (gutterSize < 0) gutterSize = 0;
        if (gutterSize >= pageSize.getWidth() / 2f) gutterSize = pageSize.getWidth() / 2f - 1f;

-        List<Side> sides = saddleStitchSides(totalPages, doubleSided, duplexPass, flipOnShortEdge);
-
        for (Side side : sides) {
            PDPage out = new PDPage(pageSize);
            dst.addPage(out);
@@ -234,6 +247,10 @@ public class BookletImpositionController {
                        cellH,
                        addBorder);
            }
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
        return dst;
    }
@@ -22,6 +22,8 @@ import stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

@GeneralApi
@@ -29,6 +31,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class CropController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/crop", consumes = "multipart/form-data")
    @StandardPdfResponse
@@ -44,6 +47,8 @@ public class CropController {
                pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);

        int totalPages = sourceDocument.getNumberOfPages();
+        JobProgressTracker progressTracker = jobProgressService.tracker(Math.max(1, totalPages));
+        boolean trackProgress = progressTracker.isEnabled();

        LayerUtility layerUtility = new LayerUtility(newDocument);

@@ -80,6 +85,10 @@ public class CropController {
                            request.getY(),
                            request.getWidth(),
                            request.getHeight()));
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -87,6 +96,10 @@ public class CropController {
        newDocument.close();
        sourceDocument.close();

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        byte[] pdfContent = baos.toByteArray();
        return WebResponseUtils.bytesToWebResponse(
                pdfContent,
@@ -37,6 +37,8 @@ import stirling.software.SPDF.model.api.general.MergePdfsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.PdfErrorUtils;
@@ -48,6 +50,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class MergeController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    // Merges a list of PDDocument objects into a single PDDocument
    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
@@ -204,6 +207,10 @@ public class MergeController {
                    getSortComparator(
                            request.getSortType())); // Sort files based on the given sort type

+            JobProgressTracker progressTracker =
+                    jobProgressService.tracker(Math.max(1, files.length) + 4);
+            boolean trackProgress = progressTracker.isEnabled();
+
            PDFMergerUtility mergerUtility = new PDFMergerUtility();
            long totalSize = 0;
            List<Integer> invalidIndexes = new ArrayList<>();
@@ -224,6 +231,10 @@ public class MergeController {
                    invalidIndexes.add(index);
                }
                mergerUtility.addSource(tempFile); // Add source file to the merger utility
+
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
            }

            if (!invalidIndexes.isEmpty()) {
@@ -243,6 +254,8 @@ public class MergeController {
                                "{\"errorFileIds\":%s,\"message\":\"Some of the selected files can't be merged\"}",
                                errorFileIds.toString());

+                jobProgressService.updateProgress(100, null);
+
                return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
                        .header("Content-Type", MediaType.APPLICATION_JSON_VALUE)
                        .body(payload.getBytes(StandardCharsets.UTF_8));
@@ -251,6 +264,10 @@ public class MergeController {
            mergedTempFile = Files.createTempFile("merged-", ".pdf").toFile();
            mergerUtility.setDestinationFileName(mergedTempFile.getAbsolutePath());

+            if (trackProgress) {
+                progressTracker.advance();
+            }
+
            try {
                mergerUtility.mergeDocuments(
                        pdfDocumentFactory.getStreamCacheFunction(
@@ -289,10 +306,18 @@ public class MergeController {
                addTableOfContents(mergedDocument, files);
            }

+            if (trackProgress) {
+                progressTracker.advance();
+            }
+
            // Save the modified document to a new ByteArrayOutputStream
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            mergedDocument.save(baos);

+            if (trackProgress) {
+                progressTracker.complete();
+            }
+
            String mergedFileName =
                    files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "")
                            + "_merged_unsigned.pdf";
@@ -25,6 +25,8 @@ import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

@GeneralApi
@@ -32,6 +34,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class MultiPageLayoutController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
    @StandardPdfResponse
@@ -66,6 +69,8 @@ public class MultiPageLayoutController {
        newDocument.addPage(newPage);

        int totalPages = sourceDocument.getNumberOfPages();
+        JobProgressTracker progressTracker = jobProgressService.tracker(Math.max(1, totalPages));
+        boolean trackProgress = progressTracker.isEnabled();
        float cellWidth = newPage.getMediaBox().getWidth() / cols;
        float cellHeight = newPage.getMediaBox().getHeight() / rows;

@@ -126,6 +131,10 @@ public class MultiPageLayoutController {
                contentStream.addRect(borderX, borderY, cellWidth, cellHeight);
                contentStream.stroke();
            }
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        contentStream.close(); // Close the final content stream
@@ -135,6 +144,10 @@ public class MultiPageLayoutController {
        newDocument.save(baos);
        newDocument.close();

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        byte[] result = baos.toByteArray();
        return WebResponseUtils.bytesToWebResponse(
                result,
@@ -17,6 +17,8 @@ import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

 /**
@@ -32,6 +34,8 @@ public class PdfImageRemovalController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

+    private final JobProgressService jobProgressService;
+
    /**
     * Endpoint to remove images from a PDF file.
     *
@@ -54,8 +58,13 @@ public class PdfImageRemovalController {
        // Load the PDF document
        PDDocument document = pdfDocumentFactory.load(file);

+        int pageCount = Math.max(1, document.getNumberOfPages());
+        JobProgressTracker progressTracker = jobProgressService.tracker(pageCount + 1);
+        boolean trackProgress = progressTracker.isEnabled();
+
        // Remove images from the PDF document using the service
-        PDDocument modifiedDocument = pdfImageRemovalService.removeImagesFromPdf(document);
+        PDDocument modifiedDocument =
+                pdfImageRemovalService.removeImagesFromPdf(document, progressTracker);

        // Create a ByteArrayOutputStream to hold the modified PDF data
        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -69,6 +78,10 @@ public class PdfImageRemovalController {
                file.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
                        + "_removed_images.pdf";

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        // Convert the byte array to a web response and return it
        return WebResponseUtils.bytesToWebResponse(outputStream.toByteArray(), mergedFileName);
    }
@@ -27,6 +27,8 @@ import stirling.software.SPDF.model.api.general.OverlayPdfsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@@ -35,6 +37,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class PdfOverlayController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
    @StandardPdfResponse
@@ -63,13 +66,17 @@ public class PdfOverlayController {

            try (PDDocument basePdf = pdfDocumentFactory.load(baseFile);
                    Overlay overlay = new Overlay()) {
+                JobProgressTracker progressTracker =
+                        jobProgressService.tracker(basePdf.getNumberOfPages() + 1);
+                boolean trackProgress = progressTracker.isEnabled();
                Map<Integer, String> overlayGuide =
                        prepareOverlayGuide(
                                basePdf.getNumberOfPages(),
                                overlayPdfFiles,
                                mode,
                                counts,
-                                tempFiles);
+                                tempFiles,
+                                progressTracker);

                overlay.setInputPDF(basePdf);
                if (overlayPos == 0) {
@@ -80,6 +87,13 @@ public class PdfOverlayController {

                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                overlay.overlay(overlayGuide).save(outputStream);
+
+                if (trackProgress) {
+                    progressTracker.advance();
+                    progressTracker.complete();
+                } else {
+                    jobProgressService.updateProgress(100, null);
+                }
                byte[] data = outputStream.toByteArray();
                String outputFilename =
                        Filenames.toSimpleFileName(baseFile.getOriginalFilename())
@@ -104,18 +118,25 @@ public class PdfOverlayController {
    }

    private Map<Integer, String> prepareOverlayGuide(
-            int basePageCount, File[] overlayFiles, String mode, int[] counts, List<File> tempFiles)
+            int basePageCount,
+            File[] overlayFiles,
+            String mode,
+            int[] counts,
+            List<File> tempFiles,
+            JobProgressTracker progressTracker)
            throws IOException {
        Map<Integer, String> overlayGuide = new HashMap<>();
        switch (mode) {
            case "SequentialOverlay":
-                sequentialOverlay(overlayGuide, overlayFiles, basePageCount, tempFiles);
+                sequentialOverlay(
+                        overlayGuide, overlayFiles, basePageCount, tempFiles, progressTracker);
                break;
            case "InterleavedOverlay":
-                interleavedOverlay(overlayGuide, overlayFiles, basePageCount);
+                interleavedOverlay(overlayGuide, overlayFiles, basePageCount, progressTracker);
                break;
            case "FixedRepeatOverlay":
-                fixedRepeatOverlay(overlayGuide, overlayFiles, counts, basePageCount);
+                fixedRepeatOverlay(
+                        overlayGuide, overlayFiles, counts, basePageCount, progressTracker);
                break;
            default:
                throw new IllegalArgumentException("Invalid overlay mode");
@@ -127,10 +148,12 @@ public class PdfOverlayController {
            Map<Integer, String> overlayGuide,
            File[] overlayFiles,
            int basePageCount,
-            List<File> tempFiles)
+            List<File> tempFiles,
+            JobProgressTracker progressTracker)
            throws IOException {
        int overlayFileIndex = 0;
        int pageCountInCurrentOverlay = 0;
+        boolean trackProgress = progressTracker.isEnabled();

        for (int basePageIndex = 1; basePageIndex <= basePageCount; basePageIndex++) {
            if (pageCountInCurrentOverlay == 0
@@ -152,6 +175,10 @@ public class PdfOverlayController {
            }

            pageCountInCurrentOverlay++;
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
    }

@@ -162,8 +189,12 @@ public class PdfOverlayController {
    }

    private void interleavedOverlay(
-            Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount)
+            Map<Integer, String> overlayGuide,
+            File[] overlayFiles,
+            int basePageCount,
+            JobProgressTracker progressTracker)
            throws IOException {
+        boolean trackProgress = progressTracker.isEnabled();
        for (int basePageIndex = 1; basePageIndex <= basePageCount; basePageIndex++) {
            File overlayFile = overlayFiles[(basePageIndex - 1) % overlayFiles.length];

@@ -174,17 +205,26 @@ public class PdfOverlayController {
                    overlayGuide.put(basePageIndex, overlayFile.getAbsolutePath());
                }
            }
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
    }

    private void fixedRepeatOverlay(
-            Map<Integer, String> overlayGuide, File[] overlayFiles, int[] counts, int basePageCount)
+            Map<Integer, String> overlayGuide,
+            File[] overlayFiles,
+            int[] counts,
+            int basePageCount,
+            JobProgressTracker progressTracker)
            throws IOException {
        if (overlayFiles.length != counts.length) {
            throw new IllegalArgumentException(
                    "Counts array length must match the number of overlay files");
        }
        int currentPage = 1;
+        boolean trackProgress = progressTracker.isEnabled();
        for (int i = 0; i < overlayFiles.length; i++) {
            File overlayFile = overlayFiles[i];
            int repeatCount = counts[i];
@@ -196,6 +236,9 @@ public class PdfOverlayController {
                    for (int page = 0; page < overlayPageCount; page++) {
                        if (currentPage > basePageCount) break;
                        overlayGuide.put(currentPage++, overlayFile.getAbsolutePath());
+                        if (trackProgress) {
+                            progressTracker.advance();
+                        }
                    }
                }
            }
@@ -24,6 +24,8 @@ import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
@@ -34,6 +36,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class RearrangePagesPDFController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/remove-pages")
    @StandardPdfResponse
@@ -59,9 +62,20 @@ public class RearrangePagesPDFController {

        Collections.sort(pagesToRemove);

+        JobProgressTracker progressTracker =
+                jobProgressService.tracker(Math.max(1, pagesToRemove.size()));
+        boolean trackProgress = progressTracker.isEnabled();
+
        for (int i = pagesToRemove.size() - 1; i >= 0; i--) {
            int pageIndex = pagesToRemove.get(i);
            document.removePage(pageIndex);
+            if (trackProgress) {
+                progressTracker.advance();
+            }
+        }
+
+        if (trackProgress) {
+            progressTracker.complete();
        }
        return WebResponseUtils.pdfDocToWebResponse(
                document,
@@ -272,14 +286,30 @@ public class RearrangePagesPDFController {
                newPages.add(document.getPage(newPageOrder.get(i)));
            }

+            int removalSteps = document.getNumberOfPages();
+            int additionSteps = newPages.size();
+            JobProgressTracker progressTracker =
+                    jobProgressService.tracker(Math.max(1, removalSteps + additionSteps));
+            boolean trackProgress = progressTracker.isEnabled();
+
            // Remove all the pages from the original document
            for (int i = document.getNumberOfPages() - 1; i >= 0; i--) {
                document.removePage(i);
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
            }

            // Add the pages in the new order
            for (PDPage page : newPages) {
                document.addPage(page);
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
+            }
+
+            if (trackProgress) {
+                progressTracker.complete();
            }

            return WebResponseUtils.pdfDocToWebResponse(
@@ -19,6 +19,8 @@ import stirling.software.SPDF.model.api.general.RotatePDFRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;

@@ -27,6 +29,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class RotationController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/rotate-pdf")
    @StandardPdfResponse
@@ -51,9 +54,19 @@ public class RotationController {

        // Get the list of pages in the document
        PDPageTree pages = document.getPages();
+        int totalPages = Math.max(1, pages.getCount());
+        JobProgressTracker progressTracker = jobProgressService.tracker(totalPages);
+        boolean trackProgress = progressTracker.isEnabled();

        for (PDPage page : pages) {
            page.setRotation(page.getRotation() + angle);
+            if (trackProgress) {
+                progressTracker.advance();
+            }
+        }
+
+        if (trackProgress) {
+            progressTracker.complete();
        }

        return WebResponseUtils.pdfDocToWebResponse(
@@ -26,6 +26,8 @@ import stirling.software.SPDF.model.api.general.ScalePagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;

@@ -34,6 +36,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class ScalePagesController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/scale-pages", consumes = "multipart/form-data")
    @StandardPdfResponse
@@ -55,6 +58,8 @@ public class ScalePagesController {
        PDRectangle targetSize = getTargetSize(targetPDRectangle, sourceDocument);

        int totalPages = sourceDocument.getNumberOfPages();
+        JobProgressTracker progressTracker = jobProgressService.tracker(Math.max(1, totalPages));
+        boolean trackProgress = progressTracker.isEnabled();
        for (int i = 0; i < totalPages; i++) {
            PDPage sourcePage = sourceDocument.getPage(i);
            PDRectangle sourceSize = sourcePage.getMediaBox();
@@ -87,6 +92,10 @@ public class ScalePagesController {

            contentStream.restoreGraphicsState();
            contentStream.close();
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -94,6 +103,10 @@ public class ScalePagesController {
        outputDocument.close();
        sourceDocument.close();

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        return WebResponseUtils.bytesToWebResponse(
                baos.toByteArray(),
                Filenames.toSimpleFileName(file.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
@@ -1,15 +1,12 @@
 package stirling.software.SPDF.controller.api;

 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;

 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;

 import io.swagger.v3.oas.annotations.Hidden;

@@ -32,7 +29,7 @@ public class SettingsController {

    @AutoJobPostMapping("/update-enable-analytics")
    @Hidden
-    public ResponseEntity<String> updateApiKey(@RequestParam Boolean enabled) throws IOException {
+    public ResponseEntity<String> updateApiKey(@RequestBody Boolean enabled) throws IOException {
        if (applicationProperties.getSystem().getEnableAnalytics() != null) {
            return ResponseEntity.status(HttpStatus.ALREADY_REPORTED)
                    .body(
@@ -49,392 +46,4 @@ public class SettingsController {
    public ResponseEntity<Map<String, Boolean>> getDisabledEndpoints() {
        return ResponseEntity.ok(endpointConfiguration.getEndpointStatuses());
    }
-
-    // ========== GENERAL SETTINGS ==========
-
-    @GetMapping("/admin/settings/general")
-    @Hidden
-    public ResponseEntity<Map<String, Object>> getGeneralSettings() {
-        Map<String, Object> settings = new HashMap<>();
-        settings.put("ui", applicationProperties.getUi());
-        settings.put(
-                "system",
-                Map.of(
-                        "defaultLocale", applicationProperties.getSystem().getDefaultLocale(),
-                        "showUpdate", applicationProperties.getSystem().isShowUpdate(),
-                        "showUpdateOnlyAdmin",
-                                applicationProperties.getSystem().getShowUpdateOnlyAdmin(),
-                        "customHTMLFiles", applicationProperties.getSystem().isCustomHTMLFiles(),
-                        "fileUploadLimit", applicationProperties.getSystem().getFileUploadLimit()));
-        return ResponseEntity.ok(settings);
-    }
-
-    @PostMapping("/admin/settings/general")
-    @Hidden
-    public ResponseEntity<String> updateGeneralSettings(@RequestBody Map<String, Object> settings)
-            throws IOException {
-        // Update UI settings
-        if (settings.containsKey("ui")) {
-            Map<String, String> ui = (Map<String, String>) settings.get("ui");
-            if (ui.containsKey("appNameNavbar")) {
-                GeneralUtils.saveKeyToSettings("ui.appNameNavbar", ui.get("appNameNavbar"));
-                applicationProperties.getUi().setAppNameNavbar(ui.get("appNameNavbar"));
-            }
-        }
-
-        // Update System settings
-        if (settings.containsKey("system")) {
-            Map<String, Object> system = (Map<String, Object>) settings.get("system");
-            if (system.containsKey("defaultLocale")) {
-                GeneralUtils.saveKeyToSettings("system.defaultLocale", system.get("defaultLocale"));
-                applicationProperties
-                        .getSystem()
-                        .setDefaultLocale((String) system.get("defaultLocale"));
-            }
-            if (system.containsKey("showUpdate")) {
-                GeneralUtils.saveKeyToSettings("system.showUpdate", system.get("showUpdate"));
-                applicationProperties.getSystem().setShowUpdate((Boolean) system.get("showUpdate"));
-            }
-            if (system.containsKey("showUpdateOnlyAdmin")) {
-                GeneralUtils.saveKeyToSettings(
-                        "system.showUpdateOnlyAdmin", system.get("showUpdateOnlyAdmin"));
-                applicationProperties
-                        .getSystem()
-                        .setShowUpdateOnlyAdmin((Boolean) system.get("showUpdateOnlyAdmin"));
-            }
-            if (system.containsKey("fileUploadLimit")) {
-                GeneralUtils.saveKeyToSettings(
-                        "system.fileUploadLimit", system.get("fileUploadLimit"));
-                applicationProperties
-                        .getSystem()
-                        .setFileUploadLimit((String) system.get("fileUploadLimit"));
-            }
-        }
-
-        return ResponseEntity.ok(
-                "General settings updated. Restart required for changes to take effect.");
-    }
-
-    // ========== SECURITY SETTINGS ==========
-
-    @GetMapping("/admin/settings/security")
-    @Hidden
-    public ResponseEntity<Map<String, Object>> getSecuritySettings() {
-        Map<String, Object> settings = new HashMap<>();
-        ApplicationProperties.Security security = applicationProperties.getSecurity();
-
-        settings.put("enableLogin", security.getEnableLogin());
-        settings.put("csrfDisabled", security.getCsrfDisabled());
-        settings.put("loginMethod", security.getLoginMethod());
-        settings.put("loginAttemptCount", security.getLoginAttemptCount());
-        settings.put("loginResetTimeMinutes", security.getLoginResetTimeMinutes());
-        settings.put(
-                "initialLogin",
-                Map.of(
-                        "username",
-                        security.getInitialLogin().getUsername() != null
-                                ? security.getInitialLogin().getUsername()
-                                : ""));
-
-        // JWT settings
-        ApplicationProperties.Security.Jwt jwt = security.getJwt();
-        settings.put(
-                "jwt",
-                Map.of(
-                        "enableKeystore", jwt.isEnableKeystore(),
-                        "enableKeyRotation", jwt.isEnableKeyRotation(),
-                        "enableKeyCleanup", jwt.isEnableKeyCleanup(),
-                        "keyRetentionDays", jwt.getKeyRetentionDays()));
-
-        return ResponseEntity.ok(settings);
-    }
-
-    @PostMapping("/admin/settings/security")
-    @Hidden
-    public ResponseEntity<String> updateSecuritySettings(@RequestBody Map<String, Object> settings)
-            throws IOException {
-        if (settings.containsKey("enableLogin")) {
-            GeneralUtils.saveKeyToSettings("security.enableLogin", settings.get("enableLogin"));
-            applicationProperties
-                    .getSecurity()
-                    .setEnableLogin((Boolean) settings.get("enableLogin"));
-        }
-        if (settings.containsKey("csrfDisabled")) {
-            GeneralUtils.saveKeyToSettings("security.csrfDisabled", settings.get("csrfDisabled"));
-            applicationProperties
-                    .getSecurity()
-                    .setCsrfDisabled((Boolean) settings.get("csrfDisabled"));
-        }
-        if (settings.containsKey("loginMethod")) {
-            GeneralUtils.saveKeyToSettings("security.loginMethod", settings.get("loginMethod"));
-            applicationProperties
-                    .getSecurity()
-                    .setLoginMethod((String) settings.get("loginMethod"));
-        }
-        if (settings.containsKey("loginAttemptCount")) {
-            GeneralUtils.saveKeyToSettings(
-                    "security.loginAttemptCount", settings.get("loginAttemptCount"));
-            applicationProperties
-                    .getSecurity()
-                    .setLoginAttemptCount((Integer) settings.get("loginAttemptCount"));
-        }
-        if (settings.containsKey("loginResetTimeMinutes")) {
-            GeneralUtils.saveKeyToSettings(
-                    "security.loginResetTimeMinutes", settings.get("loginResetTimeMinutes"));
-            applicationProperties
-                    .getSecurity()
-                    .setLoginResetTimeMinutes(
-                            ((Number) settings.get("loginResetTimeMinutes")).longValue());
-        }
-
-        // JWT settings
-        if (settings.containsKey("jwt")) {
-            Map<String, Object> jwt = (Map<String, Object>) settings.get("jwt");
-            if (jwt.containsKey("keyRetentionDays")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.jwt.keyRetentionDays", jwt.get("keyRetentionDays"));
-                applicationProperties
-                        .getSecurity()
-                        .getJwt()
-                        .setKeyRetentionDays((Integer) jwt.get("keyRetentionDays"));
-            }
-        }
-
-        return ResponseEntity.ok(
-                "Security settings updated. Restart required for changes to take effect.");
-    }
-
-    // ========== CONNECTIONS SETTINGS (OAuth/SAML) ==========
-
-    @GetMapping("/admin/settings/connections")
-    @Hidden
-    public ResponseEntity<Map<String, Object>> getConnectionsSettings() {
-        Map<String, Object> settings = new HashMap<>();
-        ApplicationProperties.Security security = applicationProperties.getSecurity();
-
-        // OAuth2 settings
-        ApplicationProperties.Security.OAUTH2 oauth2 = security.getOauth2();
-        settings.put(
-                "oauth2",
-                Map.of(
-                        "enabled", oauth2.getEnabled(),
-                        "issuer", oauth2.getIssuer() != null ? oauth2.getIssuer() : "",
-                        "clientId", oauth2.getClientId() != null ? oauth2.getClientId() : "",
-                        "provider", oauth2.getProvider() != null ? oauth2.getProvider() : "",
-                        "autoCreateUser", oauth2.getAutoCreateUser(),
-                        "blockRegistration", oauth2.getBlockRegistration(),
-                        "useAsUsername",
-                                oauth2.getUseAsUsername() != null
-                                        ? oauth2.getUseAsUsername()
-                                        : ""));
-
-        // SAML2 settings
-        ApplicationProperties.Security.SAML2 saml2 = security.getSaml2();
-        settings.put(
-                "saml2",
-                Map.of(
-                        "enabled", saml2.getEnabled(),
-                        "provider", saml2.getProvider() != null ? saml2.getProvider() : "",
-                        "autoCreateUser", saml2.getAutoCreateUser(),
-                        "blockRegistration", saml2.getBlockRegistration(),
-                        "registrationId", saml2.getRegistrationId()));
-
-        return ResponseEntity.ok(settings);
-    }
-
-    @PostMapping("/admin/settings/connections")
-    @Hidden
-    public ResponseEntity<String> updateConnectionsSettings(
-            @RequestBody Map<String, Object> settings) throws IOException {
-        // OAuth2 settings
-        if (settings.containsKey("oauth2")) {
-            Map<String, Object> oauth2 = (Map<String, Object>) settings.get("oauth2");
-            if (oauth2.containsKey("enabled")) {
-                GeneralUtils.saveKeyToSettings("security.oauth2.enabled", oauth2.get("enabled"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setEnabled((Boolean) oauth2.get("enabled"));
-            }
-            if (oauth2.containsKey("issuer")) {
-                GeneralUtils.saveKeyToSettings("security.oauth2.issuer", oauth2.get("issuer"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setIssuer((String) oauth2.get("issuer"));
-            }
-            if (oauth2.containsKey("clientId")) {
-                GeneralUtils.saveKeyToSettings("security.oauth2.clientId", oauth2.get("clientId"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setClientId((String) oauth2.get("clientId"));
-            }
-            if (oauth2.containsKey("clientSecret")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.oauth2.clientSecret", oauth2.get("clientSecret"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setClientSecret((String) oauth2.get("clientSecret"));
-            }
-            if (oauth2.containsKey("provider")) {
-                GeneralUtils.saveKeyToSettings("security.oauth2.provider", oauth2.get("provider"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setProvider((String) oauth2.get("provider"));
-            }
-            if (oauth2.containsKey("autoCreateUser")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.oauth2.autoCreateUser", oauth2.get("autoCreateUser"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setAutoCreateUser((Boolean) oauth2.get("autoCreateUser"));
-            }
-            if (oauth2.containsKey("blockRegistration")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.oauth2.blockRegistration", oauth2.get("blockRegistration"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setBlockRegistration((Boolean) oauth2.get("blockRegistration"));
-            }
-            if (oauth2.containsKey("useAsUsername")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.oauth2.useAsUsername", oauth2.get("useAsUsername"));
-                applicationProperties
-                        .getSecurity()
-                        .getOauth2()
-                        .setUseAsUsername((String) oauth2.get("useAsUsername"));
-            }
-        }
-
-        // SAML2 settings
-        if (settings.containsKey("saml2")) {
-            Map<String, Object> saml2 = (Map<String, Object>) settings.get("saml2");
-            if (saml2.containsKey("enabled")) {
-                GeneralUtils.saveKeyToSettings("security.saml2.enabled", saml2.get("enabled"));
-                applicationProperties
-                        .getSecurity()
-                        .getSaml2()
-                        .setEnabled((Boolean) saml2.get("enabled"));
-            }
-            if (saml2.containsKey("provider")) {
-                GeneralUtils.saveKeyToSettings("security.saml2.provider", saml2.get("provider"));
-                applicationProperties
-                        .getSecurity()
-                        .getSaml2()
-                        .setProvider((String) saml2.get("provider"));
-            }
-            if (saml2.containsKey("autoCreateUser")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.saml2.autoCreateUser", saml2.get("autoCreateUser"));
-                applicationProperties
-                        .getSecurity()
-                        .getSaml2()
-                        .setAutoCreateUser((Boolean) saml2.get("autoCreateUser"));
-            }
-            if (saml2.containsKey("blockRegistration")) {
-                GeneralUtils.saveKeyToSettings(
-                        "security.saml2.blockRegistration", saml2.get("blockRegistration"));
-                applicationProperties
-                        .getSecurity()
-                        .getSaml2()
-                        .setBlockRegistration((Boolean) saml2.get("blockRegistration"));
-            }
-        }
-
-        return ResponseEntity.ok(
-                "Connection settings updated. Restart required for changes to take effect.");
-    }
-
-    // ========== PRIVACY SETTINGS ==========
-
-    @GetMapping("/admin/settings/privacy")
-    @Hidden
-    public ResponseEntity<Map<String, Object>> getPrivacySettings() {
-        Map<String, Object> settings = new HashMap<>();
-
-        settings.put("enableAnalytics", applicationProperties.getSystem().getEnableAnalytics());
-        settings.put("googleVisibility", applicationProperties.getSystem().getGooglevisibility());
-        settings.put("metricsEnabled", applicationProperties.getMetrics().getEnabled());
-
-        return ResponseEntity.ok(settings);
-    }
-
-    @PostMapping("/admin/settings/privacy")
-    @Hidden
-    public ResponseEntity<String> updatePrivacySettings(@RequestBody Map<String, Object> settings)
-            throws IOException {
-        if (settings.containsKey("enableAnalytics")) {
-            GeneralUtils.saveKeyToSettings(
-                    "system.enableAnalytics", settings.get("enableAnalytics"));
-            applicationProperties
-                    .getSystem()
-                    .setEnableAnalytics((Boolean) settings.get("enableAnalytics"));
-        }
-        if (settings.containsKey("googleVisibility")) {
-            GeneralUtils.saveKeyToSettings(
-                    "system.googlevisibility", settings.get("googleVisibility"));
-            applicationProperties
-                    .getSystem()
-                    .setGooglevisibility((Boolean) settings.get("googleVisibility"));
-        }
-        if (settings.containsKey("metricsEnabled")) {
-            GeneralUtils.saveKeyToSettings("metrics.enabled", settings.get("metricsEnabled"));
-            applicationProperties.getMetrics().setEnabled((Boolean) settings.get("metricsEnabled"));
-        }
-
-        return ResponseEntity.ok(
-                "Privacy settings updated. Restart required for changes to take effect.");
-    }
-
-    // ========== ADVANCED SETTINGS ==========
-
-    @GetMapping("/admin/settings/advanced")
-    @Hidden
-    public ResponseEntity<Map<String, Object>> getAdvancedSettings() {
-        Map<String, Object> settings = new HashMap<>();
-
-        settings.put("endpoints", applicationProperties.getEndpoints());
-        settings.put(
-                "enableAlphaFunctionality",
-                applicationProperties.getSystem().getEnableAlphaFunctionality());
-        settings.put("maxDPI", applicationProperties.getSystem().getMaxDPI());
-        settings.put("enableUrlToPDF", applicationProperties.getSystem().getEnableUrlToPDF());
-        settings.put("customPaths", applicationProperties.getSystem().getCustomPaths());
-        settings.put(
-                "tempFileManagement", applicationProperties.getSystem().getTempFileManagement());
-
-        return ResponseEntity.ok(settings);
-    }
-
-    @PostMapping("/admin/settings/advanced")
-    @Hidden
-    public ResponseEntity<String> updateAdvancedSettings(@RequestBody Map<String, Object> settings)
-            throws IOException {
-        if (settings.containsKey("enableAlphaFunctionality")) {
-            GeneralUtils.saveKeyToSettings(
-                    "system.enableAlphaFunctionality", settings.get("enableAlphaFunctionality"));
-            applicationProperties
-                    .getSystem()
-                    .setEnableAlphaFunctionality(
-                            (Boolean) settings.get("enableAlphaFunctionality"));
-        }
-        if (settings.containsKey("maxDPI")) {
-            GeneralUtils.saveKeyToSettings("system.maxDPI", settings.get("maxDPI"));
-            applicationProperties.getSystem().setMaxDPI((Integer) settings.get("maxDPI"));
-        }
-        if (settings.containsKey("enableUrlToPDF")) {
-            GeneralUtils.saveKeyToSettings("system.enableUrlToPDF", settings.get("enableUrlToPDF"));
-            applicationProperties
-                    .getSystem()
-                    .setEnableUrlToPDF((Boolean) settings.get("enableUrlToPDF"));
-        }
-
-        return ResponseEntity.ok(
-                "Advanced settings updated. Restart required for changes to take effect.");
-    }
 }
@@ -28,6 +28,8 @@ import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;

@@ -37,6 +39,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class SplitPDFController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/split-pages")
    @MultiFileResponse
@@ -77,6 +80,8 @@ public class SplitPDFController {
            // split the document
            splitDocumentsBoas = new ArrayList<>();
            int previousPageNumber = 0;
+            JobProgressTracker progressTracker = jobProgressService.tracker(pageNumbers.size() + 2);
+            boolean trackProgress = progressTracker.isEnabled();
            for (int splitPoint : pageNumbers) {
                try (PDDocument splitDocument =
                        pdfDocumentFactory.createNewDocumentBasedOnOldDocument(document)) {
@@ -94,6 +99,10 @@ public class SplitPDFController {
                    splitDocument.save(baos);

                    splitDocumentsBoas.add(baos);
+
+                    if (trackProgress) {
+                        progressTracker.advance();
+                    }
                } catch (Exception e) {
                    ExceptionUtils.logException("document splitting and saving", e);
                    throw e;
@@ -128,11 +137,18 @@ public class SplitPDFController {
                throw e;
            }

+            if (trackProgress) {
+                progressTracker.advance();
+            }
+
            log.debug("Successfully created zip file with split documents: {}", zipFile.toString());
            byte[] data = Files.readAllBytes(zipFile);
            Files.deleteIfExists(zipFile);

            // return the Resource in the response
+            if (trackProgress) {
+                progressTracker.complete();
+            }
            return WebResponseUtils.bytesToWebResponse(
                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);

@@ -33,6 +33,8 @@ import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.model.PdfMetadata;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.service.PdfMetadataService;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
@@ -45,6 +47,7 @@ public class SplitPdfByChaptersController {
    private final PdfMetadataService pdfMetadataService;

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    private static List<Bookmark> extractOutlineItems(
            PDDocument sourceDocument,
@@ -178,8 +181,12 @@ public class SplitPdfByChaptersController {
                        bookmark.getStartPage(),
                        bookmark.getEndPage());
            }
+            JobProgressTracker progressTracker = jobProgressService.tracker(bookmarks.size() + 1);
+            boolean trackProgress = progressTracker.isEnabled();
+
            List<ByteArrayOutputStream> splitDocumentsBoas =
-                    getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
+                    getSplitDocumentsBoas(
+                            sourceDocument, bookmarks, includeMetadata, progressTracker);

            zipFile = createZipFile(bookmarks, splitDocumentsBoas);

@@ -190,6 +197,14 @@ public class SplitPdfByChaptersController {
                    Filenames.toSimpleFileName(file.getOriginalFilename())
                            .replaceFirst("[.][^.]+$", "");
            sourceDocument.close();
+
+            if (trackProgress) {
+                progressTracker.advance();
+                progressTracker.complete();
+            } else {
+                jobProgressService.updateProgress(100, null);
+            }
+
            return WebResponseUtils.bytesToWebResponse(
                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
        } finally {
@@ -265,13 +280,17 @@ public class SplitPdfByChaptersController {
    }

    public List<ByteArrayOutputStream> getSplitDocumentsBoas(
-            PDDocument sourceDocument, List<Bookmark> bookmarks, boolean includeMetadata)
+            PDDocument sourceDocument,
+            List<Bookmark> bookmarks,
+            boolean includeMetadata,
+            JobProgressTracker progressTracker)
            throws Exception {
        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
        PdfMetadata metadata = null;
        if (includeMetadata) {
            metadata = pdfMetadataService.extractMetadataFromPdf(sourceDocument);
        }
+        boolean trackProgress = progressTracker.isEnabled();
        for (Bookmark bookmark : bookmarks) {
            try (PDDocument splitDocument = new PDDocument()) {
                boolean isSinglePage = (bookmark.getStartPage() == bookmark.getEndPage());
@@ -291,6 +310,9 @@ public class SplitPdfByChaptersController {
                splitDocument.save(baos);

                splitDocumentsBoas.add(baos);
+                if (trackProgress) {
+                    progressTracker.advance();
+                }
            } catch (Exception e) {
                ExceptionUtils.logException("document splitting and saving", e);
                throw e;
@@ -32,6 +32,8 @@ import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

@GeneralApi
@@ -39,6 +41,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class SplitPdfBySectionsController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
    @MultiFileResponse
@@ -59,15 +62,27 @@ public class SplitPdfBySectionsController {
        int horiz = request.getHorizontalDivisions() + 1;
        int verti = request.getVerticalDivisions() + 1;
        boolean merge = Boolean.TRUE.equals(request.getMerge());
-        List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
+        int totalSections = sourceDocument.getNumberOfPages() * horiz * verti;
+        JobProgressTracker progressTracker = jobProgressService.tracker(totalSections + 1);
+        boolean trackProgress = progressTracker.isEnabled();
+        List<PDDocument> splitDocuments =
+                splitPdfPages(sourceDocument, verti, horiz, progressTracker);

        String filename =
                Filenames.toSimpleFileName(file.getOriginalFilename())
                        .replaceFirst("[.][^.]+$", "");
        if (merge) {
-            MergeController mergeController = new MergeController(pdfDocumentFactory);
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            mergeController.mergeDocuments(splitDocuments).save(baos);
+            if (trackProgress) {
+                progressTracker.advance();
+            }
+            mergeDocuments(splitDocuments).save(baos);
+            for (PDDocument doc : splitDocuments) {
+                doc.close();
+            }
+            if (trackProgress) {
+                progressTracker.complete();
+            }
            return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), filename + "_split.pdf");
        }
        for (PDDocument doc : splitDocuments) {
@@ -99,6 +114,10 @@ public class SplitPdfBySectionsController {

            zipOut.finish();
            data = Files.readAllBytes(zipFile);
+            if (trackProgress) {
+                progressTracker.advance();
+                progressTracker.complete();
+            }
            return WebResponseUtils.bytesToWebResponse(
                    data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);

@@ -107,11 +126,28 @@ public class SplitPdfBySectionsController {
        }
    }

+    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+        PDDocument merged = pdfDocumentFactory.createNewDocument();
+        for (PDDocument doc : documents) {
+            for (PDPage page : doc.getPages()) {
+                merged.addPage(page);
+            }
+        }
+        return merged;
+    }
+
    public List<PDDocument> splitPdfPages(
-            PDDocument document, int horizontalDivisions, int verticalDivisions)
+            PDDocument document,
+            int horizontalDivisions,
+            int verticalDivisions,
+            JobProgressTracker progressTracker)
            throws IOException {
        List<PDDocument> splitDocuments = new ArrayList<>();

+        int totalSections = document.getNumberOfPages() * horizontalDivisions * verticalDivisions;
+        int sectionCounter = 0;
+        boolean trackProgress = progressTracker.isEnabled();
+
        for (PDPage originalPage : document.getPages()) {
            PDRectangle originalMediaBox = originalPage.getMediaBox();
            float width = originalMediaBox.getWidth();
@@ -151,6 +187,10 @@ public class SplitPdfBySectionsController {
                    }

                    splitDocuments.add(subDoc);
+                    sectionCounter++;
+                    if (trackProgress) {
+                        progressTracker.advance();
+                    }
                }
            }
        }
@@ -25,6 +25,8 @@ import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
@@ -35,6 +37,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class SplitPdfBySizeController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
    @MultiFileResponse
@@ -78,21 +81,28 @@ public class SplitPdfBySizeController {
                    String value = request.getSplitValue();
                    log.debug("Split type: {}, Split value: {}", type, value);

+                    JobProgressTracker progressTracker =
+                            jobProgressService.tracker(sourceDocument.getNumberOfPages() + 2);
+                    boolean trackProgress = progressTracker.isEnabled();
+
                    if (type == 0) {
                        log.debug("Processing split by size");
                        long maxBytes = GeneralUtils.convertSizeToBytes(value);
                        log.debug("Max bytes per document: {}", maxBytes);
-                        handleSplitBySize(sourceDocument, maxBytes, zipOut, filename);
+                        handleSplitBySize(
+                                sourceDocument, maxBytes, zipOut, filename, progressTracker);
                    } else if (type == 1) {
                        log.debug("Processing split by page count");
                        int pageCount = Integer.parseInt(value);
                        log.debug("Pages per document: {}", pageCount);
-                        handleSplitByPageCount(sourceDocument, pageCount, zipOut, filename);
+                        handleSplitByPageCount(
+                                sourceDocument, pageCount, zipOut, filename, progressTracker);
                    } else if (type == 2) {
                        log.debug("Processing split by document count");
                        int documentCount = Integer.parseInt(value);
                        log.debug("Total number of documents: {}", documentCount);
-                        handleSplitByDocCount(sourceDocument, documentCount, zipOut, filename);
+                        handleSplitByDocCount(
+                                sourceDocument, documentCount, zipOut, filename, progressTracker);
                    } else {
                        log.error("Invalid split type: {}", type);
                        throw ExceptionUtils.createIllegalArgumentException(
@@ -102,6 +112,13 @@ public class SplitPdfBySizeController {
                    }

                    log.debug("PDF splitting completed successfully");
+
+                    if (trackProgress) {
+                        progressTracker.advance();
+                        progressTracker.complete();
+                    } else {
+                        jobProgressService.updateProgress(100, null);
+                    }
                } catch (Exception e) {
                    ExceptionUtils.logException("PDF document loading or processing", e);
                    throw e;
@@ -138,7 +155,11 @@ public class SplitPdfBySizeController {
    }

    private void handleSplitBySize(
-            PDDocument sourceDocument, long maxBytes, ZipOutputStream zipOut, String baseFilename)
+            PDDocument sourceDocument,
+            long maxBytes,
+            ZipOutputStream zipOut,
+            String baseFilename,
+            JobProgressTracker progressTracker)
            throws IOException {
        log.debug("Starting handleSplitBySize with maxBytes={}", maxBytes);

@@ -147,6 +168,7 @@ public class SplitPdfBySizeController {
        int fileIndex = 1;
        int totalPages = sourceDocument.getNumberOfPages();
        int pageAdded = 0;
+        boolean trackProgress = progressTracker.isEnabled();

        // Smart size check frequency - check more often with larger documents
        int baseCheckFrequency = 5;
@@ -251,6 +273,9 @@ public class SplitPdfBySizeController {
                    }
                }
            }
+            if (trackProgress) {
+                progressTracker.setStepsCompleted(Math.min(totalPages, pageIndex + 1));
+            }
        }

        // Save final document if it has any pages
@@ -260,13 +285,20 @@ public class SplitPdfBySizeController {
                    currentDoc.getNumberOfPages(),
                    fileIndex);
            saveDocumentToZip(currentDoc, zipOut, baseFilename, fileIndex++);
+            if (trackProgress) {
+                progressTracker.setStepsCompleted(totalPages);
+            }
        }

        log.debug("Completed handleSplitBySize with {} document parts created", fileIndex - 1);
    }

    private void handleSplitByPageCount(
-            PDDocument sourceDocument, int pageCount, ZipOutputStream zipOut, String baseFilename)
+            PDDocument sourceDocument,
+            int pageCount,
+            ZipOutputStream zipOut,
+            String baseFilename,
+            JobProgressTracker progressTracker)
            throws IOException {
        log.debug("Starting handleSplitByPageCount with pageCount={}", pageCount);
        int currentPageCount = 0;
@@ -284,12 +316,17 @@ public class SplitPdfBySizeController {
        int pageIndex = 0;
        int totalPages = sourceDocument.getNumberOfPages();
        log.debug("Processing {} pages", totalPages);
+        boolean trackProgress = progressTracker.isEnabled();

        try {
            for (PDPage page : sourceDocument.getPages()) {
                pageIndex++;
                log.debug("Processing page {} of {}", pageIndex, totalPages);

+                if (trackProgress) {
+                    progressTracker.setStepsCompleted(pageIndex);
+                }
+
                try {
                    log.debug("Adding page {} to current document", pageIndex);
                    currentDoc.addPage(page);
@@ -347,6 +384,9 @@ public class SplitPdfBySizeController {
                    log.error("Error saving final document part {}", fileIndex - 1, e);
                    throw e;
                }
+                if (trackProgress) {
+                    progressTracker.setStepsCompleted(totalPages);
+                }
            } else {
                log.debug("Final document has no pages, skipping");
            }
@@ -370,7 +410,8 @@ public class SplitPdfBySizeController {
            PDDocument sourceDocument,
            int documentCount,
            ZipOutputStream zipOut,
-            String baseFilename)
+            String baseFilename,
+            JobProgressTracker progressTracker)
            throws IOException {
        log.debug("Starting handleSplitByDocCount with documentCount={}", documentCount);
        int totalPageCount = sourceDocument.getNumberOfPages();
@@ -382,6 +423,7 @@ public class SplitPdfBySizeController {

        int currentPageIndex = 0;
        int fileIndex = 1;
+        boolean trackProgress = progressTracker.isEnabled();

        for (int i = 0; i < documentCount; i++) {
            log.debug("Creating document {} of {}", i + 1, documentCount);
@@ -407,6 +449,9 @@ public class SplitPdfBySizeController {
                    currentDoc.addPage(sourceDocument.getPage(currentPageIndex));
                    log.debug("Successfully added page {} to document {}", j + 1, i + 1);
                    currentPageIndex++;
+                    if (trackProgress) {
+                        progressTracker.setStepsCompleted(currentPageIndex);
+                    }
                } catch (Exception e) {
                    log.error("Error adding page {} to document {}", j + 1, i + 1, e);
                    throw ExceptionUtils.createFileProcessingException("split", e);
@@ -22,6 +22,8 @@ import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

@GeneralApi
@@ -29,6 +31,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class ToSinglePageController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf-to-single-page")
    @StandardPdfResponse
@@ -45,6 +48,10 @@ public class ToSinglePageController {
        // Load the source document
        PDDocument sourceDocument = pdfDocumentFactory.load(request);

+        int totalPages = Math.max(1, sourceDocument.getNumberOfPages());
+        JobProgressTracker progressTracker = jobProgressService.tracker(totalPages + 1);
+        boolean trackProgress = progressTracker.isEnabled();
+
        // Calculate total height and max width
        float totalHeight = 0;
        float maxWidth = 0;
@@ -79,6 +86,9 @@ public class ToSinglePageController {
            layerUtility.appendFormAsLayer(newPage, form, af, defaultLayerName);
            yOffset -= page.getMediaBox().getHeight();
            pageIndex++;
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -86,6 +96,10 @@ public class ToSinglePageController {
        newDocument.close();
        sourceDocument.close();

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        byte[] result = baos.toByteArray();
        return WebResponseUtils.bytesToWebResponse(
                result,
@@ -15,7 +15,6 @@ import stirling.software.common.annotations.api.ConfigApi;
 import stirling.software.common.configuration.AppConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.ServerCertificateServiceInterface;
-import stirling.software.common.service.UserServiceInterface;

@ConfigApi
@Hidden
@@ -25,21 +24,17 @@ public class ConfigController {
    private final ApplicationContext applicationContext;
    private final EndpointConfiguration endpointConfiguration;
    private final ServerCertificateServiceInterface serverCertificateService;
-    private final UserServiceInterface userService;

    public ConfigController(
            ApplicationProperties applicationProperties,
            ApplicationContext applicationContext,
            EndpointConfiguration endpointConfiguration,
            @org.springframework.beans.factory.annotation.Autowired(required = false)
-                    ServerCertificateServiceInterface serverCertificateService,
-            @org.springframework.beans.factory.annotation.Autowired(required = false)
-                    UserServiceInterface userService) {
+                    ServerCertificateServiceInterface serverCertificateService) {
        this.applicationProperties = applicationProperties;
        this.applicationContext = applicationContext;
        this.endpointConfiguration = endpointConfiguration;
        this.serverCertificateService = serverCertificateService;
-        this.userService = userService;
    }

    @GetMapping("/app-config")
@@ -56,34 +51,20 @@ public class ConfigController {
            configData.put("serverPort", appConfig.getServerPort());

            // Extract values from ApplicationProperties
+            configData.put("appName", applicationProperties.getUi().getAppName());
            configData.put("appNameNavbar", applicationProperties.getUi().getAppNameNavbar());
+            configData.put("homeDescription", applicationProperties.getUi().getHomeDescription());
            configData.put("languages", applicationProperties.getUi().getLanguages());

            // Security settings
            configData.put("enableLogin", applicationProperties.getSecurity().getEnableLogin());

-            // Mail settings
-            configData.put("enableEmailInvites", applicationProperties.getMail().isEnableInvites());
-
-            // Check if user is admin using UserServiceInterface
-            boolean isAdmin = false;
-            if (userService != null) {
-                try {
-                    isAdmin = userService.isCurrentUserAdmin();
-                } catch (Exception e) {
-                    // If there's an error, isAdmin remains false
-                }
-            }
-            configData.put("isAdmin", isAdmin);
-
            // System settings
            configData.put(
                    "enableAlphaFunctionality",
                    applicationProperties.getSystem().getEnableAlphaFunctionality());
            configData.put(
                    "enableAnalytics", applicationProperties.getSystem().getEnableAnalytics());
-            configData.put("enablePosthog", applicationProperties.getSystem().getEnablePosthog());
-            configData.put("enableScarf", applicationProperties.getSystem().getEnableScarf());

            // Premium/Enterprise settings
            configData.put("premiumEnabled", applicationProperties.getPremium().isEnabled());
@@ -35,6 +35,8 @@ import stirling.software.SPDF.model.api.security.SanitizePdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.WebResponseUtils;

@SecurityApi
@@ -42,6 +44,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class SanitizeController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/sanitize-pdf")
    @StandardPdfResponse
@@ -61,28 +64,54 @@ public class SanitizeController {
        boolean removeFonts = Boolean.TRUE.equals(request.getRemoveFonts());

        PDDocument document = pdfDocumentFactory.load(inputFile, true);
+
+        int pageCount = Math.max(1, document.getNumberOfPages());
+        int pageSteps = 0;
+        if (removeJavaScript) pageSteps += pageCount;
+        if (removeEmbeddedFiles) pageSteps += pageCount;
+        if (removeLinks) pageSteps += pageCount;
+        if (removeFonts) pageSteps += pageCount;
+
+        int metadataSteps = 0;
+        if (removeXMPMetadata) metadataSteps++;
+        if (removeMetadata) metadataSteps++;
+
+        int totalSteps = Math.max(1, pageSteps + metadataSteps);
+        JobProgressTracker progressTracker = jobProgressService.tracker(totalSteps);
+        boolean trackProgress = progressTracker.isEnabled();
+
        if (removeJavaScript) {
-            sanitizeJavaScript(document);
+            sanitizeJavaScript(document, progressTracker, trackProgress);
        }

        if (removeEmbeddedFiles) {
-            sanitizeEmbeddedFiles(document);
+            sanitizeEmbeddedFiles(document, progressTracker, trackProgress);
        }

        if (removeXMPMetadata) {
            sanitizeXMPMetadata(document);
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        if (removeMetadata) {
            sanitizeDocumentInfoMetadata(document);
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        if (removeLinks) {
-            sanitizeLinks(document);
+            sanitizeLinks(document, progressTracker, trackProgress);
        }

        if (removeFonts) {
-            sanitizeFonts(document);
+            sanitizeFonts(document, progressTracker, trackProgress);
+        }
+
+        if (trackProgress) {
+            progressTracker.complete();
        }

        return WebResponseUtils.pdfDocToWebResponse(
@@ -92,7 +121,9 @@ public class SanitizeController {
                        + "_sanitized.pdf");
    }

-    private void sanitizeJavaScript(PDDocument document) throws IOException {
+    private void sanitizeJavaScript(
+            PDDocument document, JobProgressTracker progressTracker, boolean trackProgress)
+            throws IOException {
        // Get the root dictionary (catalog) of the PDF
        PDDocumentCatalog catalog = document.getDocumentCatalog();

@@ -140,10 +171,15 @@ public class SanitizeController {
                    }
                }
            }
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
    }

-    private void sanitizeEmbeddedFiles(PDDocument document) {
+    private void sanitizeEmbeddedFiles(
+            PDDocument document, JobProgressTracker progressTracker, boolean trackProgress) {
        PDPageTree allPages = document.getPages();

        for (PDPage page : allPages) {
@@ -151,6 +187,9 @@ public class SanitizeController {
            if (res != null && res.getCOSObject() != null) {
                res.getCOSObject().removeItem(COSName.getPDFName("EmbeddedFiles"));
            }
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
    }

@@ -171,7 +210,9 @@ public class SanitizeController {
        }
    }

-    private void sanitizeLinks(PDDocument document) throws IOException {
+    private void sanitizeLinks(
+            PDDocument document, JobProgressTracker progressTracker, boolean trackProgress)
+            throws IOException {
        for (PDPage page : document.getPages()) {
            for (PDAnnotation annotation : page.getAnnotations()) {
                if (annotation != null && annotation instanceof PDAnnotationLink linkAnnotation) {
@@ -183,16 +224,23 @@ public class SanitizeController {
                    }
                }
            }
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
    }

-    private void sanitizeFonts(PDDocument document) {
+    private void sanitizeFonts(
+            PDDocument document, JobProgressTracker progressTracker, boolean trackProgress) {
        for (PDPage page : document.getPages()) {
            if (page != null
                    && page.getResources() != null
                    && page.getResources().getCOSObject() != null) {
                page.getResources().getCOSObject().removeItem(COSName.getPDFName("Font"));
            }
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
    }
 }
@@ -5,11 +5,9 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.PKIXCertPathBuilderResult;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;

@@ -34,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile;
 import io.swagger.v3.oas.annotations.Operation;

 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;

 import stirling.software.SPDF.config.swagger.JsonDataResponse;
 import stirling.software.SPDF.model.api.security.SignatureValidationRequest;
@@ -45,7 +42,6 @@ import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;

-@Slf4j
@SecurityApi
@RequiredArgsConstructor
 public class ValidateSignatureController {
@@ -69,9 +65,8 @@ public class ValidateSignatureController {
    @Operation(
            summary = "Validate PDF Digital Signature",
            description =
-                    "Validates the digital signatures in a PDF file using PKIX path building"
-                            + " and time-of-signing semantics. Supports custom trust anchors."
-                            + " Input:PDF Output:JSON Type:SISO")
+                    "Validates the digital signatures in a PDF file against default or custom"
+                            + " certificates. Input:PDF Output:JSON Type:SISO")
    @AutoJobPostMapping(
            value = "/validate-signature",
            consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@@ -79,12 +74,12 @@ public class ValidateSignatureController {
            @ModelAttribute SignatureValidationRequest request) throws IOException {
        List<SignatureValidationResult> results = new ArrayList<>();
        MultipartFile file = request.getFileInput();
+        MultipartFile certFile = request.getCertFile();

        // Load custom certificate if provided
        X509Certificate customCert = null;
-        if (request.getCertFile() != null && !request.getCertFile().isEmpty()) {
-            try (ByteArrayInputStream certStream =
-                    new ByteArrayInputStream(request.getCertFile().getBytes())) {
+        if (certFile != null && !certFile.isEmpty()) {
+            try (ByteArrayInputStream certStream = new ByteArrayInputStream(certFile.getBytes())) {
                CertificateFactory cf = CertificateFactory.getInstance("X.509");
                customCert = (X509Certificate) cf.generateCertificate(certStream);
            } catch (CertificateException e) {
@@ -113,150 +108,67 @@ public class ValidateSignatureController {
                    Store<X509CertificateHolder> certStore = signedData.getCertificates();
                    SignerInformationStore signerStore = signedData.getSignerInfos();

-                    for (SignerInformation signerInfo : signerStore.getSigners()) {
+                    for (SignerInformation signer : signerStore.getSigners()) {
                        X509CertificateHolder certHolder =
                                (X509CertificateHolder)
-                                        certStore.getMatches(signerInfo.getSID()).iterator().next();
-                        X509Certificate signerCert =
+                                        certStore.getMatches(signer.getSID()).iterator().next();
+                        X509Certificate cert =
                                new JcaX509CertificateConverter().getCertificate(certHolder);

-                        // Extract intermediate certificates from CMS
-                        Collection<X509Certificate> intermediates =
-                                certValidationService.extractIntermediateCertificates(
-                                        certStore, signerCert);
+                        boolean isValid =
+                                signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(cert));
+                        result.setValid(isValid);

-                        // Log what we found
-                        log.debug(
-                                "Found {} intermediate certificates in CMS signature",
-                                intermediates.size());
-                        for (X509Certificate inter : intermediates) {
-                            log.debug(
-                                    "  → Intermediate: {}",
-                                    inter.getSubjectX500Principal().getName());
-                            log.debug(
-                                    "    Issuer DN: {}", inter.getIssuerX500Principal().getName());
-                        }
+                        // Additional validations
+                        result.setChainValid(
+                                customCert != null
+                                        ? certValidationService
+                                                .validateCertificateChainWithCustomCert(
+                                                        cert, customCert)
+                                        : certValidationService.validateCertificateChain(cert));

-                        // Determine validation time (TSA timestamp or signingTime, or current)
-                        CertificateValidationService.ValidationTime validationTimeResult =
-                                certValidationService.extractValidationTime(signerInfo);
-                        Date validationTime;
-                        if (validationTimeResult == null) {
-                            validationTime = new Date();
-                            result.setValidationTimeSource("current");
-                        } else {
-                            validationTime = validationTimeResult.date;
-                            result.setValidationTimeSource(validationTimeResult.source);
-                        }
+                        result.setTrustValid(
+                                customCert != null
+                                        ? certValidationService.validateTrustWithCustomCert(
+                                                cert, customCert)
+                                        : certValidationService.validateTrustStore(cert));

-                        // Verify cryptographic signature
-                        boolean cmsValid =
-                                signerInfo.verify(
-                                        new JcaSimpleSignerInfoVerifierBuilder().build(signerCert));
-                        result.setValid(cmsValid);
-
-                        // Build and validate certificate path
-                        boolean chainValid = false;
-                        boolean trustValid = false;
-                        try {
-                            PKIXCertPathBuilderResult pathResult =
-                                    certValidationService.buildAndValidatePath(
-                                            signerCert, intermediates, customCert, validationTime);
-                            chainValid = true;
-                            trustValid = true; // Path ends at trust anchor
-                            result.setCertPathLength(
-                                    pathResult.getCertPath().getCertificates().size());
-                        } catch (Exception e) {
-                            String errorMsg = e.getMessage();
-                            result.setChainValidationError(errorMsg);
-                            chainValid = false;
-                            trustValid = false;
-                            // Log the full error for debugging
-                            log.warn(
-                                    "Certificate path validation failed for {}: {}",
-                                    signerCert.getSubjectX500Principal().getName(),
-                                    errorMsg);
-                            log.debug("Full stack trace:", e);
-                        }
-                        result.setChainValid(chainValid);
-                        result.setTrustValid(trustValid);
-
-                        // Check validity at validation time
-                        boolean outside =
-                                certValidationService.isOutsideValidityPeriod(
-                                        signerCert, validationTime);
-                        result.setNotExpired(!outside);
-
-                        // Revocation status determination
-                        boolean revocationEnabled = certValidationService.isRevocationEnabled();
-                        result.setRevocationChecked(revocationEnabled);
-
-                        if (!revocationEnabled) {
-                            result.setRevocationStatus("not-checked");
-                        } else if (chainValid && trustValid) {
-                            // Path building succeeded with revocation enabled = no revocation found
-                            result.setRevocationStatus("good");
-                        } else if (result.getChainValidationError() != null
-                                && result.getChainValidationError()
-                                        .toLowerCase()
-                                        .contains("revocation")) {
-                            // Check if failure was revocation-related
-                            if (result.getChainValidationError()
-                                    .toLowerCase()
-                                    .contains("unable to check")) {
-                                result.setRevocationStatus("soft-fail");
-                            } else {
-                                result.setRevocationStatus("revoked");
-                            }
-                        } else {
-                            result.setRevocationStatus("unknown");
-                        }
+                        result.setNotRevoked(!certValidationService.isRevoked(cert));
+                        result.setNotExpired(!cert.getNotAfter().before(new Date()));

                        // Set basic signature info
                        result.setSignerName(sig.getName());
-                        result.setSignatureDate(
-                                sig.getSignDate() != null
-                                        ? sig.getSignDate().getTime().toString()
-                                        : null);
+                        result.setSignatureDate(sig.getSignDate().getTime().toString());
                        result.setReason(sig.getReason());
                        result.setLocation(sig.getLocation());

-                        // Set certificate details (from signer cert)
-                        result.setIssuerDN(signerCert.getIssuerX500Principal().getName());
-                        result.setSubjectDN(signerCert.getSubjectX500Principal().getName());
-                        result.setSerialNumber(
-                                signerCert.getSerialNumber().toString(16)); // Hex format
-                        result.setValidFrom(signerCert.getNotBefore().toString());
-                        result.setValidUntil(signerCert.getNotAfter().toString());
-                        result.setSignatureAlgorithm(signerCert.getSigAlgName());
+                        // Set new certificate details
+                        result.setIssuerDN(cert.getIssuerX500Principal().getName());
+                        result.setSubjectDN(cert.getSubjectX500Principal().getName());
+                        result.setSerialNumber(cert.getSerialNumber().toString(16)); // Hex format
+                        result.setValidFrom(cert.getNotBefore().toString());
+                        result.setValidUntil(cert.getNotAfter().toString());
+                        result.setSignatureAlgorithm(cert.getSigAlgName());

                        // Get key size (if possible)
                        try {
                            result.setKeySize(
-                                    ((RSAPublicKey) signerCert.getPublicKey())
-                                            .getModulus()
-                                            .bitLength());
+                                    ((RSAPublicKey) cert.getPublicKey()).getModulus().bitLength());
                        } catch (Exception e) {
                            // If not RSA or error, set to 0
                            result.setKeySize(0);
                        }

-                        result.setVersion(String.valueOf(signerCert.getVersion()));
+                        result.setVersion(String.valueOf(cert.getVersion()));

                        // Set key usage
                        List<String> keyUsages = new ArrayList<>();
-                        boolean[] keyUsageFlags = signerCert.getKeyUsage();
+                        boolean[] keyUsageFlags = cert.getKeyUsage();
                        if (keyUsageFlags != null) {
                            String[] keyUsageLabels = {
-                                "Digital Signature",
-                                "Non-Repudiation",
-                                "Key Encipherment",
-                                "Data Encipherment",
-                                "Key Agreement",
-                                "Certificate Signing",
-                                "CRL Signing",
-                                "Encipher Only",
-                                "Decipher Only"
+                                "Digital Signature", "Non-Repudiation", "Key Encipherment",
+                                "Data Encipherment", "Key Agreement", "Certificate Signing",
+                                "CRL Signing", "Encipher Only", "Decipher Only"
                            };
                            for (int i = 0; i < keyUsageFlags.length; i++) {
                                if (keyUsageFlags[i]) {
@@ -266,8 +178,10 @@ public class ValidateSignatureController {
                        }
                        result.setKeyUsages(keyUsages);

-                        // Check if self-signed (properly)
-                        result.setSelfSigned(certValidationService.isSelfSigned(signerCert));
+                        // Check if self-signed
+                        result.setSelfSigned(
+                                cert.getSubjectX500Principal()
+                                        .equals(cert.getIssuerX500Principal()));
                    }
                } catch (Exception e) {
                    result.setValid(false);
@@ -40,6 +40,8 @@ import stirling.software.SPDF.model.api.security.AddWatermarkRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;

@@ -48,6 +50,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class WatermarkController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final JobProgressService jobProgressService;

    @InitBinder
    public void initBinder(WebDataBinder binder) {
@@ -100,6 +103,10 @@ public class WatermarkController {
        PDDocument document = pdfDocumentFactory.load(pdfFile);

        // Create a page in the document
+        int totalPages = Math.max(1, document.getNumberOfPages());
+        JobProgressTracker progressTracker = jobProgressService.tracker(totalPages);
+        boolean trackProgress = progressTracker.isEnabled();
+
        for (PDPage page : document.getPages()) {

            // Get the page's content stream
@@ -138,6 +145,10 @@ public class WatermarkController {

            // Close the content stream
            contentStream.close();
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }

        if (convertPdfToImage) {
@@ -146,6 +157,10 @@ public class WatermarkController {
            document = convertedPdf;
        }

+        if (trackProgress) {
+            progressTracker.complete();
+        }
+
        return WebResponseUtils.pdfDocToWebResponse(
                document,
                Filenames.toSimpleFileName(pdfFile.getOriginalFilename())
@@ -6,32 +6,17 @@ import lombok.Data;

@Data
 public class SignatureValidationResult {
-    // Cryptographic signature validation
    private boolean valid;
-
-    // Certificate chain validation
-    private boolean chainValid;
-    private boolean trustValid;
-    private String chainValidationError;
-    private int certPathLength;
-
-    // Time validation
-    private boolean notExpired;
-
-    // Revocation validation
-    private boolean revocationChecked; // true if PKIX revocation was enabled
-    private String revocationStatus; // "not-checked" | "good" | "revoked" | "soft-fail" | "unknown"
-
-    private String validationTimeSource; // "current", "signing-time", or "timestamp"
-
-    // Signature metadata
    private String signerName;
    private String signatureDate;
    private String reason;
    private String location;
    private String errorMessage;
+    private boolean chainValid;
+    private boolean trustValid;
+    private boolean notExpired;
+    private boolean notRevoked;

-    // Certificate details
    private String issuerDN; // Certificate issuer's Distinguished Name
    private String subjectDN; // Certificate subject's Distinguished Name
    private String serialNumber; // Certificate serial number
@@ -1,863 +1,143 @@
 package stirling.software.SPDF.service;

 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.security.GeneralSecurityException;
 import java.security.KeyStore;
-import java.security.MessageDigest;
+import java.security.KeyStoreException;
 import java.security.cert.*;
 import java.util.*;

-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
-import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1UTCTime;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.util.Store;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
+
+import io.github.pixee.security.BoundedLineReader;

 import jakarta.annotation.PostConstruct;

-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.ServerCertificateServiceInterface;
-
@Service
-@Slf4j
 public class CertificateValidationService {
-    /**
-     * Result container for validation time extraction Contains both the date and the source of the
-     * time
-     */
-    public static class ValidationTime {
-        public final Date date;
-        public final String source; // "timestamp" | "signing-time" | "current"
-
-        public ValidationTime(Date date, String source) {
-            this.date = date;
-            this.source = source;
-        }
-    }
-
-    // Separate trust stores: signing vs TLS
-    private KeyStore signingTrustAnchors; // AATL/EUTL + server cert for PDF signing
-    private final ServerCertificateServiceInterface serverCertificateService;
-    private final ApplicationProperties applicationProperties;
-
-    // EUTL (EU Trusted List) constants
-    private static final String NS_TSL = "http://uri.etsi.org/02231/v2#";
-
-    // Qualified CA service types to import as trust anchors (per ETSI TS 119 612)
-    private static final Set<String> EUTL_SERVICE_TYPES =
-            new HashSet<>(
-                    Arrays.asList(
-                            "http://uri.etsi.org/TrstSvc/Svctype/CA/QC",
-                            "http://uri.etsi.org/TrstSvc/Svctype/NationalRootCA-QC"));
-
-    // Active statuses to accept (per ETSI TS 119 612)
-    private static final String STATUS_UNDER_SUPERVISION =
-            "http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision";
-    private static final String STATUS_ACCREDITED =
-            "http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/accredited";
-    private static final String STATUS_SUPERVISION_IN_CESSATION =
-            "http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/supervisionincessation";
-
-    static {
-        if (java.security.Security.getProvider("BC") == null) {
-            java.security.Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    public CertificateValidationService(
-            @Autowired(required = false) ServerCertificateServiceInterface serverCertificateService,
-            ApplicationProperties applicationProperties) {
-        this.serverCertificateService = serverCertificateService;
-        this.applicationProperties = applicationProperties;
-    }
+    private KeyStore trustStore;

    @PostConstruct
    private void initializeTrustStore() throws Exception {
-        signingTrustAnchors = KeyStore.getInstance(KeyStore.getDefaultType());
-        signingTrustAnchors.load(null, null);
-
-        ApplicationProperties.Security.Validation validation =
-                applicationProperties.getSecurity().getValidation();
-
-        // Enable JDK fetching of OCSP/CRLDP if allowed
-        if (validation.isAllowAIA()) {
-            java.security.Security.setProperty("ocsp.enable", "true");
-            System.setProperty("com.sun.security.enableCRLDP", "true");
-            System.setProperty("com.sun.security.enableAIAcaIssuers", "true");
-            log.info("Enabled AIA certificate fetching and revocation checking");
-        }
-
-        // Trust only what we explicitly opt into:
-        if (validation.getTrust().isServerAsAnchor()) loadServerCertAsAnchor();
-        if (validation.getTrust().isUseSystemTrust()) loadJavaSystemTrustStore();
-        if (validation.getTrust().isUseMozillaBundle()) loadBundledMozillaCACerts();
-        if (validation.getTrust().isUseAATL()) loadAATLCertificates();
-        if (validation.getTrust().isUseEUTL()) loadEUTLCertificates();
+        trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        trustStore.load(null, null);
+        loadMozillaCertificates();
    }

-    /**
-     * Core entry-point: build a valid PKIX path from signerCert using provided intermediates
-     *
-     * @param signerCert The signer certificate
-     * @param intermediates Collection of intermediate certificates from CMS
-     * @param customTrustAnchor Optional custom root/intermediate certificate
-     * @param validationTime Time to validate at (signing time or current)
-     * @return PKIXCertPathBuilderResult containing validated path
-     * @throws GeneralSecurityException if path building/validation fails
-     */
-    public PKIXCertPathBuilderResult buildAndValidatePath(
-            X509Certificate signerCert,
-            Collection<X509Certificate> intermediates,
-            X509Certificate customTrustAnchor,
-            Date validationTime)
-            throws GeneralSecurityException {
+    private void loadMozillaCertificates() throws Exception {
+        try (InputStream is = getClass().getResourceAsStream("/certdata.txt")) {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            String line;
+            StringBuilder certData = new StringBuilder();
+            boolean inCert = false;
+            int certCount = 0;

-        // Build trust anchors
-        Set<TrustAnchor> anchors = new HashSet<>();
-        if (customTrustAnchor != null) {
-            anchors.add(new TrustAnchor(customTrustAnchor, null));
-        } else {
-            Enumeration<String> aliases = signingTrustAnchors.aliases();
-            while (aliases.hasMoreElements()) {
-                Certificate c = signingTrustAnchors.getCertificate(aliases.nextElement());
-                if (c instanceof X509Certificate x) {
-                    anchors.add(new TrustAnchor(x, null));
+            while ((line = BoundedLineReader.readLine(reader, 5_000_000)) != null) {
+                if (line.startsWith("CKA_VALUE MULTILINE_OCTAL")) {
+                    inCert = true;
+                    certData = new StringBuilder();
+                    continue;
+                }
+                if (inCert) {
+                    if ("END".equals(line)) {
+                        inCert = false;
+                        byte[] certBytes = parseOctalData(certData.toString());
+                        if (certBytes != null) {
+                            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+                            X509Certificate cert =
+                                    (X509Certificate)
+                                            cf.generateCertificate(
+                                                    new ByteArrayInputStream(certBytes));
+                            trustStore.setCertificateEntry("mozilla-cert-" + certCount++, cert);
+                        }
+                    } else {
+                        certData.append(line).append("\n");
+                    }
                }
            }
        }
-        if (anchors.isEmpty()) {
-            throw new CertPathBuilderException("No trust anchors available");
-        }
-
-        // Target certificate selector
-        X509CertSelector target = new X509CertSelector();
-        target.setCertificate(signerCert);
-
-        // Intermediate certificate store
-        List<Certificate> allCerts = new ArrayList<>(intermediates);
-        CertStore intermediateStore =
-                CertStore.getInstance("Collection", new CollectionCertStoreParameters(allCerts));
-
-        // PKIX parameters
-        PKIXBuilderParameters params = new PKIXBuilderParameters(anchors, target);
-        params.addCertStore(intermediateStore);
-        String revocationMode =
-                applicationProperties.getSecurity().getValidation().getRevocation().getMode();
-        params.setRevocationEnabled(!"none".equalsIgnoreCase(revocationMode));
-        if (validationTime != null) {
-            params.setDate(validationTime);
-        }
-
-        // Revocation checking
-        if (!"none".equalsIgnoreCase(revocationMode)) {
-            try {
-                PKIXRevocationChecker rc =
-                        (PKIXRevocationChecker)
-                                CertPathValidator.getInstance("PKIX").getRevocationChecker();
-
-                Set<PKIXRevocationChecker.Option> options =
-                        EnumSet.noneOf(PKIXRevocationChecker.Option.class);
-
-                // Soft-fail: allow validation to succeed if revocation status unavailable
-                boolean revocationHardFail =
-                        applicationProperties
-                                .getSecurity()
-                                .getValidation()
-                                .getRevocation()
-                                .isHardFail();
-                if (!revocationHardFail) {
-                    options.add(PKIXRevocationChecker.Option.SOFT_FAIL);
-                }
-
-                // Revocation mode configuration
-                if ("ocsp".equalsIgnoreCase(revocationMode)) {
-                    // OCSP-only: prefer OCSP (default), disable fallback to CRL
-                    options.add(PKIXRevocationChecker.Option.NO_FALLBACK);
-                } else if ("crl".equalsIgnoreCase(revocationMode)) {
-                    // CRL-only: prefer CRLs, disable fallback to OCSP
-                    options.add(PKIXRevocationChecker.Option.PREFER_CRLS);
-                    options.add(PKIXRevocationChecker.Option.NO_FALLBACK);
-                }
-                // "ocsp+crl" or other: use defaults (try OCSP first, fallback to CRL)
-
-                rc.setOptions(options);
-                params.addCertPathChecker(rc);
-            } catch (Exception e) {
-                log.warn("Failed to configure revocation checker: {}", e.getMessage());
-            }
-        }
-
-        // Build path
-        CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
-        return (PKIXCertPathBuilderResult) builder.build(params);
    }

-    /**
-     * Extract validation time from signature (TSA timestamp or signingTime)
-     *
-     * @param signerInfo The CMS signer information
-     * @return ValidationTime containing date and source, or null if not found
-     */
-    public ValidationTime extractValidationTime(SignerInformation signerInfo) {
+    private byte[] parseOctalData(String data) {
        try {
-            // 1) Check for timestamp token (RFC 3161) - highest priority
-            var unsignedAttrs = signerInfo.getUnsignedAttributes();
-            if (unsignedAttrs != null) {
-                var attr =
-                        unsignedAttrs.get(new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.2.14"));
-                if (attr != null) {
-                    try {
-                        TimeStampToken tst =
-                                new TimeStampToken(
-                                        new CMSSignedData(
-                                                attr.getAttributeValues()[0]
-                                                        .toASN1Primitive()
-                                                        .getEncoded()));
-                        Date tstTime = tst.getTimeStampInfo().getGenTime();
-                        log.debug("Using timestamp token time: {}", tstTime);
-                        return new ValidationTime(tstTime, "timestamp");
-                    } catch (Exception e) {
-                        log.debug("Failed to parse timestamp token: {}", e.getMessage());
-                    }
-                }
-            }
-
-            // 2) Check for signingTime attribute - fallback
-            var signedAttrs = signerInfo.getSignedAttributes();
-            if (signedAttrs != null) {
-                var st = signedAttrs.get(CMSAttributes.signingTime);
-                if (st != null) {
-                    ASN1Encodable val = st.getAttributeValues()[0];
-                    Date signingTime = null;
-                    if (val instanceof ASN1UTCTime ut) {
-                        signingTime = ut.getDate();
-                    } else if (val instanceof ASN1GeneralizedTime gt) {
-                        signingTime = gt.getDate();
-                    }
-                    if (signingTime != null) {
-                        log.debug("Using signingTime attribute: {}", signingTime);
-                        return new ValidationTime(signingTime, "signing-time");
-                    }
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            String[] tokens = data.split("\\\\");
+            for (String token : tokens) {
+                token = token.trim();
+                if (!token.isEmpty()) {
+                    baos.write(Integer.parseInt(token, 8));
                }
            }
+            return baos.toByteArray();
        } catch (Exception e) {
-            log.debug("Error extracting validation time: {}", e.getMessage());
+            return null;
        }
-        return null;
    }

-    /**
-     * Check if certificate is outside validity period at given time
-     *
-     * @param cert Certificate to check
-     * @param at Time to check validity
-     * @return true if certificate is expired or not yet valid
-     */
-    public boolean isOutsideValidityPeriod(X509Certificate cert, Date at) {
+    public boolean validateCertificateChain(X509Certificate cert) {
        try {
-            cert.checkValidity(at);
+            CertPathValidator validator = CertPathValidator.getInstance("PKIX");
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            List<X509Certificate> certList = Arrays.asList(cert);
+            CertPath certPath = cf.generateCertPath(certList);
+
+            Set<TrustAnchor> anchors = new HashSet<>();
+            Enumeration<String> aliases = trustStore.aliases();
+            while (aliases.hasMoreElements()) {
+                Object trustCert = trustStore.getCertificate(aliases.nextElement());
+                if (trustCert instanceof X509Certificate x509Cert) {
+                    anchors.add(new TrustAnchor(x509Cert, null));
+                }
+            }
+
+            PKIXParameters params = new PKIXParameters(anchors);
+            params.setRevocationEnabled(false);
+            validator.validate(certPath, params);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public boolean validateTrustStore(X509Certificate cert) {
+        try {
+            Enumeration<String> aliases = trustStore.aliases();
+            while (aliases.hasMoreElements()) {
+                Object trustCert = trustStore.getCertificate(aliases.nextElement());
+                if (trustCert instanceof X509Certificate && cert.equals(trustCert)) {
+                    return true;
+                }
+            }
+            return false;
+        } catch (KeyStoreException e) {
+            return false;
+        }
+    }
+
+    public boolean isRevoked(X509Certificate cert) {
+        try {
+            cert.checkValidity();
            return false;
        } catch (CertificateExpiredException | CertificateNotYetValidException e) {
            return true;
        }
    }

-    /**
-     * Check if revocation checking is enabled
-     *
-     * @return true if revocation mode is not "none"
-     */
-    public boolean isRevocationEnabled() {
-        String revocationMode =
-                applicationProperties.getSecurity().getValidation().getRevocation().getMode();
-        return !"none".equalsIgnoreCase(revocationMode);
-    }
-
-    /**
-     * Check if certificate is a CA certificate
-     *
-     * @param cert Certificate to check
-     * @return true if certificate has basicConstraints with CA=true
-     */
-    public boolean isCA(X509Certificate cert) {
-        return cert.getBasicConstraints() >= 0;
-    }
-
-    /**
-     * Verify if certificate is self-signed by checking signature
-     *
-     * @param cert Certificate to check
-     * @return true if certificate is self-signed and signature is valid
-     */
-    public boolean isSelfSigned(X509Certificate cert) {
+    public boolean validateCertificateChainWithCustomCert(
+            X509Certificate cert, X509Certificate customCert) {
        try {
-            if (!cert.getSubjectX500Principal().equals(cert.getIssuerX500Principal())) {
-                return false;
-            }
-            cert.verify(cert.getPublicKey());
+            cert.verify(customCert.getPublicKey());
            return true;
        } catch (Exception e) {
            return false;
        }
    }

-    /**
-     * Calculate SHA-256 fingerprint of certificate
-     *
-     * @param cert Certificate
-     * @return Hex string of SHA-256 hash
-     */
-    public String sha256Fingerprint(X509Certificate cert) {
+    public boolean validateTrustWithCustomCert(X509Certificate cert, X509Certificate customCert) {
        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-256");
-            byte[] hash = md.digest(cert.getEncoded());
-            return bytesToHex(hash);
+            // Compare the issuer of the signature certificate with the custom certificate
+            return cert.getIssuerX500Principal().equals(customCert.getSubjectX500Principal());
        } catch (Exception e) {
-            return "";
+            return false;
        }
    }
-
-    private String bytesToHex(byte[] bytes) {
-        StringBuilder sb = new StringBuilder(bytes.length * 2);
-        for (byte b : bytes) {
-            sb.append(String.format("%02X", b));
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Extract all certificates from CMS signature store
-     *
-     * @param certStore BouncyCastle certificate store
-     * @param signerCert The signer certificate
-     * @return Collection of all certificates except signer
-     */
-    public Collection<X509Certificate> extractIntermediateCertificates(
-            Store<X509CertificateHolder> certStore, X509Certificate signerCert) {
-        List<X509Certificate> intermediates = new ArrayList<>();
-        try {
-            JcaX509CertificateConverter converter = new JcaX509CertificateConverter();
-            Collection<X509CertificateHolder> holders = certStore.getMatches(null);
-
-            for (X509CertificateHolder holder : holders) {
-                X509Certificate cert = converter.getCertificate(holder);
-                if (!cert.equals(signerCert)) {
-                    intermediates.add(cert);
-                }
-            }
-        } catch (Exception e) {
-            log.debug("Error extracting intermediate certificates: {}", e.getMessage());
-        }
-        return intermediates;
-    }
-
-    // ==================== Trust Store Loading ====================
-
-    /**
-     * Load certificates from Java's system trust store (cacerts). On Windows, this includes
-     * certificates from the Windows trust store. This provides maximum compatibility with what
-     * browsers and OS trust.
-     */
-    private void loadJavaSystemTrustStore() {
-        try {
-            log.info("Loading certificates from Java system trust store");
-
-            // Get default trust manager factory
-            TrustManagerFactory tmf =
-                    TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            tmf.init((KeyStore) null); // null = use system default
-
-            // Extract certificates from trust managers
-            int loadedCount = 0;
-            for (TrustManager tm : tmf.getTrustManagers()) {
-                if (tm instanceof X509TrustManager x509tm) {
-                    for (X509Certificate cert : x509tm.getAcceptedIssuers()) {
-                        if (isCA(cert)) {
-                            String fingerprint = sha256Fingerprint(cert);
-                            String alias = "system-" + fingerprint;
-                            signingTrustAnchors.setCertificateEntry(alias, cert);
-                            loadedCount++;
-                        }
-                    }
-                }
-            }
-
-            log.info("Loaded {} CA certificates from Java system trust store", loadedCount);
-        } catch (Exception e) {
-            log.error("Failed to load Java system trust store: {}", e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Load bundled Mozilla CA certificate bundle from resources. This bundle contains ~140 trusted
-     * root CAs from Mozilla's CA Certificate Program, suitable for validating most commercial PDF
-     * signatures.
-     */
-    private void loadBundledMozillaCACerts() {
-        try {
-            log.info("Loading bundled Mozilla CA certificates from resources");
-            InputStream certStream =
-                    getClass().getClassLoader().getResourceAsStream("certs/cacert.pem");
-            if (certStream == null) {
-                log.warn("Bundled Mozilla CA certificate file not found in resources");
-                return;
-            }
-
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            Collection<? extends Certificate> certs = cf.generateCertificates(certStream);
-            certStream.close();
-
-            int loadedCount = 0;
-            int skippedCount = 0;
-
-            for (Certificate cert : certs) {
-                if (cert instanceof X509Certificate x509) {
-                    // Only add CA certificates to trust anchors
-                    if (isCA(x509)) {
-                        String fingerprint = sha256Fingerprint(x509);
-                        String alias = "mozilla-" + fingerprint;
-                        signingTrustAnchors.setCertificateEntry(alias, x509);
-                        loadedCount++;
-                    } else {
-                        skippedCount++;
-                    }
-                }
-            }
-
-            log.info(
-                    "Loaded {} Mozilla CA certificates as trust anchors (skipped {} non-CA certs)",
-                    loadedCount,
-                    skippedCount);
-        } catch (Exception e) {
-            log.error("Failed to load bundled Mozilla CA certificates: {}", e.getMessage(), e);
-        }
-    }
-
-    private void loadServerCertAsAnchor() {
-        try {
-            if (serverCertificateService != null
-                    && serverCertificateService.isEnabled()
-                    && serverCertificateService.hasServerCertificate()) {
-                X509Certificate serverCert = serverCertificateService.getServerCertificate();
-
-                // Self-signed certificates can be trust anchors regardless of CA flag
-                // Non-self-signed certificates should only be trust anchors if they're CAs
-                boolean selfSigned = isSelfSigned(serverCert);
-                boolean ca = isCA(serverCert);
-
-                if (selfSigned || ca) {
-                    signingTrustAnchors.setCertificateEntry("server-anchor", serverCert);
-                    log.info(
-                            "Loaded server certificate as trust anchor (self-signed: {}, CA: {})",
-                            selfSigned,
-                            ca);
-                } else {
-                    log.warn(
-                            "Server certificate is neither self-signed nor a CA; not adding as trust anchor");
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Failed loading server certificate as anchor: {}", e.getMessage());
-        }
-    }
-
-    /** Download and parse Adobe Approved Trust List (AATL) and add CA certs as trust anchors. */
-    private void loadAATLCertificates() {
-        try {
-            String aatlUrl = applicationProperties.getSecurity().getValidation().getAatl().getUrl();
-            log.info("Loading Adobe Approved Trust List (AATL) from: {}", aatlUrl);
-            byte[] pdfBytes = downloadTrustList(aatlUrl);
-            if (pdfBytes == null) {
-                log.warn("AATL download returned no data");
-                return;
-            }
-            int added = parseAATLPdf(pdfBytes);
-            log.info("Loaded {} AATL CA certificates into signing trust", added);
-        } catch (Exception e) {
-            log.warn("Failed to load AATL: {}", e.getMessage());
-            log.debug("AATL loading error", e);
-        }
-    }
-
-    /** Simple HTTP(S) fetch with sane timeouts. */
-    private byte[] downloadTrustList(String urlStr) {
-        HttpURLConnection conn = null;
-        try {
-            URL url = new URL(urlStr);
-            conn = (HttpURLConnection) url.openConnection();
-            conn.setRequestMethod("GET");
-            conn.setConnectTimeout(10_000);
-            conn.setReadTimeout(30_000);
-            conn.setInstanceFollowRedirects(true);
-
-            int code = conn.getResponseCode();
-            if (code == HttpURLConnection.HTTP_OK) {
-                try (InputStream in = conn.getInputStream();
-                        ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-                    byte[] buf = new byte[8192];
-                    int r;
-                    while ((r = in.read(buf)) != -1) out.write(buf, 0, r);
-                    return out.toByteArray();
-                }
-            } else {
-                log.warn("AATL download failed: HTTP {}", code);
-                return null;
-            }
-        } catch (Exception e) {
-            log.warn("AATL download error: {}", e.getMessage());
-            return null;
-        } finally {
-            if (conn != null) conn.disconnect();
-        }
-    }
-
-    /**
-     * Parse AATL PDF, extract the embedded "SecuritySettings.xml", and import CA certs. Returns the
-     * number of newly-added CA certificates.
-     */
-    private int parseAATLPdf(byte[] pdfBytes) throws Exception {
-        try (PDDocument doc = Loader.loadPDF(pdfBytes)) {
-            PDDocumentNameDictionary names = doc.getDocumentCatalog().getNames();
-            if (names == null) {
-                log.warn("AATL PDF has no name dictionary");
-                return 0;
-            }
-
-            PDEmbeddedFilesNameTreeNode efRoot = names.getEmbeddedFiles();
-            if (efRoot == null) {
-                log.warn("AATL PDF has no embedded files");
-                return 0;
-            }
-
-            // 1) Try names at root level
-            Map<String, PDComplexFileSpecification> top = efRoot.getNames();
-            if (top != null) {
-                Integer count = tryParseSecuritySettingsXML(top);
-                if (count != null) return count;
-            }
-
-            // 2) Traverse kids (name-tree)
-            @SuppressWarnings("unchecked")
-            List<?> kids = efRoot.getKids();
-            if (kids != null) {
-                for (Object kidObj : kids) {
-                    if (kidObj instanceof PDEmbeddedFilesNameTreeNode) {
-                        PDEmbeddedFilesNameTreeNode kid = (PDEmbeddedFilesNameTreeNode) kidObj;
-                        Map<String, PDComplexFileSpecification> map = kid.getNames();
-                        if (map != null) {
-                            Integer count = tryParseSecuritySettingsXML(map);
-                            if (count != null) return count;
-                        }
-                    }
-                }
-            }
-
-            log.warn("AATL PDF did not contain SecuritySettings.xml");
-            return 0;
-        }
-    }
-
-    /**
-     * Try to locate "SecuritySettings.xml" in the given name map. If found and parsed, returns the
-     * number of certs added; otherwise returns null.
-     */
-    private Integer tryParseSecuritySettingsXML(Map<String, PDComplexFileSpecification> nameMap) {
-        PDComplexFileSpecification fileSpec = nameMap.get("SecuritySettings.xml");
-        if (fileSpec == null) return null;
-
-        PDEmbeddedFile ef = fileSpec.getEmbeddedFile();
-        if (ef == null) return null;
-
-        try (InputStream xmlStream = ef.createInputStream()) {
-            return parseSecuritySettingsXML(xmlStream);
-        } catch (Exception e) {
-            log.warn("Failed parsing SecuritySettings.xml: {}", e.getMessage());
-            log.debug("SecuritySettings.xml parse error", e);
-            return null;
-        }
-    }
-
-    /**
-     * Parse the SecuritySettings.xml and load only CA certificates (basicConstraints >= 0). Returns
-     * the number of newly-added CA certificates.
-     */
-    private int parseSecuritySettingsXML(InputStream xmlStream) throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-        factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-        factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        factory.setXIncludeAware(false);
-        factory.setExpandEntityReferences(false);
-
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        Document doc = builder.parse(xmlStream);
-
-        NodeList certNodes = doc.getElementsByTagName("Certificate");
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        int added = 0;
-        for (int i = 0; i < certNodes.getLength(); i++) {
-            String base64 = certNodes.item(i).getTextContent().trim();
-            if (base64.isEmpty()) continue;
-
-            try {
-                byte[] certBytes = java.util.Base64.getMimeDecoder().decode(base64);
-                X509Certificate cert =
-                        (X509Certificate)
-                                cf.generateCertificate(new ByteArrayInputStream(certBytes));
-
-                // Only add CA certs as anchors
-                if (isCA(cert)) {
-                    String fingerprint = sha256Fingerprint(cert);
-                    String alias = "aatl-" + fingerprint;
-
-                    // avoid duplicates
-                    if (signingTrustAnchors.getCertificate(alias) == null) {
-                        signingTrustAnchors.setCertificateEntry(alias, cert);
-                        added++;
-                    }
-                } else {
-                    log.debug(
-                            "Skipping non-CA certificate from AATL: {}",
-                            cert.getSubjectX500Principal().getName());
-                }
-            } catch (Exception e) {
-                log.debug("Failed to parse an AATL certificate node: {}", e.getMessage());
-            }
-        }
-        return added;
-    }
-
-    /**
-     * Download LOTL (List Of Trusted Lists), resolve national TSLs, and import qualified CA
-     * certificates.
-     */
-    private void loadEUTLCertificates() {
-        try {
-            String lotlUrl =
-                    applicationProperties.getSecurity().getValidation().getEutl().getLotlUrl();
-            log.info("Loading EU Trusted List (LOTL) from: {}", lotlUrl);
-            byte[] lotlBytes = downloadXml(lotlUrl);
-            if (lotlBytes == null) {
-                log.warn("LOTL download returned no data");
-                return;
-            }
-
-            List<String> tslUrls = parseLotlForTslLocations(lotlBytes);
-            log.info("Found {} national TSL locations in LOTL", tslUrls.size());
-
-            int totalAdded = 0;
-            for (String tslUrl : tslUrls) {
-                try {
-                    byte[] tslBytes = downloadXml(tslUrl);
-                    if (tslBytes == null) {
-                        log.warn("TSL download failed: {}", tslUrl);
-                        continue;
-                    }
-                    int added = parseTslAndAddCas(tslBytes, tslUrl);
-                    totalAdded += added;
-                } catch (Exception e) {
-                    log.warn("Failed to parse TSL {}: {}", tslUrl, e.getMessage());
-                    log.debug("TSL parse error", e);
-                }
-            }
-
-            log.info("Imported {} qualified CA certificates from EUTL", totalAdded);
-        } catch (Exception e) {
-            log.warn("EUTL load failed: {}", e.getMessage());
-            log.debug("EUTL load error", e);
-        }
-    }
-
-    /** HTTP(S) GET for XML with sane timeouts. */
-    private byte[] downloadXml(String urlStr) {
-        HttpURLConnection conn = null;
-        try {
-            URL url = new URL(urlStr);
-            conn = (HttpURLConnection) url.openConnection();
-            conn.setRequestMethod("GET");
-            conn.setConnectTimeout(10_000);
-            conn.setReadTimeout(30_000);
-            conn.setInstanceFollowRedirects(true);
-
-            int code = conn.getResponseCode();
-            if (code == HttpURLConnection.HTTP_OK) {
-                try (InputStream in = conn.getInputStream();
-                        ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-                    byte[] buf = new byte[8192];
-                    int r;
-                    while ((r = in.read(buf)) != -1) out.write(buf, 0, r);
-                    return out.toByteArray();
-                }
-            } else {
-                log.warn("XML download failed: HTTP {} for {}", code, urlStr);
-                return null;
-            }
-        } catch (Exception e) {
-            log.warn("XML download error for {}: {}", urlStr, e.getMessage());
-            return null;
-        } finally {
-            if (conn != null) conn.disconnect();
-        }
-    }
-
-    /** Parse LOTL and return all TSL URLs from PointersToOtherTSL. */
-    private List<String> parseLotlForTslLocations(byte[] lotlBytes) throws Exception {
-        DocumentBuilderFactory dbf = secureDbfWithNamespaces();
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        Document doc = db.parse(new ByteArrayInputStream(lotlBytes));
-
-        List<String> out = new ArrayList<>();
-        NodeList ptrs = doc.getElementsByTagNameNS(NS_TSL, "PointersToOtherTSL");
-        if (ptrs.getLength() == 0) return out;
-
-        org.w3c.dom.Element ptrRoot = (org.w3c.dom.Element) ptrs.item(0);
-        NodeList locations = ptrRoot.getElementsByTagNameNS(NS_TSL, "TSLLocation");
-        for (int i = 0; i < locations.getLength(); i++) {
-            String url = locations.item(i).getTextContent().trim();
-            if (!url.isEmpty()) out.add(url);
-        }
-        return out;
-    }
-
-    /**
-     * Parse a single national TSL, import CA certificates for qualified services in an active
-     * status. Returns count of newly added CA certs.
-     */
-    private int parseTslAndAddCas(byte[] tslBytes, String sourceUrl) throws Exception {
-        DocumentBuilderFactory dbf = secureDbfWithNamespaces();
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        Document doc = db.parse(new ByteArrayInputStream(tslBytes));
-
-        int added = 0;
-
-        NodeList services = doc.getElementsByTagNameNS(NS_TSL, "TSPService");
-        for (int i = 0; i < services.getLength(); i++) {
-            org.w3c.dom.Element svc = (org.w3c.dom.Element) services.item(i);
-            org.w3c.dom.Element info = firstChildNS(svc, "ServiceInformation");
-            if (info == null) continue;
-
-            String type = textOf(info, "ServiceTypeIdentifier");
-            if (!EUTL_SERVICE_TYPES.contains(type)) continue;
-
-            String status = textOf(info, "ServiceStatus");
-            if (!isActiveStatus(status)) continue;
-
-            org.w3c.dom.Element sdi = firstChildNS(info, "ServiceDigitalIdentity");
-            if (sdi == null) continue;
-
-            NodeList digitalIds = sdi.getElementsByTagNameNS(NS_TSL, "DigitalId");
-            for (int d = 0; d < digitalIds.getLength(); d++) {
-                org.w3c.dom.Element did = (org.w3c.dom.Element) digitalIds.item(d);
-                NodeList certNodes = did.getElementsByTagNameNS(NS_TSL, "X509Certificate");
-                for (int c = 0; c < certNodes.getLength(); c++) {
-                    String base64 = certNodes.item(c).getTextContent().trim();
-                    if (base64.isEmpty()) continue;
-
-                    try {
-                        byte[] certBytes = java.util.Base64.getMimeDecoder().decode(base64);
-                        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                        X509Certificate cert =
-                                (X509Certificate)
-                                        cf.generateCertificate(new ByteArrayInputStream(certBytes));
-
-                        if (!isCA(cert)) {
-                            log.debug(
-                                    "Skipping non-CA in TSL {}: {}",
-                                    sourceUrl,
-                                    cert.getSubjectX500Principal().getName());
-                            continue;
-                        }
-
-                        String fp = sha256Fingerprint(cert);
-                        String alias = "eutl-" + fp;
-
-                        if (signingTrustAnchors.getCertificate(alias) == null) {
-                            signingTrustAnchors.setCertificateEntry(alias, cert);
-                            added++;
-                        }
-                    } catch (Exception e) {
-                        log.debug(
-                                "Failed to import a certificate from {}: {}",
-                                sourceUrl,
-                                e.getMessage());
-                    }
-                }
-            }
-        }
-
-        log.debug("TSL {} → imported {} CA certificates", sourceUrl, added);
-        return added;
-    }
-
-    /** Check if service status is active (per ETSI TS 119 612). */
-    private boolean isActiveStatus(String statusUri) {
-        if (STATUS_UNDER_SUPERVISION.equals(statusUri)) return true;
-        if (STATUS_ACCREDITED.equals(statusUri)) return true;
-        boolean acceptTransitional =
-                applicationProperties
-                        .getSecurity()
-                        .getValidation()
-                        .getEutl()
-                        .isAcceptTransitional();
-        if (acceptTransitional && STATUS_SUPERVISION_IN_CESSATION.equals(statusUri)) return true;
-        return false;
-    }
-
-    /** Create secure DocumentBuilderFactory with namespace awareness. */
-    private DocumentBuilderFactory secureDbfWithNamespaces() throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        // Secure processing hardening
-        factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-        factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-        factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        factory.setXIncludeAware(false);
-        factory.setExpandEntityReferences(false);
-        return factory;
-    }
-
-    /** Get first child element with given local name in TSL namespace. */
-    private org.w3c.dom.Element firstChildNS(org.w3c.dom.Element parent, String localName) {
-        NodeList nl = parent.getElementsByTagNameNS(NS_TSL, localName);
-        return (nl.getLength() == 0) ? null : (org.w3c.dom.Element) nl.item(0);
-    }
-
-    /** Get text content of first child with given local name. */
-    private String textOf(org.w3c.dom.Element parent, String localName) {
-        org.w3c.dom.Element e = firstChildNS(parent, localName);
-        return (e == null) ? "" : e.getTextContent().trim();
-    }
-
-    /** Get signing trust store */
-    public KeyStore getSigningTrustStore() {
-        return signingTrustAnchors;
-    }
 }
@@ -11,6 +11,8 @@ import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.springframework.stereotype.Service;

+import stirling.software.common.service.JobProgressTracker;
+
 /** Service class responsible for removing image objects from a PDF document. */
@Service
 public class PdfImageRemovalService {
@@ -26,6 +28,13 @@ public class PdfImageRemovalService {
     * @throws IOException If an error occurs while processing the PDF document.
     */
    public PDDocument removeImagesFromPdf(PDDocument document) throws IOException {
+        return removeImagesFromPdf(document, null);
+    }
+
+    public PDDocument removeImagesFromPdf(PDDocument document, JobProgressTracker progressTracker)
+            throws IOException {
+        boolean trackProgress = progressTracker != null && progressTracker.isEnabled();
+
        // Iterate over each page in the PDF document
        for (PDPage page : document.getPages()) {
            PDResources resources = page.getResources();
@@ -45,6 +54,10 @@ public class PdfImageRemovalService {
            for (COSName name : namesToRemove) {
                resources.put(name, (PDXObject) null);
            }
+
+            if (trackProgress) {
+                progressTracker.advance();
+            }
        }
        return document;
    }
@@ -2,7 +2,7 @@ multipart.enabled=true
 logging.level.org.springframework=WARN
 logging.level.org.hibernate=WARN
 logging.level.org.eclipse.jetty=WARN
-#logging.level.org.springframework.security.oauth2=DEBUG
+#logging.level.org.springframework.security.saml2=TRACE
 #logging.level.org.springframework.security=DEBUG
 #logging.level.org.opensaml=DEBUG
 #logging.level.stirling.software.proprietary.security=DEBUG
@@ -35,12 +35,12 @@ spring.datasource.username=sa
 spring.datasource.password=
 spring.h2.console.enabled=false
 spring.jpa.hibernate.ddl-auto=update
-# Defer datasource initialization to ensure that the database is fully set up
-# before Hibernate attempts to access it. This is particularly useful when
+# Defer datasource initialization to ensure that the database is fully set up 
+# before Hibernate attempts to access it. This is particularly useful when 
 # using database initialization scripts or tools.
 spring.jpa.defer-datasource-initialization=true

-# Disable SQL logging to avoid cluttering the logs in production. Enable this
+# Disable SQL logging to avoid cluttering the logs in production. Enable this 
 # property during development if you need to debug SQL queries.
 spring.jpa.show-sql=false
 server.servlet.session.timeout:30m
@@ -60,4 +60,4 @@ spring.main.allow-bean-definition-overriding=true
 java.io.tmpdir=${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf}

 # V2 features
-v2=true
+v2=false
@@ -64,22 +64,7 @@ security:
    enableKeyRotation: true # Set to 'true' to enable key pair rotation
    enableKeyCleanup: true # Set to 'true' to enable key pair cleanup
    keyRetentionDays: 7 # Number of days to retain old keys. The default is 7 days.
-  validation: # PDF signature validation settings
-    trust:
-      serverAsAnchor: true # Trust server certificate as anchor for PDF signatures (if configured and self-signed or CA)
-      useSystemTrust: true # Trust Java/OS system trust store for PDF signature validation
-      useMozillaBundle: true # Trust bundled Mozilla CA bundle (~140 CAs) for PDF signature validation
-      useAATL: false # Trust Adobe Approved Trust List (AATL) for PDF signature validation - downloads from Adobe on startup if enabled
-      useEUTL: false # Trust EU Trusted List (EUTL) for eIDAS qualified certificates - downloads LOTL and national TSLs on startup if enabled
-    allowAIA: false # Allow JDK to fetch issuer certificates and revocation information from network (OCSP/CRL/AIA)
-    aatl:
-      url: https://trustlist.adobe.com/tl.pdf # Adobe Approved Trust List download URL
-    eutl:
-      lotlUrl: https://ec.europa.eu/tools/lotl/eu-lotl.xml # EU List Of Trusted Lists (LOTL) URL
-      acceptTransitional: false # Accept certificates with 'supervisionincessation' status (transitional state)
-    revocation:
-      mode: none # Revocation checking mode: 'none' (disabled), 'ocsp' (OCSP only), 'crl' (CRL only), 'ocsp+crl' (OCSP with CRL fallback)
-      hardFail: false # Fail validation if revocation status cannot be determined (true=strict, false=soft-fail)
+    secureCookie: false # Set to 'true' to use secure cookies for JWTs

 premium:
  key: 00000000-0000-0000-0000-000000000000
@@ -99,7 +84,6 @@ premium:

 mail:
  enabled: false # set to 'true' to enable sending emails
-  enableInvites: false # set to 'true' to enable email invites for user management (requires mail.enabled and security.enableLogin)
  host: smtp.example.com # SMTP server hostname
  port: 587 # SMTP server port
  username: '' # SMTP server username
@@ -107,8 +91,8 @@ mail:
  from: '' # sender email address

 legal:
-  termsAndConditions: https://www.stirling.com/legal/terms-of-service # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
-  privacyPolicy: https://www.stirling.com/legal/privacy-policy # URL to the privacy policy of your application (e.g. https://example.com/privacy). Empty string to disable or filename to load from local file in static folder
+  termsAndConditions: https://www.stirlingpdf.com/terms # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
+  privacyPolicy: https://www.stirlingpdf.com/privacy-policy # URL to the privacy policy of your application (e.g. https://example.com/privacy). Empty string to disable or filename to load from local file in static folder
  accessibilityStatement: '' # URL to the accessibility statement of your application (e.g. https://example.com/accessibility). Empty string to disable or filename to load from local file in static folder
  cookiePolicy: '' # URL to the cookie policy of your application (e.g. https://example.com/cookie). Empty string to disable or filename to load from local file in static folder
  impressum: '' # URL to the impressum of your application (e.g. https://example.com/impressum). Empty string to disable or filename to load from local file in static folder
@@ -121,13 +105,10 @@ system:
  showUpdateOnlyAdmin: false # only admins can see when a new update is available, depending on showUpdate it must be set to 'true'
  customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template HTML files
  tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
-  enableAnalytics: null # Master toggle for analytics: set to 'true' to enable all analytics, 'false' to disable all analytics, or leave as 'null' to prompt admin on first launch
-  enablePosthog: null # Enable PostHog analytics (open-source product analytics): set to 'true' to enable, 'false' to disable, or 'null' to enable by default when analytics is enabled
-  enableScarf: null # Enable Scarf tracking pixel: set to 'true' to enable, 'false' to disable, or 'null' to enable by default when analytics is enabled
+  enableAnalytics: null # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true
  enableUrlToPDF: false # Set to 'true' to enable URL to PDF, INTERNAL ONLY, known security issues, should not be used externally
  disableSanitize: false # set to true to disable Sanitize HTML; (can lead to injections in HTML)
  maxDPI: 500 # Maximum allowed DPI for PDF to image conversion
-  corsAllowedOrigins: [] # List of allowed origins for CORS (e.g. ['http://localhost:5173', 'https://app.example.com']). Leave empty to disable CORS.
  serverCertificate:
    enabled: true # Enable server-side certificate for "Sign with Stirling-PDF" option
    organizationName: Stirling-PDF # Organization name for generated certificates
@@ -172,6 +153,8 @@ system:
    cleanupSystemTemp: false # Whether to clean broader system temp directory

 ui:
+  appName: '' # application's visible name
+  homeDescription: '' # short description or tagline shown on the homepage
  appNameNavbar: '' # name displayed on the navigation bar
  languages: [] # If empty, all languages are enabled. To display only German and Polish ["de_DE", "pl_PL"]. British English is always enabled.

@@ -14,17 +14,19 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;

 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;

 class RearrangePagesPDFControllerTest {

    @Mock private CustomPDFDocumentFactory mockPdfDocumentFactory;
+    @Mock private JobProgressService mockJobProgressService;

    private RearrangePagesPDFController sut;

    @BeforeEach
    void setUp() {
        MockitoAnnotations.openMocks(this);
-        sut = new RearrangePagesPDFController(mockPdfDocumentFactory);
+        sut = new RearrangePagesPDFController(mockPdfDocumentFactory, mockJobProgressService);
    }

    /** Tests the behavior of the oddEvenMerge method when there are no pages in the document. */
@@ -22,11 +22,14 @@ import org.springframework.mock.web.MockMultipartFile;

 import stirling.software.SPDF.model.api.general.RotatePDFRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.JobProgressService;
+import stirling.software.common.service.JobProgressTracker;

@ExtendWith(MockitoExtension.class)
 public class RotationControllerTest {

    @Mock private CustomPDFDocumentFactory pdfDocumentFactory;
+    @Mock private JobProgressService jobProgressService;

    @InjectMocks private RotationController rotationController;

@@ -42,12 +45,16 @@ public class RotationControllerTest {
        PDDocument mockDocument = mock(PDDocument.class);
        PDPageTree mockPages = mock(PDPageTree.class);
        PDPage mockPage = mock(PDPage.class);
+        JobProgressTracker mockTracker = mock(JobProgressTracker.class);

        when(pdfDocumentFactory.load(request)).thenReturn(mockDocument);
        when(mockDocument.getPages()).thenReturn(mockPages);
+        when(mockPages.getCount()).thenReturn(1);
        when(mockPages.iterator())
                .thenReturn(java.util.Collections.singletonList(mockPage).iterator());
        when(mockPage.getRotation()).thenReturn(0);
+        when(jobProgressService.tracker(1)).thenReturn(mockTracker);
+        when(mockTracker.isEnabled()).thenReturn(false);

        // Act
        ResponseEntity<byte[]> response = rotationController.rotatePDF(request);
@@ -2,20 +2,20 @@ package stirling.software.SPDF.service;

 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

+import java.security.PublicKey;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.X509Certificate;
-import java.util.Date;
+
+import javax.security.auth.x500.X500Principal;

 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties;
+import org.mockito.Mockito;

 /** Tests for the CertificateValidationService using mocked certificates. */
 class CertificateValidationServiceTest {
@@ -26,67 +26,121 @@ class CertificateValidationServiceTest {

    @BeforeEach
    void setUp() throws Exception {
-        // Create mock ApplicationProperties with default validation settings
-        ApplicationProperties applicationProperties = mock(ApplicationProperties.class);
-        ApplicationProperties.Security security = mock(ApplicationProperties.Security.class);
-        ApplicationProperties.Security.Validation validation =
-                mock(ApplicationProperties.Security.Validation.class);
-        ApplicationProperties.Security.Validation.Trust trust =
-                mock(ApplicationProperties.Security.Validation.Trust.class);
-        ApplicationProperties.Security.Validation.Revocation revocation =
-                mock(ApplicationProperties.Security.Validation.Revocation.class);
-
-        when(applicationProperties.getSecurity()).thenReturn(security);
-        when(security.getValidation()).thenReturn(validation);
-        when(validation.getTrust()).thenReturn(trust);
-        when(validation.getRevocation()).thenReturn(revocation);
-        when(validation.isAllowAIA()).thenReturn(false);
-        when(trust.isServerAsAnchor()).thenReturn(false);
-        when(trust.isUseSystemTrust()).thenReturn(false);
-        when(trust.isUseMozillaBundle()).thenReturn(false);
-        when(trust.isUseAATL()).thenReturn(false);
-        when(trust.isUseEUTL()).thenReturn(false);
-        when(revocation.getMode()).thenReturn("none");
-        when(revocation.isHardFail()).thenReturn(false);
-
-        validationService = new CertificateValidationService(null, applicationProperties);
+        validationService = new CertificateValidationService();

        // Create mock certificates
        validCertificate = mock(X509Certificate.class);
        expiredCertificate = mock(X509Certificate.class);

-        // Set up behaviors for valid certificate (both overloads)
-        doNothing().when(validCertificate).checkValidity();
-        doNothing().when(validCertificate).checkValidity(any(Date.class));
+        // Set up behaviors for valid certificate
+        doNothing().when(validCertificate).checkValidity(); // No exception means valid

-        // Set up behaviors for expired certificate (both overloads)
+        // Set up behaviors for expired certificate
        doThrow(new CertificateExpiredException("Certificate expired"))
                .when(expiredCertificate)
                .checkValidity();
-        doThrow(new CertificateExpiredException("Certificate expired"))
-                .when(expiredCertificate)
-                .checkValidity(any(Date.class));
    }

    @Test
-    void testIsOutsideValidityPeriod_ValidCertificate() {
+    void testIsRevoked_ValidCertificate() {
        // When certificate is valid (not expired)
-        boolean result = validationService.isOutsideValidityPeriod(validCertificate, new Date());
+        boolean result = validationService.isRevoked(validCertificate);

-        // Then it should not be outside validity period
-        assertFalse(result, "Valid certificate should not be outside validity period");
+        // Then it should not be considered revoked
+        assertFalse(result, "Valid certificate should not be considered revoked");
    }

    @Test
-    void testIsOutsideValidityPeriod_ExpiredCertificate() {
+    void testIsRevoked_ExpiredCertificate() {
        // When certificate is expired
-        boolean result = validationService.isOutsideValidityPeriod(expiredCertificate, new Date());
+        boolean result = validationService.isRevoked(expiredCertificate);

-        // Then it should be outside validity period
-        assertTrue(result, "Expired certificate should be outside validity period");
+        // Then it should be considered revoked
+        assertTrue(result, "Expired certificate should be considered revoked");
    }

-    // Note: Full integration tests for buildAndValidatePath() would require
-    // real certificate chains and trust anchors. These would be better as
-    // integration tests using actual signed PDFs from the test-signed-pdfs directory.
+    @Test
+    void testValidateTrustWithCustomCert_Match() {
+        // Create certificates with matching issuer and subject
+        X509Certificate issuingCert = mock(X509Certificate.class);
+        X509Certificate signedCert = mock(X509Certificate.class);
+
+        // Create X500Principal objects for issuer and subject
+        X500Principal issuerPrincipal = new X500Principal("CN=Test Issuer");
+
+        // Mock the issuer of the signed certificate to match the subject of the issuing certificate
+        when(signedCert.getIssuerX500Principal()).thenReturn(issuerPrincipal);
+        when(issuingCert.getSubjectX500Principal()).thenReturn(issuerPrincipal);
+
+        // When validating trust with custom cert
+        boolean result = validationService.validateTrustWithCustomCert(signedCert, issuingCert);
+
+        // Then validation should succeed
+        assertTrue(result, "Certificate with matching issuer and subject should validate");
+    }
+
+    @Test
+    void testValidateTrustWithCustomCert_NoMatch() {
+        // Create certificates with non-matching issuer and subject
+        X509Certificate issuingCert = mock(X509Certificate.class);
+        X509Certificate signedCert = mock(X509Certificate.class);
+
+        // Create X500Principal objects for issuer and subject
+        X500Principal issuerPrincipal = new X500Principal("CN=Test Issuer");
+        X500Principal differentPrincipal = new X500Principal("CN=Different Name");
+
+        // Mock the issuer of the signed certificate to NOT match the subject of the issuing
+        // certificate
+        when(signedCert.getIssuerX500Principal()).thenReturn(issuerPrincipal);
+        when(issuingCert.getSubjectX500Principal()).thenReturn(differentPrincipal);
+
+        // When validating trust with custom cert
+        boolean result = validationService.validateTrustWithCustomCert(signedCert, issuingCert);
+
+        // Then validation should fail
+        assertFalse(result, "Certificate with non-matching issuer and subject should not validate");
+    }
+
+    @Test
+    void testValidateCertificateChainWithCustomCert_Success() throws Exception {
+        // Setup mock certificates
+        X509Certificate signedCert = mock(X509Certificate.class);
+        X509Certificate signingCert = mock(X509Certificate.class);
+        PublicKey publicKey = mock(PublicKey.class);
+
+        when(signingCert.getPublicKey()).thenReturn(publicKey);
+
+        // When verifying the certificate with the signing cert's public key, don't throw exception
+        doNothing().when(signedCert).verify(Mockito.any());
+
+        // When validating certificate chain with custom cert
+        boolean result =
+                validationService.validateCertificateChainWithCustomCert(signedCert, signingCert);
+
+        // Then validation should succeed
+        assertTrue(result, "Certificate chain with proper signing should validate");
+    }
+
+    @Test
+    void testValidateCertificateChainWithCustomCert_Failure() throws Exception {
+        // Setup mock certificates
+        X509Certificate signedCert = mock(X509Certificate.class);
+        X509Certificate signingCert = mock(X509Certificate.class);
+        PublicKey publicKey = mock(PublicKey.class);
+
+        when(signingCert.getPublicKey()).thenReturn(publicKey);
+
+        // When verifying the certificate with the signing cert's public key, throw exception
+        // Need to use a specific exception that verify() can throw
+        doThrow(new java.security.SignatureException("Verification failed"))
+                .when(signedCert)
+                .verify(Mockito.any());
+
+        // When validating certificate chain with custom cert
+        boolean result =
+                validationService.validateCertificateChainWithCustomCert(signedCert, signingCert);
+
+        // Then validation should fail
+        assertFalse(result, "Certificate chain with failed signing should not validate");
+    }
 }
@@ -53,6 +53,7 @@ import stirling.software.proprietary.security.session.SessionPersistentRegistry;

@Slf4j
@ProprietaryUiDataApi
+@EnterpriseEndpoint
 public class ProprietaryUIDataController {

    private final ApplicationProperties applicationProperties;
@@ -88,7 +89,6 @@ public class ProprietaryUIDataController {

    @GetMapping("/audit-dashboard")
    @PreAuthorize("hasRole('ADMIN')")
-    @EnterpriseEndpoint
    @Operation(summary = "Get audit dashboard data")
    public ResponseEntity<AuditDashboardData> getAuditDashboardData() {
        AuditDashboardData data = new AuditDashboardData();
@@ -57,6 +57,7 @@ public class CustomAuthenticationSuccessHandler
            String jwt =
                    jwtService.generateToken(
                            authentication, Map.of("authType", AuthenticationType.WEB));
+            jwtService.addToken(response, jwt);
            log.debug("JWT generated for user: {}", userName);

            getRedirectStrategy().sendRedirect(request, response, "/");
@@ -72,6 +72,7 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
                    getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH);
                }
            } else if (!jwtService.extractToken(request).isBlank()) {
+                jwtService.clearToken(response);
                getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH);
            } else {
                // Redirect to login page after logout
@@ -114,12 +115,8 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
            // Set service provider keys for the SamlClient
            samlClient.setSPKeys(certificate, privateKey);

-            // Build relay state to return user to login page after IdP logout
-            String relayState =
-                    UrlUtils.getOrigin(request) + request.getContextPath() + LOGOUT_PATH;
-
-            // Redirect to identity provider for logout with relay state
-            samlClient.redirectToIdentityProvider(response, relayState, nameIdValue);
+            // Redirect to identity provider for logout. todo: add relay state
+            samlClient.redirectToIdentityProvider(response, null, nameIdValue);
        } catch (Exception e) {
            log.error(
                    "Error retrieving logout URL from Provider {} for user {}",
@@ -13,7 +13,7 @@ public class RateLimitResetScheduler {

    private final IPRateLimitingFilter rateLimitingFilter;

-    @Scheduled(cron = "${security.rate-limit.reset-schedule:0 0 0 * * MON}")
+    @Scheduled(cron = "0 0 0 * * MON") // At 00:00 every Monday TODO: configurable
    public void resetRateLimit() {
        rateLimitingFilter.resetRequestCounts();
    }
@@ -39,6 +39,7 @@ import stirling.software.proprietary.security.CustomLogoutSuccessHandler;
 import stirling.software.proprietary.security.JwtAuthenticationEntryPoint;
 import stirling.software.proprietary.security.database.repository.JPATokenRepositoryImpl;
 import stirling.software.proprietary.security.database.repository.PersistentLoginRepository;
+import stirling.software.proprietary.security.filter.FirstLoginFilter;
 import stirling.software.proprietary.security.filter.IPRateLimitingFilter;
 import stirling.software.proprietary.security.filter.JwtAuthenticationFilter;
 import stirling.software.proprietary.security.filter.UserAuthenticationFilter;
@@ -73,6 +74,7 @@ public class SecurityConfiguration {
    private final JwtServiceInterface jwtService;
    private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
    private final LoginAttemptService loginAttemptService;
+    private final FirstLoginFilter firstLoginFilter;
    private final SessionPersistentRegistry sessionRegistry;
    private final PersistentLoginRepository persistentLoginRepository;
    private final GrantedAuthoritiesMapper oAuth2userAuthoritiesMapper;
@@ -91,6 +93,7 @@ public class SecurityConfiguration {
            JwtServiceInterface jwtService,
            JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint,
            LoginAttemptService loginAttemptService,
+            FirstLoginFilter firstLoginFilter,
            SessionPersistentRegistry sessionRegistry,
            @Autowired(required = false) GrantedAuthoritiesMapper oAuth2userAuthoritiesMapper,
            @Autowired(required = false)
@@ -107,6 +110,7 @@ public class SecurityConfiguration {
        this.jwtService = jwtService;
        this.jwtAuthenticationEntryPoint = jwtAuthenticationEntryPoint;
        this.loginAttemptService = loginAttemptService;
+        this.firstLoginFilter = firstLoginFilter;
        this.sessionRegistry = sessionRegistry;
        this.persistentLoginRepository = persistentLoginRepository;
        this.oAuth2userAuthoritiesMapper = oAuth2userAuthoritiesMapper;
@@ -128,14 +132,19 @@ public class SecurityConfiguration {
        if (loginEnabledValue) {
            boolean v2Enabled = appConfig.v2Enabled();

+            if (v2Enabled) {
+                http.addFilterBefore(
+                                jwtAuthenticationFilter(),
+                                UsernamePasswordAuthenticationFilter.class)
+                        .exceptionHandling(
+                                exceptionHandling ->
+                                        exceptionHandling.authenticationEntryPoint(
+                                                jwtAuthenticationEntryPoint));
+            }
            http.addFilterBefore(
                            userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
-                    .addFilterBefore(
-                            rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
-
-            if (v2Enabled) {
-                http.addFilterBefore(jwtAuthenticationFilter(), UserAuthenticationFilter.class);
-            }
+                    .addFilterAfter(rateLimitingFilter(), UserAuthenticationFilter.class)
+                    .addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);

            if (!securityProperties.getCsrfDisabled()) {
                CookieCsrfTokenRepository cookieRepo =
@@ -147,13 +156,6 @@ public class SecurityConfiguration {
                        csrf ->
                                csrf.ignoringRequestMatchers(
                                                request -> {
-                                                    String uri = request.getRequestURI();
-
-                                                    // Ignore CSRF for auth endpoints
-                                                    if (uri.startsWith("/api/v1/auth/")) {
-                                                        return true;
-                                                    }
-
                                                    String apiKey = request.getHeader("X-API-KEY");
                                                    // If there's no API key, don't ignore CSRF
                                                    // (return false)
@@ -236,12 +238,9 @@ public class SecurityConfiguration {
                                                                : uri;
                                                return trimmedUri.startsWith("/login")
                                                        || trimmedUri.startsWith("/oauth")
-                                                        || trimmedUri.startsWith("/oauth2")
                                                        || trimmedUri.startsWith("/saml2")
                                                        || trimmedUri.endsWith(".svg")
                                                        || trimmedUri.startsWith("/register")
-                                                        || trimmedUri.startsWith("/signup")
-                                                        || trimmedUri.startsWith("/auth/callback")
                                                        || trimmedUri.startsWith("/error")
                                                        || trimmedUri.startsWith("/images/")
                                                        || trimmedUri.startsWith("/public/")
@@ -253,16 +252,6 @@ public class SecurityConfiguration {
                                                        || trimmedUri.startsWith("/favicon")
                                                        || trimmedUri.startsWith(
                                                                "/api/v1/info/status")
-                                                        || trimmedUri.startsWith("/api/v1/config")
-                                                        || trimmedUri.startsWith(
-                                                                "/api/v1/auth/register")
-                                                        || trimmedUri.startsWith(
-                                                                "/api/v1/user/register")
-                                                        || trimmedUri.startsWith(
-                                                                "/api/v1/auth/login")
-                                                        || trimmedUri.startsWith(
-                                                                "/api/v1/auth/refresh")
-                                                        || trimmedUri.startsWith("/api/v1/auth/me")
                                                        || trimmedUri.startsWith("/v1/api-docs")
                                                        || uri.contains("/v1/api-docs");
                                            })
@@ -288,40 +277,33 @@ public class SecurityConfiguration {
            // Handle OAUTH2 Logins
            if (securityProperties.isOauth2Active()) {
                http.oauth2Login(
-                        oauth2 -> {
-                            // v1: Use /oauth2 as login page for Thymeleaf templates
-                            if (!v2Enabled) {
-                                oauth2.loginPage("/oauth2");
-                            }
-
-                            // v2: Don't set loginPage, let default OAuth2 flow handle it
-                            oauth2
-                                    /*
-                                       This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
-                                       If user exists, login proceeds as usual. If user does not exist, then it is auto-created but only if 'OAUTH2AutoCreateUser'
-                                       is set as true, else login fails with an error message advising the same.
-                                    */
-                                    .successHandler(
-                                            new CustomOAuth2AuthenticationSuccessHandler(
-                                                    loginAttemptService,
-                                                    securityProperties.getOauth2(),
-                                                    userService,
-                                                    jwtService))
-                                    .failureHandler(new CustomOAuth2AuthenticationFailureHandler())
-                                    // Add existing Authorities from the database
-                                    .userInfoEndpoint(
-                                            userInfoEndpoint ->
-                                                    userInfoEndpoint
-                                                            .oidcUserService(
-                                                                    new CustomOAuth2UserService(
-                                                                            securityProperties
-                                                                                    .getOauth2(),
-                                                                            userService,
-                                                                            loginAttemptService))
-                                                            .userAuthoritiesMapper(
-                                                                    oAuth2userAuthoritiesMapper))
-                                    .permitAll();
-                        });
+                        oauth2 ->
+                                oauth2.loginPage("/oauth2")
+                                        /*
+                                        This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
+                                        If user exists, login proceeds as usual. If user does not exist, then it is auto-created but only if 'OAUTH2AutoCreateUser'
+                                        is set as true, else login fails with an error message advising the same.
+                                         */
+                                        .successHandler(
+                                                new CustomOAuth2AuthenticationSuccessHandler(
+                                                        loginAttemptService,
+                                                        securityProperties.getOauth2(),
+                                                        userService,
+                                                        jwtService))
+                                        .failureHandler(
+                                                new CustomOAuth2AuthenticationFailureHandler())
+                                        // Add existing Authorities from the database
+                                        .userInfoEndpoint(
+                                                userInfoEndpoint ->
+                                                        userInfoEndpoint
+                                                                .oidcUserService(
+                                                                        new CustomOAuth2UserService(
+                                                                                securityProperties,
+                                                                                userService,
+                                                                                loginAttemptService))
+                                                                .userAuthoritiesMapper(
+                                                                        oAuth2userAuthoritiesMapper))
+                                        .permitAll());
            }
            // Handle SAML
            if (securityProperties.isSaml2Active() && runningProOrHigher) {
@@ -1,27 +1,19 @@
 package stirling.software.proprietary.security.controller.api;

 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;

-import org.springframework.boot.SpringApplication;
-import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -40,9 +32,7 @@ import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.annotations.api.AdminApi;
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.util.AppArgsCapture;
 import stirling.software.common.util.GeneralUtils;
-import stirling.software.common.util.JarPathUtil;
 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;
@@ -55,7 +45,6 @@ public class AdminSettingsController {

    private final ApplicationProperties applicationProperties;
    private final ObjectMapper objectMapper;
-    private final ApplicationContext applicationContext;

    // Track settings that have been modified but not yet applied (require restart)
    private static final ConcurrentHashMap<String, Object> pendingChanges =
@@ -206,8 +195,7 @@ public class AdminSettingsController {
    @Operation(
            summary = "Get specific settings section",
            description =
-                    "Retrieve settings for a specific section (e.g., security, system, ui). "
-                            + "By default includes pending changes with awaitingRestart flags. Admin access required.")
+                    "Retrieve settings for a specific section (e.g., security, system, ui). Admin access required.")
    @ApiResponses(
            value = {
                @ApiResponse(
@@ -218,9 +206,7 @@ public class AdminSettingsController {
                        responseCode = "403",
                        description = "Access denied - Admin role required")
            })
-    public ResponseEntity<?> getSettingsSection(
-            @PathVariable String sectionName,
-            @RequestParam(defaultValue = "true") boolean includePending) {
+    public ResponseEntity<?> getSettingsSection(@PathVariable String sectionName) {
        try {
            Object sectionData = getSectionData(sectionName);
            if (sectionData == null) {
@@ -231,24 +217,8 @@ public class AdminSettingsController {
                                        + ". Valid sections: "
                                        + String.join(", ", VALID_SECTION_NAMES));
            }
-
-            // Convert to Map for manipulation
-            @SuppressWarnings("unchecked")
-            Map<String, Object> sectionMap = objectMapper.convertValue(sectionData, Map.class);
-
-            if (includePending && !pendingChanges.isEmpty()) {
-                // Add pending changes block for this section
-                Map<String, Object> sectionPending = extractPendingForSection(sectionName);
-                if (!sectionPending.isEmpty()) {
-                    sectionMap.put("_pending", sectionPending);
-                }
-            }
-
-            log.debug(
-                    "Admin requested settings section: {} (includePending={})",
-                    sectionName,
-                    includePending);
-            return ResponseEntity.ok(sectionMap);
+            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)
@@ -418,101 +388,6 @@ public class AdminSettingsController {
        }
    }

-    @PostMapping("/restart")
-    @Operation(
-            summary = "Restart the application",
-            description =
-                    "Triggers a graceful restart of the Spring Boot application to apply pending settings changes. Uses a restart helper to ensure proper restart. Admin access required.")
-    @ApiResponses(
-            value = {
-                @ApiResponse(responseCode = "200", description = "Restart initiated successfully"),
-                @ApiResponse(
-                        responseCode = "403",
-                        description = "Access denied - Admin role required"),
-                @ApiResponse(responseCode = "500", description = "Failed to initiate restart")
-            })
-    public ResponseEntity<String> restartApplication() {
-        try {
-            log.warn("Admin initiated application restart");
-
-            // Get paths to current JAR and restart helper
-            Path appJar = JarPathUtil.currentJar();
-            Path helperJar = JarPathUtil.restartHelperJar();
-
-            if (appJar == null) {
-                log.error("Cannot restart: not running from JAR (likely development mode)");
-                return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
-                        .body(
-                                "Restart not available in development mode. Please restart the application manually.");
-            }
-
-            if (helperJar == null || !Files.isRegularFile(helperJar)) {
-                log.error("Cannot restart: restart-helper.jar not found at expected location");
-                return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
-                        .body("Restart helper not found. Please restart the application manually.");
-            }
-
-            // Get current application arguments
-            List<String> appArgs = AppArgsCapture.APP_ARGS.get();
-
-            // Write args to temp file to avoid command-line quoting issues
-            Path argsFile = Files.createTempFile("stirling-app-args-", ".txt");
-            Files.write(argsFile, appArgs, StandardCharsets.UTF_8);
-
-            // Get current process PID and java executable
-            long pid = ProcessHandle.current().pid();
-            String javaBin = JarPathUtil.javaExecutable();
-
-            // Build command to launch restart helper
-            List<String> cmd = new ArrayList<>();
-            cmd.add(javaBin);
-            cmd.add("-jar");
-            cmd.add(helperJar.toString());
-            cmd.add("--pid");
-            cmd.add(Long.toString(pid));
-            cmd.add("--app");
-            cmd.add(appJar.toString());
-            cmd.add("--argsFile");
-            cmd.add(argsFile.toString());
-            cmd.add("--backoffMs");
-            cmd.add("1000");
-
-            log.info("Launching restart helper: {}", String.join(" ", cmd));
-
-            // Launch restart helper process
-            new ProcessBuilder(cmd)
-                    .directory(appJar.getParent().toFile())
-                    .inheritIO() // Forward logs
-                    .start();
-
-            // Clear pending changes since we're restarting
-            pendingChanges.clear();
-
-            // Give the HTTP response time to complete, then exit
-            new Thread(
-                            () -> {
-                                try {
-                                    Thread.sleep(1000);
-                                    log.info("Shutting down for restart...");
-                                    SpringApplication.exit(applicationContext, () -> 0);
-                                    System.exit(0);
-                                } catch (InterruptedException e) {
-                                    log.error("Restart interrupted: {}", e.getMessage(), e);
-                                    Thread.currentThread().interrupt();
-                                }
-                            })
-                    .start();
-
-            return ResponseEntity.ok(
-                    "Application restart initiated. The server will be back online shortly.");
-
-        } catch (Exception e) {
-            log.error("Failed to initiate restart: {}", e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body("Failed to initiate application restart: " + e.getMessage());
-        }
-    }
-
    private Object getSectionData(String sectionName) {
        if (sectionName == null || sectionName.trim().isEmpty()) {
            return null;
@@ -751,62 +626,4 @@ public class AdminSettingsController {

        return mergedSettings;
    }
-
-    /**
-     * Extract pending changes for a specific section
-     *
-     * @param sectionName The section name (e.g., "security", "system")
-     * @return Map of pending changes with nested structure for this section
-     */
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> extractPendingForSection(String sectionName) {
-        Map<String, Object> result = new HashMap<>();
-        String sectionPrefix = sectionName.toLowerCase() + ".";
-
-        // Find all pending changes for this section
-        for (Map.Entry<String, Object> entry : pendingChanges.entrySet()) {
-            String pendingKey = entry.getKey();
-
-            if (pendingKey.toLowerCase().startsWith(sectionPrefix)) {
-                // Extract the path within the section (e.g., "security.enableLogin" ->
-                // "enableLogin")
-                String pathInSection = pendingKey.substring(sectionPrefix.length());
-                Object pendingValue = entry.getValue();
-
-                // Build nested structure from dot notation
-                setNestedValue(result, pathInSection, pendingValue);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Set a value in a nested map using dot notation
-     *
-     * @param map The root map
-     * @param dotPath The dot notation path (e.g., "oauth2.clientSecret")
-     * @param value The value to set
-     */
-    @SuppressWarnings("unchecked")
-    private void setNestedValue(Map<String, Object> map, String dotPath, Object value) {
-        String[] parts = dotPath.split("\\.");
-        Map<String, Object> current = map;
-
-        // Navigate/create nested maps for all parts except the last
-        for (int i = 0; i < parts.length - 1; i++) {
-            String part = parts[i];
-            Object nested = current.get(part);
-
-            if (!(nested instanceof Map)) {
-                nested = new HashMap<String, Object>();
-                current.put(part, nested);
-            }
-
-            current = (Map<String, Object>) nested;
-        }
-
-        // Set the final value
-        current.put(parts[parts.length - 1], value);
-    }
 }
@@ -1,238 +0,0 @@
-package stirling.software.proprietary.security.controller.api;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-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.web.bind.annotation.*;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.proprietary.security.model.AuthenticationType;
-import stirling.software.proprietary.security.model.User;
-import stirling.software.proprietary.security.model.api.user.UsernameAndPass;
-import stirling.software.proprietary.security.service.CustomUserDetailsService;
-import stirling.software.proprietary.security.service.JwtServiceInterface;
-import stirling.software.proprietary.security.service.UserService;
-
-/** REST API Controller for authentication operations. */
-@RestController
-@RequestMapping("/api/v1/auth")
-@RequiredArgsConstructor
-@Slf4j
-@Tag(name = "Authentication", description = "Endpoints for user authentication and registration")
-public class AuthController {
-
-    private final UserService userService;
-    private final JwtServiceInterface jwtService;
-    private final CustomUserDetailsService userDetailsService;
-
-    /**
-     * Login endpoint - replaces Supabase signInWithPassword
-     *
-     * @param request Login credentials (email/username and password)
-     * @param response HTTP response to set JWT cookie
-     * @return User and session information
-     */
-    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-    @PostMapping("/login")
-    public ResponseEntity<?> login(
-            @RequestBody UsernameAndPass request, HttpServletResponse response) {
-        try {
-            // Validate input parameters
-            if (request.getUsername() == null || request.getUsername().trim().isEmpty()) {
-                log.warn("Login attempt with null or empty username");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Username is required"));
-            }
-
-            if (request.getPassword() == null || request.getPassword().isEmpty()) {
-                log.warn(
-                        "Login attempt with null or empty password for user: {}",
-                        request.getUsername());
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Password is required"));
-            }
-
-            log.debug("Login attempt for user: {}", request.getUsername());
-
-            UserDetails userDetails =
-                    userDetailsService.loadUserByUsername(request.getUsername().trim());
-            User user = (User) userDetails;
-
-            if (!userService.isPasswordCorrect(user, request.getPassword())) {
-                log.warn("Invalid password for user: {}", request.getUsername());
-                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                        .body(Map.of("error", "Invalid credentials"));
-            }
-
-            if (!user.isEnabled()) {
-                log.warn("Disabled user attempted login: {}", request.getUsername());
-                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                        .body(Map.of("error", "User account is disabled"));
-            }
-
-            Map<String, Object> claims = new HashMap<>();
-            claims.put("authType", AuthenticationType.WEB.toString());
-            claims.put("role", user.getRolesAsString());
-
-            String token = jwtService.generateToken(user.getUsername(), claims);
-
-            log.info("Login successful for user: {}", request.getUsername());
-
-            return ResponseEntity.ok(
-                    Map.of(
-                            "user", buildUserResponse(user),
-                            "session", Map.of("access_token", token, "expires_in", 3600)));
-
-        } catch (UsernameNotFoundException e) {
-            log.warn("User not found: {}", request.getUsername());
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "Invalid username or password"));
-        } catch (AuthenticationException e) {
-            log.error("Authentication failed for user: {}", request.getUsername(), e);
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "Invalid credentials"));
-        } catch (Exception e) {
-            log.error("Login error for user: {}", request.getUsername(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(Map.of("error", "Internal server error"));
-        }
-    }
-
-    /**
-     * Get current user
-     *
-     * @return Current authenticated user information
-     */
-    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-    @GetMapping("/me")
-    public ResponseEntity<?> getCurrentUser() {
-        try {
-            Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-
-            if (auth == null
-                    || !auth.isAuthenticated()
-                    || auth.getPrincipal().equals("anonymousUser")) {
-                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                        .body(Map.of("error", "Not authenticated"));
-            }
-
-            UserDetails userDetails = (UserDetails) auth.getPrincipal();
-            User user = (User) userDetails;
-
-            return ResponseEntity.ok(Map.of("user", buildUserResponse(user)));
-
-        } catch (Exception e) {
-            log.error("Get current user error", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(Map.of("error", "Internal server error"));
-        }
-    }
-
-    /**
-     * Logout endpoint
-     *
-     * @param response HTTP response
-     * @return Success message
-     */
-    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-    @PostMapping("/logout")
-    public ResponseEntity<?> logout(HttpServletResponse response) {
-        try {
-            SecurityContextHolder.clearContext();
-
-            log.debug("User logged out successfully");
-
-            return ResponseEntity.ok(Map.of("message", "Logged out successfully"));
-
-        } catch (Exception e) {
-            log.error("Logout error", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(Map.of("error", "Internal server error"));
-        }
-    }
-
-    /**
-     * Refresh token
-     *
-     * @param request HTTP request containing current JWT cookie
-     * @param response HTTP response to set new JWT cookie
-     * @return New token information
-     */
-    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
-    @PostMapping("/refresh")
-    public ResponseEntity<?> refresh(HttpServletRequest request, HttpServletResponse response) {
-        try {
-            String token = jwtService.extractToken(request);
-
-            if (token == null) {
-                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                        .body(Map.of("error", "No token found"));
-            }
-
-            jwtService.validateToken(token);
-            String username = jwtService.extractUsername(token);
-
-            UserDetails userDetails = userDetailsService.loadUserByUsername(username);
-            User user = (User) userDetails;
-
-            Map<String, Object> claims = new HashMap<>();
-            claims.put("authType", user.getAuthenticationType());
-            claims.put("role", user.getRolesAsString());
-
-            String newToken = jwtService.generateToken(username, claims);
-
-            log.debug("Token refreshed for user: {}", username);
-
-            return ResponseEntity.ok(Map.of("access_token", newToken, "expires_in", 3600));
-
-        } catch (Exception e) {
-            log.error("Token refresh error", e);
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "Token refresh failed"));
-        }
-    }
-
-    /**
-     * Helper method to build user response object
-     *
-     * @param user User entity
-     * @return Map containing user information
-     */
-    private Map<String, Object> buildUserResponse(User user) {
-        Map<String, Object> userMap = new HashMap<>();
-        userMap.put("id", user.getId());
-        userMap.put("email", user.getUsername()); // Use username as email
-        userMap.put("username", user.getUsername());
-        userMap.put("role", user.getRolesAsString());
-        userMap.put("enabled", user.isEnabled());
-
-        // Add metadata for OAuth compatibility
-        Map<String, Object> appMetadata = new HashMap<>();
-        appMetadata.put("provider", user.getAuthenticationType()); // Default to email provider
-        userMap.put("app_metadata", appMetadata);
-
-        return userMap;
-    }
-
-    // ===========================
-    // Request/Response DTOs
-    // ===========================
-
-    /** Login request DTO */
-    public record LoginRequest(String email, String password) {}
-}
@@ -2,19 +2,21 @@ package stirling.software.proprietary.security.controller.api;

 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;

+import org.eclipse.jetty.http.HttpStatus;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;

 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
@@ -40,19 +42,15 @@ public class DatabaseController {
            summary = "Import a database backup file",
            description = "Uploads and imports a database backup SQL file.")
    @PostMapping(consumes = "multipart/form-data", value = "import-database")
-    public ResponseEntity<?> importDatabase(
+    public String importDatabase(
            @Parameter(description = "SQL file to import", required = true)
                    @RequestParam("fileInput")
-                    MultipartFile file)
+                    MultipartFile file,
+            RedirectAttributes redirectAttributes)
            throws IOException {
        if (file == null || file.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "fileNullOrEmpty",
-                                    "message",
-                                    "File is null or empty"));
+            redirectAttributes.addAttribute("error", "fileNullOrEmpty");
+            return "redirect:/database";
        }
        log.info("Received file: {}", file.getOriginalFilename());
        Path tempTemplatePath = Files.createTempFile("backup_", ".sql");
@@ -60,31 +58,15 @@ public class DatabaseController {
            Files.copy(in, tempTemplatePath, StandardCopyOption.REPLACE_EXISTING);
            boolean importSuccess = databaseService.importDatabaseFromUI(tempTemplatePath);
            if (importSuccess) {
-                return ResponseEntity.ok(
-                        java.util.Map.of(
-                                "message",
-                                "importIntoDatabaseSuccessed",
-                                "description",
-                                "Database imported successfully"));
+                redirectAttributes.addAttribute("infoMessage", "importIntoDatabaseSuccessed");
            } else {
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(
-                                java.util.Map.of(
-                                        "error",
-                                        "failedImportFile",
-                                        "message",
-                                        "Failed to import database file"));
+                redirectAttributes.addAttribute("error", "failedImportFile");
            }
        } catch (Exception e) {
            log.error("Error importing database: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "failedImportFile",
-                                    "message",
-                                    "Failed to import database: " + e.getMessage()));
+            redirectAttributes.addAttribute("error", "failedImportFile");
        }
+        return "redirect:/database";
    }

    @Hidden
@@ -92,17 +74,11 @@ public class DatabaseController {
            summary = "Import database backup by filename",
            description = "Imports a database backup file from the server using its file name.")
    @GetMapping("/import-database-file/{fileName}")
-    public ResponseEntity<?> importDatabaseFromBackupUI(
+    public String importDatabaseFromBackupUI(
            @Parameter(description = "Name of the file to import", required = true) @PathVariable
                    String fileName) {
        if (fileName == null || fileName.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "fileNullOrEmpty",
-                                    "message",
-                                    "File name is null or empty"));
+            return "redirect:/database?error=fileNullOrEmpty";
        }
        // Check if the file exists in the backup list
        boolean fileExists =
@@ -110,31 +86,14 @@ public class DatabaseController {
                        .anyMatch(backup -> backup.getFileName().equals(fileName));
        if (!fileExists) {
            log.error("File {} not found in backup list", fileName);
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "fileNotFound",
-                                    "message",
-                                    "File not found in backup list"));
+            return "redirect:/database?error=fileNotFound";
        }
        log.info("Received file: {}", fileName);
        if (databaseService.importDatabaseFromUI(fileName)) {
            log.info("File {} imported to database", fileName);
-            return ResponseEntity.ok(
-                    java.util.Map.of(
-                            "message",
-                            "importIntoDatabaseSuccessed",
-                            "description",
-                            "Database backup imported successfully"));
+            return "redirect:/database?infoMessage=importIntoDatabaseSuccessed";
        }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(
-                        java.util.Map.of(
-                                "error",
-                                "failedImportFile",
-                                "message",
-                                "Failed to import database file"));
+        return "redirect:/database?error=failedImportFile";
    }

    @Hidden
@@ -142,42 +101,24 @@ public class DatabaseController {
            summary = "Delete a database backup file",
            description = "Deletes a specified database backup file from the server.")
    @GetMapping("/delete/{fileName}")
-    public ResponseEntity<?> deleteFile(
+    public String deleteFile(
            @Parameter(description = "Name of the file to delete", required = true) @PathVariable
                    String fileName) {
        if (fileName == null || fileName.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "invalidFileName",
-                                    "message",
-                                    "File must not be null or empty"));
+            throw new IllegalArgumentException("File must not be null or empty");
        }
        try {
            if (databaseService.deleteBackupFile(fileName)) {
                log.info("Deleted file: {}", fileName);
-                return ResponseEntity.ok(java.util.Map.of("message", "File deleted successfully"));
            } else {
                log.error("Failed to delete file: {}", fileName);
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(
-                                java.util.Map.of(
-                                        "error",
-                                        "failedToDeleteFile",
-                                        "message",
-                                        "Failed to delete backup file"));
+                return "redirect:/database?error=failedToDeleteFile";
            }
        } catch (IOException e) {
            log.error("Error deleting file: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "deleteError",
-                                    "message",
-                                    "Error deleting file: " + e.getMessage()));
+            return "redirect:/database?error=" + e.getMessage();
        }
+        return "redirect:/database";
    }

    @Hidden
@@ -201,29 +142,22 @@ public class DatabaseController {
                    .body(resource);
        } catch (IOException e) {
            log.error("Error downloading file: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(
-                            java.util.Map.of(
-                                    "error",
-                                    "downloadFailed",
-                                    "message",
-                                    "Failed to download file: " + e.getMessage()));
+            return ResponseEntity.status(HttpStatus.SEE_OTHER_303)
+                    .location(URI.create("/database?error=downloadFailed"))
+                    .build();
        }
    }

    @Operation(
            summary = "Create a database backup",
-            description = "This endpoint triggers the creation of a database backup.")
+            description =
+                    "This endpoint triggers the creation of a database backup and redirects to the"
+                            + " database management page.")
    @GetMapping("/createDatabaseBackup")
-    public ResponseEntity<?> createDatabaseBackup() {
+    public String createDatabaseBackup() {
        log.info("Starting database backup creation...");
        databaseService.exportDatabase();
        log.info("Database backup successfully created.");
-        return ResponseEntity.ok(
-                java.util.Map.of(
-                        "message",
-                        "backupCreated",
-                        "description",
-                        "Database backup created successfully"));
+        return "redirect:/database?infoMessage=backupCreated";
    }
 }
@@ -1,12 +1,10 @@
 package stirling.software.proprietary.security.controller.api;

-import java.util.Map;
 import java.util.Optional;

-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.view.RedirectView;

 import jakarta.transaction.Transactional;

@@ -32,113 +30,98 @@ public class TeamController {

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/create")
-    public ResponseEntity<?> createTeam(@RequestParam("name") String name) {
+    public RedirectView createTeam(@RequestParam("name") String name) {
        if (teamRepository.existsByNameIgnoreCase(name)) {
-            return ResponseEntity.status(HttpStatus.CONFLICT)
-                    .body(Map.of("error", "Team name already exists."));
+            return new RedirectView("/teams?messageType=teamExists");
        }
        Team team = new Team();
        team.setName(name);
        teamRepository.save(team);
-        return ResponseEntity.ok(Map.of("message", "Team created successfully"));
+        return new RedirectView("/teams?messageType=teamCreated");
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/rename")
-    public ResponseEntity<?> renameTeam(
+    public RedirectView renameTeam(
            @RequestParam("teamId") Long teamId, @RequestParam("newName") String newName) {
        Optional<Team> existing = teamRepository.findById(teamId);
        if (existing.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "Team not found."));
+            return new RedirectView("/teams?messageType=teamNotFound");
        }
        if (teamRepository.existsByNameIgnoreCase(newName)) {
-            return ResponseEntity.status(HttpStatus.CONFLICT)
-                    .body(Map.of("error", "Team name already exists."));
+            return new RedirectView("/teams?messageType=teamNameExists");
        }
        Team team = existing.get();

        // Prevent renaming the Internal team
        if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot rename Internal team."));
+            return new RedirectView("/teams?messageType=internalTeamNotAccessible");
        }

        team.setName(newName);
        teamRepository.save(team);
-        return ResponseEntity.ok(Map.of("message", "Team renamed successfully"));
+        return new RedirectView("/teams?messageType=teamRenamed");
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/delete")
    @Transactional
-    public ResponseEntity<?> deleteTeam(@RequestParam("teamId") Long teamId) {
+    public RedirectView deleteTeam(@RequestParam("teamId") Long teamId) {
        Optional<Team> teamOpt = teamRepository.findById(teamId);
        if (teamOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "Team not found."));
+            return new RedirectView("/teams?messageType=teamNotFound");
        }

        Team team = teamOpt.get();

        // Prevent deleting the Internal team
        if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot delete Internal team."));
+            return new RedirectView("/teams?messageType=internalTeamNotAccessible");
        }

        long memberCount = userRepository.countByTeam(team);
        if (memberCount > 0) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(
-                            Map.of(
-                                    "error",
-                                    "Team must be empty before deletion. Please remove all members first."));
+            return new RedirectView("/teams?messageType=teamHasUsers");
        }

        teamRepository.delete(team);
-        return ResponseEntity.ok(Map.of("message", "Team deleted successfully"));
+        return new RedirectView("/teams?messageType=teamDeleted");
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/addUser")
    @Transactional
-    public ResponseEntity<?> addUserToTeam(
+    public RedirectView addUserToTeam(
            @RequestParam("teamId") Long teamId, @RequestParam("userId") Long userId) {

        // Find the team
-        Optional<Team> teamOpt = teamRepository.findById(teamId);
-        if (teamOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "Team not found."));
-        }
-        Team team = teamOpt.get();
+        Team team =
+                teamRepository
+                        .findById(teamId)
+                        .orElseThrow(() -> new RuntimeException("Team not found"));

        // Prevent adding users to the Internal team
        if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot add users to Internal team."));
+            return new RedirectView("/teams?error=internalTeamNotAccessible");
        }

        // Find the user
-        Optional<User> userOpt = userRepository.findById(userId);
-        if (userOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "User not found."));
-        }
-        User user = userOpt.get();
+        User user =
+                userRepository
+                        .findById(userId)
+                        .orElseThrow(() -> new RuntimeException("User not found"));

        // Check if user is in the Internal team - prevent moving them
        if (user.getTeam() != null
                && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot move users from Internal team."));
+            return new RedirectView("/teams/" + teamId + "?error=cannotMoveInternalUsers");
        }

        // Assign user to team
        user.setTeam(team);
        userRepository.save(user);

-        return ResponseEntity.ok(Map.of("message", "User added to team successfully"));
+        // Redirect back to team details page
+        return new RedirectView("/teams/" + teamId + "?messageType=userAdded");
    }
 }
@@ -3,7 +3,6 @@ package stirling.software.proprietary.security.controller.api;
 import java.io.IOException;
 import java.security.Principal;
 import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -16,7 +15,10 @@ import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.view.RedirectView;

 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -36,7 +38,6 @@ import stirling.software.proprietary.security.model.User;
 import stirling.software.proprietary.security.model.api.user.UsernameAndPass;
 import stirling.software.proprietary.security.repository.TeamRepository;
 import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.proprietary.security.service.EmailService;
 import stirling.software.proprietary.security.service.TeamService;
 import stirling.software.proprietary.security.service.UserService;
 import stirling.software.proprietary.security.session.SessionPersistentRegistry;
@@ -52,215 +53,125 @@ public class UserController {
    private final ApplicationProperties applicationProperties;
    private final TeamRepository teamRepository;
    private final UserRepository userRepository;
-    private final Optional<EmailService> emailService;

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
    @PostMapping("/register")
-    public ResponseEntity<?> register(@RequestBody UsernameAndPass usernameAndPass)
+    public String register(@ModelAttribute UsernameAndPass requestModel, Model model)
            throws SQLException, UnsupportedProviderException {
-        try {
-            log.debug("Registration attempt for user: {}", usernameAndPass.getUsername());
-
-            if (userService.usernameExistsIgnoreCase(usernameAndPass.getUsername())) {
-                log.warn(
-                        "Registration failed: username already exists: {}",
-                        usernameAndPass.getUsername());
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "User already exists"));
-            }
-
-            if (!userService.isUsernameValid(usernameAndPass.getUsername())) {
-                log.warn(
-                        "Registration failed: invalid username format: {}",
-                        usernameAndPass.getUsername());
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Invalid username format"));
-            }
-
-            if (usernameAndPass.getPassword() == null
-                    || usernameAndPass.getPassword().length() < 6) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Password must be at least 6 characters"));
-            }
-
-            Team team = teamRepository.findByName(TeamService.DEFAULT_TEAM_NAME).orElse(null);
-            User user =
-                    userService.saveUser(
-                            usernameAndPass.getUsername(),
-                            usernameAndPass.getPassword(),
-                            team,
-                            Role.USER.getRoleId(),
-                            false);
-
-            log.info("User registered successfully: {}", usernameAndPass.getUsername());
-
-            return ResponseEntity.status(HttpStatus.CREATED)
-                    .body(
-                            Map.of(
-                                    "user",
-                                    buildUserResponse(user),
-                                    "message",
-                                    "Account created successfully. Please log in."));
-
-        } catch (IllegalArgumentException e) {
-            log.error("Registration validation error: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", e.getMessage()));
-        } catch (Exception e) {
-            log.error("Registration error for user: {}", usernameAndPass.getUsername(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(Map.of("error", "Registration failed: " + e.getMessage()));
+        if (userService.usernameExistsIgnoreCase(requestModel.getUsername())) {
+            model.addAttribute("error", "Username already exists");
+            return "register";
        }
-    }
-
-    /**
-     * Helper method to build user response object
-     *
-     * @param user User entity
-     * @return Map containing user information
-     */
-    private Map<String, Object> buildUserResponse(User user) {
-        Map<String, Object> userMap = new HashMap<>();
-        userMap.put("id", user.getId());
-        userMap.put("email", user.getUsername()); // Use username as email
-        userMap.put("username", user.getUsername());
-        userMap.put("role", user.getRolesAsString());
-        userMap.put("enabled", user.isEnabled());
-
-        // Add metadata for OAuth compatibility
-        Map<String, Object> appMetadata = new HashMap<>();
-        appMetadata.put("provider", user.getAuthenticationType()); // Default to email provider
-        userMap.put("app_metadata", appMetadata);
-
-        return userMap;
+        try {
+            Team team = teamRepository.findByName(TeamService.DEFAULT_TEAM_NAME).orElse(null);
+            userService.saveUser(
+                    requestModel.getUsername(),
+                    requestModel.getPassword(),
+                    team,
+                    Role.USER.getRoleId(),
+                    false);
+        } catch (IllegalArgumentException e) {
+            return "redirect:/login?messageType=invalidUsername";
+        }
+        return "redirect:/login?registered=true";
    }

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
    @PostMapping("/change-username")
-    public ResponseEntity<?> changeUsername(
+    public RedirectView changeUsername(
            Principal principal,
            @RequestParam(name = "currentPasswordChangeUsername") String currentPassword,
            @RequestParam(name = "newUsername") String newUsername,
            HttpServletRequest request,
-            HttpServletResponse response)
+            HttpServletResponse response,
+            RedirectAttributes redirectAttributes)
            throws IOException, SQLException, UnsupportedProviderException {
        if (!userService.isUsernameValid(newUsername)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "invalidUsername", "message", "Invalid username format"));
+            return new RedirectView("/account?messageType=invalidUsername", true);
        }
        if (principal == null) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "notAuthenticated", "message", "User not authenticated"));
+            return new RedirectView("/account?messageType=notAuthenticated", true);
        }
        // The username MUST be unique when renaming
        Optional<User> userOpt = userService.findByUsername(principal.getName());
        if (userOpt == null || userOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "userNotFound", "message", "User not found"));
+            return new RedirectView("/account?messageType=userNotFound", true);
        }
        User user = userOpt.get();
        if (user.getUsername().equals(newUsername)) {
-            return ResponseEntity.status(HttpStatus.CONFLICT)
-                    .body(Map.of("error", "usernameExists", "message", "Username already in use"));
+            return new RedirectView("/account?messageType=usernameExists", true);
        }
        if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "incorrectPassword", "message", "Incorrect password"));
+            return new RedirectView("/account?messageType=incorrectPassword", true);
        }
        if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
-            return ResponseEntity.status(HttpStatus.CONFLICT)
-                    .body(Map.of("error", "usernameExists", "message", "Username already exists"));
+            return new RedirectView("/account?messageType=usernameExists", true);
        }
        if (newUsername != null && newUsername.length() > 0) {
            try {
                userService.changeUsername(user, newUsername);
            } catch (IllegalArgumentException e) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(
-                                Map.of(
-                                        "error",
-                                        "invalidUsername",
-                                        "message",
-                                        "Invalid username format"));
+                return new RedirectView("/account?messageType=invalidUsername", true);
            }
        }
        // Logout using Spring's utility
        new SecurityContextLogoutHandler().logout(request, response, null);
-        return ResponseEntity.ok(
-                Map.of(
-                        "message",
-                        "credsUpdated",
-                        "description",
-                        "Username changed successfully. Please log in again."));
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
    }

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
    @PostMapping("/change-password-on-login")
-    public ResponseEntity<?> changePasswordOnLogin(
+    public RedirectView changePasswordOnLogin(
            Principal principal,
            @RequestParam(name = "currentPassword") String currentPassword,
            @RequestParam(name = "newPassword") String newPassword,
            HttpServletRequest request,
-            HttpServletResponse response)
+            HttpServletResponse response,
+            RedirectAttributes redirectAttributes)
            throws SQLException, UnsupportedProviderException {
        if (principal == null) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "notAuthenticated", "message", "User not authenticated"));
+            return new RedirectView("/change-creds?messageType=notAuthenticated", true);
        }
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
        if (userOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "userNotFound", "message", "User not found"));
+            return new RedirectView("/change-creds?messageType=userNotFound", true);
        }
        User user = userOpt.get();
        if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "incorrectPassword", "message", "Incorrect password"));
+            return new RedirectView("/change-creds?messageType=incorrectPassword", true);
        }
        userService.changePassword(user, newPassword);
        userService.changeFirstUse(user, false);
        // Logout using Spring's utility
        new SecurityContextLogoutHandler().logout(request, response, null);
-        return ResponseEntity.ok(
-                Map.of(
-                        "message",
-                        "credsUpdated",
-                        "description",
-                        "Password changed successfully. Please log in again."));
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
    }

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
    @PostMapping("/change-password")
-    public ResponseEntity<?> changePassword(
+    public RedirectView changePassword(
            Principal principal,
            @RequestParam(name = "currentPassword") String currentPassword,
            @RequestParam(name = "newPassword") String newPassword,
            HttpServletRequest request,
-            HttpServletResponse response)
+            HttpServletResponse response,
+            RedirectAttributes redirectAttributes)
            throws SQLException, UnsupportedProviderException {
        if (principal == null) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "notAuthenticated", "message", "User not authenticated"));
+            return new RedirectView("/account?messageType=notAuthenticated", true);
        }
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
        if (userOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "userNotFound", "message", "User not found"));
+            return new RedirectView("/account?messageType=userNotFound", true);
        }
        User user = userOpt.get();
        if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                    .body(Map.of("error", "incorrectPassword", "message", "Incorrect password"));
+            return new RedirectView("/account?messageType=incorrectPassword", true);
        }
        userService.changePassword(user, newPassword);
        // Logout using Spring's utility
        new SecurityContextLogoutHandler().logout(request, response, null);
-        return ResponseEntity.ok(
-                Map.of(
-                        "message",
-                        "credsUpdated",
-                        "description",
-                        "Password changed successfully. Please log in again."));
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
    }

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -278,23 +189,23 @@ public class UserController {
     *     </ul>
     *     Keys not listed above will be ignored.
     * @param principal The currently authenticated user.
-     * @return A ResponseEntity with success or error information.
+     * @return A redirect string to the account page after updating the settings.
     * @throws SQLException If a database error occurs.
     * @throws UnsupportedProviderException If the operation is not supported for the user's
     *     provider.
     */
-    public ResponseEntity<?> updateUserSettings(
-            @RequestBody Map<String, String> updates, Principal principal)
+    public String updateUserSettings(@RequestBody Map<String, String> updates, Principal principal)
            throws SQLException, UnsupportedProviderException {
        log.debug("Processed updates: {}", updates);
        // Assuming you have a method in userService to update the settings for a user
        userService.updateUserSettings(principal.getName(), updates);
-        return ResponseEntity.ok(Map.of("message", "Settings updated successfully"));
+        // Redirect to a page of your choice after updating
+        return "redirect:/account";
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/admin/saveUser")
-    public ResponseEntity<?> saveUser(
+    public RedirectView saveUser(
            @RequestParam(name = "username", required = true) String username,
            @RequestParam(name = "password", required = false) String password,
            @RequestParam(name = "role") String role,
@@ -304,42 +215,33 @@ public class UserController {
                    boolean forceChange)
            throws IllegalArgumentException, SQLException, UnsupportedProviderException {
        if (!userService.isUsernameValid(username)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(
-                            Map.of(
-                                    "error",
-                                    "Invalid username format. Username must be 3-50 characters."));
+            return new RedirectView("/adminSettings?messageType=invalidUsername", true);
        }
        if (applicationProperties.getPremium().isEnabled()
                && applicationProperties.getPremium().getMaxUsers()
                        <= userService.getTotalUsersCount()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Maximum number of users reached for your license."));
+            return new RedirectView("/adminSettings?messageType=maxUsersReached", true);
        }
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
        if (userOpt.isPresent()) {
            User user = userOpt.get();
            if (user.getUsername().equalsIgnoreCase(username)) {
-                return ResponseEntity.status(HttpStatus.CONFLICT)
-                        .body(Map.of("error", "Username already exists."));
+                return new RedirectView("/adminSettings?messageType=usernameExists", true);
            }
        }
        if (userService.usernameExistsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.CONFLICT)
-                    .body(Map.of("error", "Username already exists."));
+            return new RedirectView("/adminSettings?messageType=usernameExists", true);
        }
        try {
            // Validate the role
            Role roleEnum = Role.fromString(role);
            if (roleEnum == Role.INTERNAL_API_USER) {
                // If the role is INTERNAL_API_USER, reject the request
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Cannot assign INTERNAL_API_USER role."));
+                return new RedirectView("/adminSettings?messageType=invalidRole", true);
            }
        } catch (IllegalArgumentException e) {
-            // If the role ID is not valid, return error
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Invalid role specified."));
+            // If the role ID is not valid, redirect with an error message
+            return new RedirectView("/adminSettings?messageType=invalidRole", true);
        }

        // Use teamId if provided, otherwise use default team
@@ -355,144 +257,28 @@ public class UserController {
            Team selectedTeam = teamRepository.findById(effectiveTeamId).orElse(null);
            if (selectedTeam != null
                    && TeamService.INTERNAL_TEAM_NAME.equals(selectedTeam.getName())) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Cannot assign users to Internal team."));
+                return new RedirectView(
+                        "/adminSettings?messageType=internalTeamNotAccessible", true);
            }
        }

        if (authType.equalsIgnoreCase(AuthenticationType.SSO.toString())) {
            userService.saveUser(username, AuthenticationType.SSO, effectiveTeamId, role);
        } else {
-            if (password == null || password.isBlank()) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Password is required."));
-            }
-            if (password.length() < 6) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Password must be at least 6 characters."));
+            if (password.isBlank()) {
+                return new RedirectView("/adminSettings?messageType=invalidPassword", true);
            }
            userService.saveUser(username, password, effectiveTeamId, role, forceChange);
        }
-        return ResponseEntity.ok(Map.of("message", "User created successfully"));
-    }
-
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @PostMapping("/admin/inviteUsers")
-    public ResponseEntity<?> inviteUsers(
-            @RequestParam(name = "emails", required = true) String emails,
-            @RequestParam(name = "role", defaultValue = "ROLE_USER") String role,
-            @RequestParam(name = "teamId", required = false) Long teamId)
-            throws SQLException, UnsupportedProviderException {
-
-        // Check if email invites are enabled
-        if (!applicationProperties.getMail().isEnableInvites()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Email invites are not enabled"));
-        }
-
-        // Check if email service is available
-        if (!emailService.isPresent()) {
-            return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
-                    .body(
-                            Map.of(
-                                    "error",
-                                    "Email service is not configured. Please configure SMTP settings."));
-        }
-
-        // Parse comma-separated email addresses
-        String[] emailArray = emails.split(",");
-        if (emailArray.length == 0) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "At least one email address is required"));
-        }
-
-        // Check license limits
-        if (applicationProperties.getPremium().isEnabled()) {
-            long currentUserCount = userService.getTotalUsersCount();
-            int maxUsers = applicationProperties.getPremium().getMaxUsers();
-            long availableSlots = maxUsers - currentUserCount;
-            if (availableSlots < emailArray.length) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(
-                                Map.of(
-                                        "error",
-                                        "Not enough user slots available. Available: "
-                                                + availableSlots
-                                                + ", Requested: "
-                                                + emailArray.length));
-            }
-        }
-
-        // Validate role
-        try {
-            Role roleEnum = Role.fromString(role);
-            if (roleEnum == Role.INTERNAL_API_USER) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Cannot assign INTERNAL_API_USER role"));
-            }
-        } catch (IllegalArgumentException e) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Invalid role specified"));
-        }
-
-        // Determine team
-        Long effectiveTeamId = teamId;
-        if (effectiveTeamId == null) {
-            Team defaultTeam =
-                    teamRepository.findByName(TeamService.DEFAULT_TEAM_NAME).orElse(null);
-            if (defaultTeam != null) {
-                effectiveTeamId = defaultTeam.getId();
-            }
-        } else {
-            Team selectedTeam = teamRepository.findById(effectiveTeamId).orElse(null);
-            if (selectedTeam != null
-                    && TeamService.INTERNAL_TEAM_NAME.equals(selectedTeam.getName())) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Cannot assign users to Internal team"));
-            }
-        }
-
-        int successCount = 0;
-        int failureCount = 0;
-        StringBuilder errors = new StringBuilder();
-
-        // Process each email
-        for (String email : emailArray) {
-            email = email.trim();
-            if (email.isEmpty()) {
-                continue;
-            }
-
-            InviteResult result = processEmailInvite(email, effectiveTeamId, role);
-            if (result.isSuccess()) {
-                successCount++;
-            } else {
-                failureCount++;
-                errors.append(result.getErrorMessage()).append("; ");
-            }
-        }
-
-        Map<String, Object> response = new HashMap<>();
-        response.put("successCount", successCount);
-        response.put("failureCount", failureCount);
-
-        if (failureCount > 0) {
-            response.put("errors", errors.toString());
-        }
-
-        if (successCount > 0) {
-            response.put("message", successCount + " user(s) invited successfully");
-            return ResponseEntity.ok(response);
-        } else {
-            response.put("error", "Failed to invite any users");
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
-        }
+        return new RedirectView(
+                "/adminSettings", // Redirect to account page after adding the user
+                true);
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/admin/changeRole")
    @Transactional
-    public ResponseEntity<?> changeRole(
+    public RedirectView changeRole(
            @RequestParam(name = "username") String username,
            @RequestParam(name = "role") String role,
            @RequestParam(name = "teamId", required = false) Long teamId,
@@ -500,32 +286,27 @@ public class UserController {
            throws SQLException, UnsupportedProviderException {
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
        if (!userOpt.isPresent()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "User not found."));
+            return new RedirectView("/adminSettings?messageType=userNotFound", true);
        }
        if (!userService.usernameExistsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "User not found."));
+            return new RedirectView("/adminSettings?messageType=userNotFound", true);
        }
        // Get the currently authenticated username
        String currentUsername = authentication.getName();
        // Check if the provided username matches the current session's username
        if (currentUsername.equalsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot change your own role."));
+            return new RedirectView("/adminSettings?messageType=downgradeCurrentUser", true);
        }
        try {
            // Validate the role
            Role roleEnum = Role.fromString(role);
            if (roleEnum == Role.INTERNAL_API_USER) {
                // If the role is INTERNAL_API_USER, reject the request
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body(Map.of("error", "Cannot assign INTERNAL_API_USER role."));
+                return new RedirectView("/adminSettings?messageType=invalidRole", true);
            }
        } catch (IllegalArgumentException e) {
-            // If the role ID is not valid, return error
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Invalid role specified."));
+            // If the role ID is not valid, redirect with an error message
+            return new RedirectView("/adminSettings?messageType=invalidRole", true);
        }
        User user = userOpt.get();

@@ -535,15 +316,15 @@ public class UserController {
            if (team != null) {
                // Prevent assigning to Internal team
                if (TeamService.INTERNAL_TEAM_NAME.equals(team.getName())) {
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                            .body(Map.of("error", "Cannot assign users to Internal team."));
+                    return new RedirectView(
+                            "/adminSettings?messageType=internalTeamNotAccessible", true);
                }

                // Prevent moving users from Internal team
                if (user.getTeam() != null
                        && TeamService.INTERNAL_TEAM_NAME.equals(user.getTeam().getName())) {
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                            .body(Map.of("error", "Cannot move users from Internal team."));
+                    return new RedirectView(
+                            "/adminSettings?messageType=cannotMoveInternalUsers", true);
                }

                user.setTeam(team);
@@ -552,31 +333,30 @@ public class UserController {
        }

        userService.changeRole(user, role);
-        return ResponseEntity.ok(Map.of("message", "User role updated successfully"));
+        return new RedirectView(
+                "/adminSettings", // Redirect to account page after adding the user
+                true);
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/admin/changeUserEnabled/{username}")
-    public ResponseEntity<?> changeUserEnabled(
+    public RedirectView changeUserEnabled(
            @PathVariable("username") String username,
            @RequestParam("enabled") boolean enabled,
            Authentication authentication)
            throws SQLException, UnsupportedProviderException {
        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
        if (userOpt.isEmpty()) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "User not found."));
+            return new RedirectView("/adminSettings?messageType=userNotFound", true);
        }
        if (!userService.usernameExistsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "User not found."));
+            return new RedirectView("/adminSettings?messageType=userNotFound", true);
        }
        // Get the currently authenticated username
        String currentUsername = authentication.getName();
        // Check if the provided username matches the current session's username
        if (currentUsername.equalsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot disable your own account."));
+            return new RedirectView("/adminSettings?messageType=disabledCurrentUser", true);
        }
        User user = userOpt.get();
        userService.changeUserEnabled(user, enabled);
@@ -603,24 +383,23 @@ public class UserController {
                }
            }
        }
-        return ResponseEntity.ok(
-                Map.of("message", "User " + (enabled ? "enabled" : "disabled") + " successfully"));
+        return new RedirectView(
+                "/adminSettings", // Redirect to account page after adding the user
+                true);
    }

    @PreAuthorize("hasRole('ROLE_ADMIN')")
    @PostMapping("/admin/deleteUser/{username}")
-    public ResponseEntity<?> deleteUser(
+    public RedirectView deleteUser(
            @PathVariable("username") String username, Authentication authentication) {
        if (!userService.usernameExistsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(Map.of("error", "User not found."));
+            return new RedirectView("/adminSettings?messageType=deleteUsernameExists", true);
        }
        // Get the currently authenticated username
        String currentUsername = authentication.getName();
        // Check if the provided username matches the current session's username
        if (currentUsername.equalsIgnoreCase(username)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(Map.of("error", "Cannot delete your own account."));
+            return new RedirectView("/adminSettings?messageType=deleteCurrentUser", true);
        }
        // Invalidate all sessions before deleting the user
        List<SessionInformation> sessionsInformations =
@@ -630,7 +409,7 @@ public class UserController {
            sessionRegistry.removeSessionInformation(sessionsInformation.getSessionId());
        }
        userService.deleteUser(username);
-        return ResponseEntity.ok(Map.of("message", "User deleted successfully"));
+        return new RedirectView("/adminSettings", true);
    }

    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -661,73 +440,4 @@ public class UserController {
        }
        return ResponseEntity.ok(apiKey);
    }
-
-    /**
-     * Helper method to process a single email invitation.
-     *
-     * @param email The email address to invite
-     * @param teamId The team ID to assign the user to
-     * @param role The role to assign to the user
-     * @return InviteResult containing success status and optional error message
-     */
-    private InviteResult processEmailInvite(String email, Long teamId, String role) {
-        try {
-            // Validate email format (basic check)
-            if (!email.contains("@") || !email.contains(".")) {
-                return InviteResult.failure(email + ": Invalid email format");
-            }
-
-            // Check if user already exists
-            if (userService.usernameExistsIgnoreCase(email)) {
-                return InviteResult.failure(email + ": User already exists");
-            }
-
-            // Generate random password
-            String temporaryPassword = java.util.UUID.randomUUID().toString().substring(0, 12);
-
-            // Create user with forceChange=true
-            userService.saveUser(email, temporaryPassword, teamId, role, true);
-
-            // Send invite email
-            try {
-                emailService.get().sendInviteEmail(email, email, temporaryPassword);
-                log.info("Sent invite email to: {}", email);
-                return InviteResult.success();
-            } catch (Exception emailEx) {
-                log.error("Failed to send invite email to {}: {}", email, emailEx.getMessage());
-                return InviteResult.failure(email + ": User created but email failed to send");
-            }
-
-        } catch (Exception e) {
-            log.error("Failed to invite user {}: {}", email, e.getMessage());
-            return InviteResult.failure(email + ": " + e.getMessage());
-        }
-    }
-
-    /** Result object for individual email invite processing. */
-    private static class InviteResult {
-        private final boolean success;
-        private final String errorMessage;
-
-        private InviteResult(boolean success, String errorMessage) {
-            this.success = success;
-            this.errorMessage = errorMessage;
-        }
-
-        static InviteResult success() {
-            return new InviteResult(true, null);
-        }
-
-        static InviteResult failure(String errorMessage) {
-            return new InviteResult(false, errorMessage);
-        }
-
-        boolean isSuccess() {
-            return success;
-        }
-
-        String getErrorMessage() {
-            return errorMessage;
-        }
-    }
 }
@@ -22,8 +22,6 @@ public interface UserRepository extends JpaRepository<User, Long> {

    Optional<User> findByApiKey(String apiKey);

-    Optional<User> findBySsoProviderAndSsoProviderId(String ssoProvider, String ssoProviderId);
-
    List<User> findByAuthenticationTypeIgnoreCase(String authenticationType);

    @Query("SELECT u FROM User u WHERE u.team IS NULL")
@@ -0,0 +1,77 @@
+package stirling.software.proprietary.security.filter;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Optional;
+
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+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 jakarta.servlet.http.HttpSession;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.util.RequestUriUtils;
+import stirling.software.proprietary.security.model.User;
+import stirling.software.proprietary.security.service.UserService;
+
+@Slf4j
+@Component
+public class FirstLoginFilter extends OncePerRequestFilter {
+
+    @Lazy private final UserService userService;
+
+    public FirstLoginFilter(@Lazy UserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    protected void doFilterInternal(
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        String method = request.getMethod();
+        String requestURI = request.getRequestURI();
+        String contextPath = request.getContextPath();
+        // Check if the request is for static resources
+        boolean isStaticResource = RequestUriUtils.isStaticResource(contextPath, requestURI);
+        // If it's a static resource, just continue the filter chain and skip the logic below
+        if (isStaticResource) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && authentication.isAuthenticated()) {
+            Optional<User> user = userService.findByUsernameIgnoreCase(authentication.getName());
+            if ("GET".equalsIgnoreCase(method)
+                    && user.isPresent()
+                    && user.get().isFirstLogin()
+                    && !(contextPath + "/change-creds").equals(requestURI)) {
+                response.sendRedirect(contextPath + "/change-creds");
+                return;
+            }
+        }
+        if (log.isDebugEnabled()) {
+            HttpSession session = request.getSession(true);
+            SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+            String creationTime = timeFormat.format(new Date(session.getCreationTime()));
+            log.debug(
+                    "Request Info - New: {}, creationTimeSession {}, ID:  {}, IP: {}, User-Agent: {}, Referer: {}, Request URL: {}",
+                    session.isNew(),
+                    creationTime,
+                    session.getId(),
+                    request.getRemoteAddr(),
+                    request.getHeader("User-Agent"),
+                    request.getHeader("Referer"),
+                    request.getRequestURL().toString());
+        }
+        filterChain.doFilter(request, response);
+    }
+}
@@ -1,9 +1,8 @@
 package stirling.software.proprietary.security.filter;

 import static stirling.software.common.util.RequestUriUtils.isStaticResource;
-import static stirling.software.proprietary.security.model.AuthenticationType.OAUTH2;
+import static stirling.software.proprietary.security.model.AuthenticationType.*;
 import static stirling.software.proprietary.security.model.AuthenticationType.SAML2;
-import static stirling.software.proprietary.security.model.AuthenticationType.WEB;

 import java.io.IOException;
 import java.sql.SQLException;
@@ -76,60 +75,29 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
            String jwtToken = jwtService.extractToken(request);

            if (jwtToken == null) {
-                // Allow specific auth endpoints to pass through without JWT
+                // Any unauthenticated requests should redirect to /login
                String requestURI = request.getRequestURI();
                String contextPath = request.getContextPath();

-                // Public auth endpoints that don't require JWT
-                boolean isPublicAuthEndpoint =
-                        requestURI.startsWith(contextPath + "/login")
-                                || requestURI.startsWith(contextPath + "/signup")
-                                || requestURI.startsWith(contextPath + "/auth/")
-                                || requestURI.startsWith(contextPath + "/oauth2")
-                                || requestURI.startsWith(contextPath + "/api/v1/auth/login")
-                                || requestURI.startsWith(contextPath + "/api/v1/auth/register")
-                                || requestURI.startsWith(contextPath + "/api/v1/auth/refresh");
-
-                if (!isPublicAuthEndpoint) {
-                    // For API requests, return 401 JSON
-                    String acceptHeader = request.getHeader("Accept");
-                    if (requestURI.startsWith(contextPath + "/api/")
-                            || (acceptHeader != null
-                                    && acceptHeader.contains("application/json"))) {
-                        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-                        response.setContentType("application/json");
-                        response.getWriter().write("{\"error\":\"Authentication required\"}");
-                        return;
-                    }
-
-                    // For HTML requests (SPA routes), let React Router handle it (serve
-                    // index.html)
-                    filterChain.doFilter(request, response);
+                if (!requestURI.startsWith(contextPath + "/login")) {
+                    response.sendRedirect("/login");
                    return;
                }
-
-                // For public auth endpoints without JWT, continue to the endpoint
-                filterChain.doFilter(request, response);
-                return;
            }

            try {
-                log.debug("Validating JWT token");
                jwtService.validateToken(jwtToken);
-                log.debug("JWT token validated successfully");
            } catch (AuthenticationFailureException e) {
-                log.warn("JWT validation failed: {}", e.getMessage());
+                jwtService.clearToken(response);
                handleAuthenticationFailure(request, response, e);
                return;
            }

            Map<String, Object> claims = jwtService.extractClaims(jwtToken);
            String tokenUsername = claims.get("sub").toString();
-            log.debug("JWT token username: {}", tokenUsername);

            try {
                authenticate(request, claims);
-                log.debug("Authentication successful for user: {}", tokenUsername);
            } catch (SQLException | UnsupportedProviderException e) {
                log.error("Error processing user authentication for user: {}", tokenUsername, e);
                handleAuthenticationFailure(
@@ -207,26 +175,21 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
    private void processUserAuthenticationType(Map<String, Object> claims, String username)
            throws SQLException, UnsupportedProviderException {
        AuthenticationType authenticationType =
-                AuthenticationType.valueOf(
-                        claims.getOrDefault("authType", WEB).toString().toUpperCase());
+                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();
-                // Provider IDs should already be set during initial authentication
-                // Pass null here since this is validating an existing JWT token
                userService.processSSOPostLogin(
-                        username, null, null, oauth2Properties.getAutoCreateUser(), OAUTH2);
+                        username, oauth2Properties.getAutoCreateUser(), OAUTH2);
            }
            case SAML2 -> {
                ApplicationProperties.Security.SAML2 saml2Properties =
                        securityProperties.getSaml2();
-                // Provider IDs should already be set during initial authentication
-                // Pass null here since this is validating an existing JWT token
                userService.processSSOPostLogin(
-                        username, null, null, saml2Properties.getAutoCreateUser(), SAML2);
+                        username, saml2Properties.getAutoCreateUser(), SAML2);
            }
        }
    }
@@ -236,10 +236,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
            contextPath + "/pdfjs/",
            contextPath + "/pdfjs-legacy/",
            contextPath + "/api/v1/info/status",
-            contextPath + "/api/v1/auth/login",
-            contextPath + "/api/v1/auth/register",
-            contextPath + "/api/v1/auth/refresh",
-            contextPath + "/api/v1/auth/me",
            contextPath + "/site.webmanifest"
        };

@@ -1,15 +1,12 @@
 package stirling.software.proprietary.security.model;

 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
 import org.springframework.security.core.userdetails.UserDetails;

 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -62,17 +59,12 @@ public class User implements UserDetails, Serializable {
    @Column(name = "authenticationtype")
    private String authenticationType;

-    @Column(name = "sso_provider_id")
-    private String ssoProviderId;
-
-    @Column(name = "sso_provider")
-    private String ssoProvider;
-
    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
    private Set<Authority> authorities = new HashSet<>();

    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "team_id")
+    @JsonIgnore
    private Team team;

    @ElementCollection
@@ -80,17 +72,8 @@ public class User implements UserDetails, Serializable {
    @Lob
    @Column(name = "setting_value", columnDefinition = "text")
    @CollectionTable(name = "user_settings", joinColumns = @JoinColumn(name = "user_id"))
-    @JsonIgnore
    private Map<String, String> settings = new HashMap<>(); // Key-value pairs of settings.

-    @CreationTimestamp
-    @Column(name = "created_at", updatable = false)
-    private LocalDateTime createdAt;
-
-    @UpdateTimestamp
-    @Column(name = "updated_at")
-    private LocalDateTime updatedAt;
-
    public String getRoleName() {
        return Role.getRoleNameByRoleId(getRolesAsString());
    }
@@ -10,7 +10,6 @@ import java.util.Map;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;
@@ -73,6 +72,12 @@ public class CustomOAuth2AuthenticationSuccessHandler
                throw new LockedException(
                        "Your account has been locked due to too many failed login attempts.");
            }
+            if (jwtService.isJwtEnabled()) {
+                String jwt =
+                        jwtService.generateToken(
+                                authentication, Map.of("authType", AuthenticationType.OAUTH2));
+                jwtService.addToken(response, jwt);
+            }
            if (userService.isUserDisabled(username)) {
                getRedirectStrategy()
                        .sendRedirect(request, response, "/logout?userIsDisabled=true");
@@ -93,95 +98,14 @@ public class CustomOAuth2AuthenticationSuccessHandler
                    response.sendRedirect(contextPath + "/logout?oAuth2AdminBlockedUser=true");
                    return;
                }
-                if (principal instanceof OAuth2User oAuth2User) {
-                    // Extract SSO provider information from OAuth2User
-                    String ssoProviderId = oAuth2User.getAttribute("sub"); // OIDC ID
-                    // Extract provider from authentication - need to get it from the token/request
-                    // For now, we'll extract it in a more generic way
-                    String ssoProvider = extractProviderFromAuthentication(authentication);
-
+                if (principal instanceof OAuth2User) {
                    userService.processSSOPostLogin(
-                            username,
-                            ssoProviderId,
-                            ssoProvider,
-                            oauth2Properties.getAutoCreateUser(),
-                            OAUTH2);
-                }
-
-                // Generate JWT if v2 is enabled
-                if (jwtService.isJwtEnabled()) {
-                    String jwt =
-                            jwtService.generateToken(
-                                    authentication, Map.of("authType", AuthenticationType.OAUTH2));
-
-                    // Build context-aware redirect URL based on the original request
-                    String redirectUrl = buildContextAwareRedirectUrl(request, contextPath, jwt);
-
-                    response.sendRedirect(redirectUrl);
-                } else {
-                    // v1: redirect directly to home
-                    response.sendRedirect(contextPath + "/");
+                            username, oauth2Properties.getAutoCreateUser(), OAUTH2);
                }
+                response.sendRedirect(contextPath + "/");
            } catch (IllegalArgumentException | SQLException | UnsupportedProviderException e) {
                response.sendRedirect(contextPath + "/logout?invalidUsername=true");
            }
        }
    }
-
-    /**
-     * Extracts the OAuth2 provider registration ID from the authentication object.
-     *
-     * @param authentication The authentication object
-     * @return The provider registration ID (e.g., "google", "github"), or null if not available
-     */
-    private String extractProviderFromAuthentication(Authentication authentication) {
-        if (authentication instanceof OAuth2AuthenticationToken oauth2Token) {
-            return oauth2Token.getAuthorizedClientRegistrationId();
-        }
-        return null;
-    }
-
-    /**
-     * Builds a context-aware redirect URL based on the request's origin
-     *
-     * @param request The HTTP request
-     * @param contextPath The application context path
-     * @param jwt The JWT token to include
-     * @return The appropriate redirect URL
-     */
-    private String buildContextAwareRedirectUrl(
-            HttpServletRequest request, String contextPath, String jwt) {
-        // Try to get the origin from the Referer header first
-        String referer = request.getHeader("Referer");
-        if (referer != null && !referer.isEmpty()) {
-            try {
-                java.net.URL refererUrl = new java.net.URL(referer);
-                String origin = refererUrl.getProtocol() + "://" + refererUrl.getHost();
-                if (refererUrl.getPort() != -1
-                        && refererUrl.getPort() != 80
-                        && refererUrl.getPort() != 443) {
-                    origin += ":" + refererUrl.getPort();
-                }
-                return origin + "/auth/callback#access_token=" + jwt;
-            } catch (java.net.MalformedURLException e) {
-                // Fall back to other methods if referer is malformed
-            }
-        }
-
-        // Fall back to building from request host/port
-        String scheme = request.getScheme();
-        String serverName = request.getServerName();
-        int serverPort = request.getServerPort();
-
-        StringBuilder origin = new StringBuilder();
-        origin.append(scheme).append("://").append(serverName);
-
-        // Only add port if it's not the default port for the scheme
-        if ((!"http".equals(scheme) || serverPort != 80)
-                && (!"https".equals(scheme) || serverPort != 443)) {
-            origin.append(":").append(serverPort);
-        }
-
-        return origin.toString() + "/auth/callback#access_token=" + jwt;
-    }
 }
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;

+import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -40,7 +41,7 @@ import stirling.software.proprietary.security.service.UserService;

@Slf4j
@Configuration
-@ConditionalOnProperty(prefix = "security", name = "oauth2.enabled", havingValue = "true")
+@ConditionalOnBooleanProperty("security.oauth2.enabled")
 public class OAuth2Configuration {

    public static final String REDIRECT_URI_PATH = "{baseUrl}/login/oauth2/code/";
@@ -52,9 +53,6 @@ public class OAuth2Configuration {
            ApplicationProperties applicationProperties, @Lazy UserService userService) {
        this.userService = userService;
        this.applicationProperties = applicationProperties;
-        log.info(
-                "OAuth2Configuration initialized - OAuth2 enabled: {}",
-                applicationProperties.getSecurity().getOauth2().getEnabled());
    }

    @Bean
@@ -77,7 +75,7 @@ public class OAuth2Configuration {
    private Optional<ClientRegistration> keycloakClientRegistration() {
        OAUTH2 oauth2 = applicationProperties.getSecurity().getOauth2();

-        if (isOAuth2Disabled(oauth2) || isClientInitialised(oauth2)) {
+        if (isOAuth2Enabled(oauth2) || isClientInitialised(oauth2)) {
            return Optional.empty();
        }

@@ -107,7 +105,7 @@ public class OAuth2Configuration {
    private Optional<ClientRegistration> googleClientRegistration() {
        OAUTH2 oAuth2 = applicationProperties.getSecurity().getOauth2();

-        if (isOAuth2Disabled(oAuth2) || isClientInitialised(oAuth2)) {
+        if (isOAuth2Enabled(oAuth2) || isClientInitialised(oAuth2)) {
            return Optional.empty();
        }

@@ -140,23 +138,12 @@ public class OAuth2Configuration {
    private Optional<ClientRegistration> githubClientRegistration() {
        OAUTH2 oAuth2 = applicationProperties.getSecurity().getOauth2();

-        if (isOAuth2Disabled(oAuth2)) {
-            log.debug("OAuth2 is disabled, skipping GitHub client registration");
+        if (isOAuth2Enabled(oAuth2)) {
            return Optional.empty();
        }

        Client client = oAuth2.getClient();
-        if (client == null) {
-            log.debug("OAuth2 client configuration is null, skipping GitHub");
-            return Optional.empty();
-        }
-
        GitHubProvider githubClient = client.getGithub();
-        if (githubClient == null) {
-            log.debug("GitHub client configuration is null");
-            return Optional.empty();
-        }
-
        Provider github =
                new GitHubProvider(
                        githubClient.getClientId(),
@@ -164,15 +151,7 @@ public class OAuth2Configuration {
                        githubClient.getScopes(),
                        githubClient.getUseAsUsername());

-        boolean isValid = validateProvider(github);
-        log.info(
-                "GitHub OAuth2 provider validation: {} (clientId: {}, clientSecret: {}, scopes: {})",
-                isValid,
-                githubClient.getClientId(),
-                githubClient.getClientSecret() != null ? "***" : "null",
-                githubClient.getScopes());
-
-        return isValid
+        return validateProvider(github)
                ? Optional.of(
                        ClientRegistration.withRegistrationId(github.getName())
                                .clientId(github.getClientId())
@@ -192,7 +171,7 @@ public class OAuth2Configuration {
    private Optional<ClientRegistration> oidcClientRegistration() {
        OAUTH2 oauth = applicationProperties.getSecurity().getOauth2();

-        if (isOAuth2Disabled(oauth) || isClientInitialised(oauth)) {
+        if (isOAuth2Enabled(oauth) || isClientInitialised(oauth)) {
            return Optional.empty();
        }

@@ -228,7 +207,7 @@ public class OAuth2Configuration {
                : Optional.empty();
    }

-    private boolean isOAuth2Disabled(OAUTH2 oAuth2) {
+    private boolean isOAuth2Enabled(OAUTH2 oAuth2) {
        return oAuth2 == null || !oAuth2.getEnabled();
    }

@@ -116,41 +116,13 @@ public class CustomSaml2AuthenticationSuccessHandler
                                contextPath + "/login?errorOAuth=oAuth2AdminBlockedUser");
                        return;
                    }
-
-                    // Extract SSO provider information from SAML2 assertion
-                    String ssoProviderId = saml2Principal.nameId();
-                    String ssoProvider = "saml2"; // fixme
-
-                    log.debug(
-                            "Processing SSO post-login for user: {} (Provider: {}, ProviderId: {})",
-                            username,
-                            ssoProvider,
-                            ssoProviderId);
-
+                    log.debug("Processing SSO post-login for user: {}", username);
                    userService.processSSOPostLogin(
-                            username,
-                            ssoProviderId,
-                            ssoProvider,
-                            saml2Properties.getAutoCreateUser(),
-                            SAML2);
+                            username, saml2Properties.getAutoCreateUser(), SAML2);
                    log.debug("Successfully processed authentication for user: {}", username);

-                    // Generate JWT if v2 is enabled
-                    if (jwtService.isJwtEnabled()) {
-                        String jwt =
-                                jwtService.generateToken(
-                                        authentication,
-                                        Map.of("authType", AuthenticationType.SAML2));
-
-                        // Build context-aware redirect URL based on the original request
-                        String redirectUrl =
-                                buildContextAwareRedirectUrl(request, contextPath, jwt);
-
-                        response.sendRedirect(redirectUrl);
-                    } else {
-                        // v1: redirect directly to home
-                        response.sendRedirect(contextPath + "/");
-                    }
+                    generateJwt(response, authentication);
+                    response.sendRedirect(contextPath + "/");
                } catch (IllegalArgumentException | SQLException | UnsupportedProviderException e) {
                    log.debug(
                            "Invalid username detected for user: {}, redirecting to logout",
@@ -164,48 +136,12 @@ public class CustomSaml2AuthenticationSuccessHandler
        }
    }

-    /**
-     * Builds a context-aware redirect URL based on the request's origin
-     *
-     * @param request The HTTP request
-     * @param contextPath The application context path
-     * @param jwt The JWT token to include
-     * @return The appropriate redirect URL
-     */
-    private String buildContextAwareRedirectUrl(
-            HttpServletRequest request, String contextPath, String jwt) {
-        // Try to get the origin from the Referer header first
-        String referer = request.getHeader("Referer");
-        if (referer != null && !referer.isEmpty()) {
-            try {
-                java.net.URL refererUrl = new java.net.URL(referer);
-                String origin = refererUrl.getProtocol() + "://" + refererUrl.getHost();
-                if (refererUrl.getPort() != -1
-                        && refererUrl.getPort() != 80
-                        && refererUrl.getPort() != 443) {
-                    origin += ":" + refererUrl.getPort();
-                }
-                return origin + "/auth/callback#access_token=" + jwt;
-            } catch (java.net.MalformedURLException e) {
-                log.debug(
-                        "Malformed referer URL: {}, falling back to request-based origin", referer);
-            }
+    private void generateJwt(HttpServletResponse response, Authentication authentication) {
+        if (jwtService.isJwtEnabled()) {
+            String jwt =
+                    jwtService.generateToken(
+                            authentication, Map.of("authType", AuthenticationType.SAML2));
+            jwtService.addToken(response, jwt);
        }
-
-        // Fall back to building from request host/port
-        String scheme = request.getScheme();
-        String serverName = request.getServerName();
-        int serverPort = request.getServerPort();
-
-        StringBuilder origin = new StringBuilder();
-        origin.append(scheme).append("://").append(serverName);
-
-        // Only add port if it's not the default port for the scheme
-        if ((!"http".equals(scheme) || serverPort != 80)
-                && (!"https".equals(scheme) || serverPort != 443)) {
-            origin.append(":").append(serverPort);
-        }
-
-        return origin + "/auth/callback#access_token=" + jwt;
    }
 }
@@ -14,6 +14,7 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.enumeration.UsernameAttribute;
 import stirling.software.proprietary.security.model.User;

@@ -26,13 +27,13 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques

    private final LoginAttemptService loginAttemptService;

-    private final ApplicationProperties.Security.OAUTH2 oauth2Properties;
+    private final ApplicationProperties.Security securityProperties;

    public CustomOAuth2UserService(
-            ApplicationProperties.Security.OAUTH2 oauth2Properties,
+            ApplicationProperties.Security securityProperties,
            UserService userService,
            LoginAttemptService loginAttemptService) {
-        this.oauth2Properties = oauth2Properties;
+        this.securityProperties = securityProperties;
        this.userService = userService;
        this.loginAttemptService = loginAttemptService;
    }
@@ -41,22 +42,14 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
    public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
        try {
            OidcUser user = delegate.loadUser(userRequest);
-            String usernameAttributeKey =
-                    UsernameAttribute.valueOf(oauth2Properties.getUseAsUsername().toUpperCase())
-                            .getName();
+            OAUTH2 oauth2 = securityProperties.getOauth2();
+            UsernameAttribute usernameAttribute =
+                    UsernameAttribute.valueOf(oauth2.getUseAsUsername().toUpperCase());
+            String usernameAttributeKey = usernameAttribute.getName();

-            // Extract SSO provider information
-            String ssoProviderId = user.getSubject(); // Standard OIDC 'sub' claim
-            String ssoProvider = userRequest.getClientRegistration().getRegistrationId();
-            String username = user.getAttribute(usernameAttributeKey);
-
-            log.debug(
-                    "OAuth2 login - Provider: {}, ProviderId: {}, Username: {}",
-                    ssoProvider,
-                    ssoProviderId,
-                    username);
-
-            Optional<User> internalUser = userService.findByUsernameIgnoreCase(username);
+            // todo: save user by OIDC ID instead of username
+            Optional<User> internalUser =
+                    userService.findByUsernameIgnoreCase(user.getAttribute(usernameAttributeKey));

            if (internalUser.isPresent()) {
                String internalUsername = internalUser.get().getUsername();
@@ -73,90 +73,4 @@ public class EmailService {
        // Sends the email via the configured mail sender
        mailSender.send(message);
    }
-
-    /**
-     * Sends a plain text/HTML email without attachments asynchronously.
-     *
-     * @param to The recipient email address
-     * @param subject The email subject
-     * @param body The email body (can contain HTML)
-     * @param isHtml Whether the body contains HTML content
-     * @throws MessagingException If there is an issue with creating or sending the email.
-     */
-    @Async
-    public void sendPlainEmail(String to, String subject, String body, boolean isHtml)
-            throws MessagingException {
-        // Validate recipient email address
-        if (to == null || to.trim().isEmpty()) {
-            throw new MessagingException("Invalid recipient email address");
-        }
-
-        ApplicationProperties.Mail mailProperties = applicationProperties.getMail();
-
-        // Creates a MimeMessage to represent the email
-        MimeMessage message = mailSender.createMimeMessage();
-
-        // Helper class to set up the message content
-        MimeMessageHelper helper = new MimeMessageHelper(message, false);
-
-        // Sets the recipient, subject, body, and sender email
-        helper.addTo(to);
-        helper.setSubject(subject);
-        helper.setText(body, isHtml);
-        helper.setFrom(mailProperties.getFrom());
-
-        // Sends the email via the configured mail sender
-        mailSender.send(message);
-    }
-
-    /**
-     * Sends an invitation email to a new user with their credentials.
-     *
-     * @param to The recipient email address
-     * @param username The username for the new account
-     * @param temporaryPassword The temporary password
-     * @throws MessagingException If there is an issue with creating or sending the email.
-     */
-    @Async
-    public void sendInviteEmail(String to, String username, String temporaryPassword)
-            throws MessagingException {
-        String subject = "Welcome to Stirling PDF";
-
-        String body =
-                """
-                <html><body style="margin: 0; padding: 0;">
-                <div style="font-family: Arial, sans-serif; background-color: #f8f9fa; padding: 20px;">
-                  <div style="max-width: 600px; margin: auto; background-color: #ffffff; border-radius: 8px; overflow: hidden; border: 1px solid #e0e0e0;">
-                    <!-- Logo -->
-                    <div style="text-align: center; padding: 20px; background-color: #222;">
-                      <img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling-transparent.svg" alt="Stirling PDF" style="max-height: 60px;">
-                    </div>
-                    <!-- Content -->
-                    <div style="padding: 30px; color: #333;">
-                      <h2 style="color: #222; margin-top: 0;">Welcome to Stirling PDF!</h2>
-                      <p>Hi there,</p>
-                      <p>You have been invited to join the workspace. Below are your login credentials:</p>
-                      <!-- Credentials Box -->
-                      <div style="background-color: #f8f9fa; border-left: 4px solid #007bff; padding: 15px; margin: 20px 0; border-radius: 4px;">
-                        <p style="margin: 0 0 10px 0;"><strong>Username:</strong> %s</p>
-                        <p style="margin: 0;"><strong>Temporary Password:</strong> %s</p>
-                      </div>
-                      <div style="background-color: #fff3cd; border-left: 4px solid #ffc107; padding: 15px; margin: 20px 0; border-radius: 4px;">
-                        <p style="margin: 0; color: #856404;"><strong>⚠️ Important:</strong> You will be required to change your password upon first login for security reasons.</p>
-                      </div>
-                      <p>Please keep these credentials secure and do not share them with anyone.</p>
-                      <p style="margin-bottom: 0;">— The Stirling PDF Team</p>
-                    </div>
-                    <!-- Footer -->
-                    <div style="text-align: center; padding: 15px; font-size: 12px; color: #777; background-color: #f0f0f0;">
-                      &copy; 2025 Stirling PDF. All rights reserved.
-                    </div>
-                  </div>
-                </div>
-                </body></html>
-                """
-                        .formatted(username, temporaryPassword);
-
-        sendPlainEmail(to, subject, body, true);
-    }
 }
@@ -14,11 +14,14 @@ 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;
@@ -26,7 +29,9 @@ 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;

@@ -38,9 +43,13 @@ import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrin
@Service
 public class JwtService implements JwtServiceInterface {

-    private static final String ISSUER = "https://stirling.com";
+    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;

@@ -50,7 +59,6 @@ public class JwtService implements JwtServiceInterface {
            KeyPersistenceServiceInterface keyPersistenceService) {
        this.v2Enabled = v2Enabled;
        this.keyPersistenceService = keyPersistenceService;
-        log.info("JwtService initialized");
    }

    @Override
@@ -252,18 +260,47 @@ public class JwtService implements JwtServiceInterface {

    @Override
    public String extractToken(HttpServletRequest request) {
-        // Extract from Authorization header Bearer token
-        String authHeader = request.getHeader("Authorization");
-        if (authHeader != null && authHeader.startsWith("Bearer ")) {
-            String token = authHeader.substring(7); // Remove "Bearer " prefix
-            log.debug("JWT token extracted from Authorization header");
-            return token;
+        Cookie[] cookies = request.getCookies();
+
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (JWT_COOKIE_NAME.equals(cookie.getName())) {
+                    return cookie.getValue();
+                }
+            }
        }

-        log.debug("No JWT token found in Authorization header");
        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;
@@ -5,6 +5,7 @@ import java.util.Map;
 import org.springframework.security.core.Authentication;

 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 public interface JwtServiceInterface {

@@ -65,6 +66,21 @@ public interface JwtServiceInterface {
     */
    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
     *
@@ -60,46 +60,19 @@ public class UserService implements UserServiceInterface {

    private final ApplicationProperties.Security.OAUTH2 oAuth2;

+    // Handle OAUTH2 login and user auto creation.
    public void processSSOPostLogin(
-            String username,
-            String ssoProviderId,
-            String ssoProvider,
-            boolean autoCreateUser,
-            AuthenticationType type)
+            String username, boolean autoCreateUser, AuthenticationType type)
            throws IllegalArgumentException, SQLException, UnsupportedProviderException {
        if (!isUsernameValid(username)) {
            return;
        }
-
-        // Find user by SSO provider ID first
-        Optional<User> existingUser;
-        if (ssoProviderId != null && ssoProvider != null) {
-            existingUser =
-                    userRepository.findBySsoProviderAndSsoProviderId(ssoProvider, ssoProviderId);
-
-            if (existingUser.isPresent()) {
-                log.debug("User found by SSO provider ID: {}", ssoProviderId);
-                return;
-            }
-        }
-
-        existingUser = findByUsernameIgnoreCase(username);
+        Optional<User> existingUser = findByUsernameIgnoreCase(username);
        if (existingUser.isPresent()) {
-            User user = existingUser.get();
-
-            // Migrate existing user to use provider ID if not already set
-            if (user.getSsoProviderId() == null && ssoProviderId != null && ssoProvider != null) {
-                log.info("Migrating user {} to use SSO provider ID: {}", username, ssoProviderId);
-                user.setSsoProviderId(ssoProviderId);
-                user.setSsoProvider(ssoProvider);
-                userRepository.save(user);
-                databaseService.exportDatabase();
-            }
            return;
        }
-
        if (autoCreateUser) {
-            saveUser(username, ssoProviderId, ssoProvider, type);
+            saveUser(username, type);
        }
    }

@@ -181,21 +154,6 @@ public class UserService implements UserServiceInterface {
        saveUser(username, authenticationType, (Long) null, Role.USER.getRoleId());
    }

-    public void saveUser(
-            String username,
-            String ssoProviderId,
-            String ssoProvider,
-            AuthenticationType authenticationType)
-            throws IllegalArgumentException, SQLException, UnsupportedProviderException {
-        saveUser(
-                username,
-                ssoProviderId,
-                ssoProvider,
-                authenticationType,
-                (Long) null,
-                Role.USER.getRoleId());
-    }
-
    private User saveUser(Optional<User> user, String apiKey) {
        if (user.isPresent()) {
            user.get().setApiKey(apiKey);
@@ -210,30 +168,6 @@ public class UserService implements UserServiceInterface {
        return saveUserCore(
                username, // username
                null, // password
-                null, // ssoProviderId
-                null, // ssoProvider
-                authenticationType, // authenticationType
-                teamId, // teamId
-                null, // team
-                role, // role
-                false, // firstLogin
-                true // enabled
-                );
-    }
-
-    public User saveUser(
-            String username,
-            String ssoProviderId,
-            String ssoProvider,
-            AuthenticationType authenticationType,
-            Long teamId,
-            String role)
-            throws IllegalArgumentException, SQLException, UnsupportedProviderException {
-        return saveUserCore(
-                username, // username
-                null, // password
-                ssoProviderId, // ssoProviderId
-                ssoProvider, // ssoProvider
                authenticationType, // authenticationType
                teamId, // teamId
                null, // team
@@ -249,8 +183,6 @@ public class UserService implements UserServiceInterface {
        return saveUserCore(
                username, // username
                null, // password
-                null, // ssoProviderId
-                null, // ssoProvider
                authenticationType, // authenticationType
                null, // teamId
                team, // team
@@ -265,8 +197,6 @@ public class UserService implements UserServiceInterface {
        return saveUserCore(
                username, // username
                password, // password
-                null, // ssoProviderId
-                null, // ssoProvider
                AuthenticationType.WEB, // authenticationType
                teamId, // teamId
                null, // team
@@ -282,8 +212,6 @@ public class UserService implements UserServiceInterface {
        return saveUserCore(
                username, // username
                password, // password
-                null, // ssoProviderId
-                null, // ssoProvider
                AuthenticationType.WEB, // authenticationType
                null, // teamId
                team, // team
@@ -299,8 +227,6 @@ public class UserService implements UserServiceInterface {
        return saveUserCore(
                username, // username
                password, // password
-                null, // ssoProviderId
-                null, // ssoProvider
                AuthenticationType.WEB, // authenticationType
                teamId, // teamId
                null, // team
@@ -321,8 +247,6 @@ public class UserService implements UserServiceInterface {
        saveUserCore(
                username, // username
                password, // password
-                null, // ssoProviderId
-                null, // ssoProvider
                AuthenticationType.WEB, // authenticationType
                teamId, // teamId
                null, // team
@@ -487,8 +411,6 @@ public class UserService implements UserServiceInterface {
     *
     * @param username Username for the new user
     * @param password Password for the user (may be null for SSO/OAuth users)
-     * @param ssoProviderId Unique identifier from SSO provider (may be null for non-SSO users)
-     * @param ssoProvider Name of the SSO provider (may be null for non-SSO users)
     * @param authenticationType Type of authentication (WEB, SSO, etc.)
     * @param teamId ID of the team to assign (may be null to use default)
     * @param team Team object to assign (takes precedence over teamId if both provided)
@@ -503,8 +425,6 @@ public class UserService implements UserServiceInterface {
    private User saveUserCore(
            String username,
            String password,
-            String ssoProviderId,
-            String ssoProvider,
            AuthenticationType authenticationType,
            Long teamId,
            Team team,
@@ -525,12 +445,6 @@ public class UserService implements UserServiceInterface {
            user.setPassword(passwordEncoder.encode(password));
        }

-        // Set SSO provider details if provided
-        if (ssoProviderId != null && ssoProvider != null) {
-            user.setSsoProviderId(ssoProviderId);
-            user.setSsoProvider(ssoProvider);
-        }
-
        // Set authentication type
        user.setAuthenticationType(authenticationType);

@@ -642,21 +556,6 @@ public class UserService implements UserServiceInterface {
        return null;
    }

-    public boolean isCurrentUserAdmin() {
-        try {
-            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-            if (authentication != null
-                    && authentication.isAuthenticated()
-                    && !"anonymousUser".equals(authentication.getPrincipal())) {
-                return authentication.getAuthorities().stream()
-                        .anyMatch(auth -> Role.ADMIN.getRoleId().equals(auth.getAuthority()));
-            }
-        } catch (Exception e) {
-            log.debug("Error checking admin status", e);
-        }
-        return false;
-    }
-
    @Transactional
    public void syncCustomApiUser(String customApiKey) {
        if (customApiKey == null || customApiKey.trim().isBlank()) {
@@ -30,8 +30,6 @@ import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.service.ServerCertificateServiceInterface;
-import stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier.License;
-import stirling.software.proprietary.security.configuration.ee.LicenseKeyChecker;

@Service
@Slf4j
@@ -53,12 +51,6 @@ public class ServerCertificateService implements ServerCertificateServiceInterfa
    @Value("${system.serverCertificate.regenerateOnStartup:false}")
    private boolean regenerateOnStartup;

-    private final LicenseKeyChecker licenseKeyChecker;
-
-    public ServerCertificateService(LicenseKeyChecker licenseKeyChecker) {
-        this.licenseKeyChecker = licenseKeyChecker;
-    }
-
    static {
        Security.addProvider(new BouncyCastleProvider());
    }
@@ -67,13 +59,8 @@ public class ServerCertificateService implements ServerCertificateServiceInterfa
        return Paths.get(InstallationPathConfig.getConfigPath(), KEYSTORE_FILENAME);
    }

-    private boolean hasProOrEnterpriseAccess() {
-        License license = licenseKeyChecker.getPremiumLicenseEnabledResult();
-        return license == License.PRO || license == License.ENTERPRISE;
-    }
-
    public boolean isEnabled() {
-        return enabled && hasProOrEnterpriseAccess();
+        return enabled;
    }

    public boolean hasServerCertificate() {
@@ -86,11 +73,6 @@ public class ServerCertificateService implements ServerCertificateServiceInterfa
            return;
        }

-        if (!hasProOrEnterpriseAccess()) {
-            log.info("Server certificate feature requires Pro or Enterprise license");
-            return;
-        }
-
        Path keystorePath = getKeystorePath();

        if (!Files.exists(keystorePath) || regenerateOnStartup) {
@@ -106,11 +88,6 @@ public class ServerCertificateService implements ServerCertificateServiceInterfa
    }

    public KeyStore getServerKeyStore() throws Exception {
-        if (!hasProOrEnterpriseAccess()) {
-            throw new IllegalStateException(
-                    "Server certificate feature requires Pro or Enterprise license");
-        }
-
        if (!enabled || !hasServerCertificate()) {
            throw new IllegalStateException("Server certificate is not available");
        }
@@ -137,11 +114,6 @@ public class ServerCertificateService implements ServerCertificateServiceInterfa
    }

    public void uploadServerCertificate(InputStream p12Stream, String password) throws Exception {
-        if (!hasProOrEnterpriseAccess()) {
-            throw new IllegalStateException(
-                    "Server certificate feature requires Pro or Enterprise license");
-        }
-
        // Validate the uploaded certificate
        KeyStore uploadedKeyStore = KeyStore.getInstance("PKCS12");
        uploadedKeyStore.load(p12Stream, password.toCharArray());
@@ -202,11 +174,6 @@ public class ServerCertificateService implements ServerCertificateServiceInterfa
    }

    private void generateServerCertificate() throws Exception {
-        if (!hasProOrEnterpriseAccess()) {
-            throw new IllegalStateException(
-                    "Server certificate feature requires Pro or Enterprise license");
-        }
-
        // Generate key pair
        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC");
        keyPairGenerator.initialize(2048, new SecureRandom());
@@ -1,8 +1,6 @@
 package stirling.software.proprietary.security;

-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;

 import java.io.IOException;

@@ -40,6 +38,7 @@ class CustomLogoutSuccessHandlerTest {

        when(response.isCommitted()).thenReturn(false);
        when(jwtService.extractToken(request)).thenReturn(token);
+        doNothing().when(jwtService).clearToken(response);
        when(request.getContextPath()).thenReturn("");
        when(response.encodeRedirectURL(logoutPath)).thenReturn(logoutPath);

@@ -57,12 +56,14 @@ class CustomLogoutSuccessHandlerTest {

        when(response.isCommitted()).thenReturn(false);
        when(jwtService.extractToken(request)).thenReturn(token);
+        doNothing().when(jwtService).clearToken(response);
        when(request.getContextPath()).thenReturn("");
        when(response.encodeRedirectURL(logoutPath)).thenReturn(logoutPath);

        customLogoutSuccessHandler.onLogoutSuccess(request, response, null);

        verify(response).sendRedirect(logoutPath);
+        verify(jwtService).clearToken(response);
    }

    @Test
@@ -127,6 +127,7 @@ class JwtAuthenticationFilterTest {
                    .setAuthentication(any(UsernamePasswordAuthenticationToken.class));
            verify(jwtService)
                    .generateToken(any(UsernamePasswordAuthenticationToken.class), eq(claims));
+            verify(jwtService).addToken(response, newToken);
            verify(filterChain).doFilter(request, response);
        }
    }
@@ -8,6 +8,8 @@ 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;
@@ -15,6 +17,7 @@ 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;
@@ -24,10 +27,13 @@ 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;

@@ -53,7 +59,7 @@ class JwtServiceTest {
    private JwtVerificationKey testVerificationKey;

    @BeforeEach
-    void setUp() throws Exception {
+    void setUp() throws NoSuchAlgorithmException {
        // Generate a test keypair
        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
        keyPairGenerator.initialize(2048);
@@ -218,8 +224,7 @@ class JwtServiceTest {
        assertEquals("admin", extractedClaims.get("role"));
        assertEquals("IT", extractedClaims.get("department"));
        assertEquals(username, extractedClaims.get("sub"));
-        // Verify the constant issuer is set correctly
-        assertEquals("https://stirling.com", extractedClaims.get("iss"));
+        assertEquals("Stirling PDF", extractedClaims.get("iss"));
    }

    @Test
@@ -234,27 +239,62 @@ class JwtServiceTest {
    }

    @Test
-    void testExtractTokenWithAuthorizationHeader() {
+    void testExtractTokenWithCookie() {
        String token = "test-token";
-        when(request.getHeader("Authorization")).thenReturn("Bearer " + token);
+        Cookie[] cookies = {new Cookie("stirling_jwt", token)};
+        when(request.getCookies()).thenReturn(cookies);

        assertEquals(token, jwtService.extractToken(request));
    }

    @Test
-    void testExtractTokenWithNoAuthorizationHeader() {
-        when(request.getHeader("Authorization")).thenReturn(null);
+    void testExtractTokenWithNoCookies() {
+        when(request.getCookies()).thenReturn(null);

        assertNull(jwtService.extractToken(request));
    }

    @Test
-    void testExtractTokenWithInvalidAuthorizationHeaderFormat() {
-        when(request.getHeader("Authorization")).thenReturn("InvalidFormat token");
+    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";
@@ -333,4 +373,17 @@ class JwtServiceTest {
        // 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;
+    }
 }
@@ -629,40 +629,9 @@ tasks.named('bootRun') {
 tasks.named('build') {
    group = 'build'
    description = 'Delegates to :stirling-pdf:bootJar'
-    dependsOn ':stirling-pdf:bootJar', 'buildRestartHelper'
+    dependsOn ':stirling-pdf:bootJar'

    doFirst {
        println "Delegating to :stirling-pdf:bootJar"
    }
 }
-
-// Task to compile RestartHelper.java
-tasks.register('compileRestartHelper', JavaCompile) {
-    group = 'build'
-    description = 'Compiles the RestartHelper utility'
-
-    source = fileTree(dir: 'scripts', include: 'RestartHelper.java')
-    classpath = files()
-    destinationDirectory = file("${buildDir}/restart-helper-classes")
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-// Task to create restart-helper.jar
-tasks.register('buildRestartHelper', Jar) {
-    group = 'build'
-    description = 'Builds the restart-helper.jar'
-    dependsOn 'compileRestartHelper'
-
-    from "${buildDir}/restart-helper-classes"
-    archiveFileName = 'restart-helper.jar'
-    destinationDirectory = file("${buildDir}/libs")
-
-    manifest {
-        attributes 'Main-Class': 'RestartHelper'
-    }
-
-    doLast {
-        println "restart-helper.jar created at: ${destinationDirectory.get()}/restart-helper.jar"
-    }
-}
@@ -1,141 +0,0 @@
-# Unified Dockerfile - Frontend + Backend in single container
-# Supports MODE parameter: BOTH (default), FRONTEND, BACKEND
-
-# Stage 1: Build Frontend
-FROM node:20-alpine AS frontend-build
-
-WORKDIR /app
-
-COPY frontend/package.json frontend/package-lock.json ./
-RUN npm ci
-
-COPY frontend .
-RUN npm run build
-
-# Stage 2: Build Backend
-FROM gradle:8.14-jdk21 AS backend-build
-
-COPY build.gradle .
-COPY settings.gradle .
-COPY gradlew .
-COPY gradle gradle/
-COPY app/core/build.gradle core/.
-COPY app/common/build.gradle common/.
-COPY app/proprietary/build.gradle proprietary/.
-RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
-
-WORKDIR /app
-COPY . .
-
-RUN DISABLE_ADDITIONAL_FEATURES=false \
-    STIRLING_PDF_DESKTOP_UI=false \
-    ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
-
-# Stage 3: Final unified image
-FROM alpine:3.22.1
-
-ARG VERSION_TAG
-
-# Labels
-LABEL org.opencontainers.image.title="Stirling-PDF Unified"
-LABEL org.opencontainers.image.description="Unified container for Stirling-PDF - Frontend + Backend with MODE parameter"
-LABEL org.opencontainers.image.source="https://github.com/Stirling-Tools/Stirling-PDF"
-LABEL org.opencontainers.image.licenses="MIT"
-LABEL org.opencontainers.image.vendor="Stirling-Tools"
-LABEL org.opencontainers.image.url="https://www.stirlingpdf.com"
-LABEL org.opencontainers.image.documentation="https://docs.stirlingpdf.com"
-LABEL maintainer="Stirling-Tools"
-LABEL org.opencontainers.image.authors="Stirling-Tools"
-LABEL org.opencontainers.image.version="${VERSION_TAG}"
-LABEL org.opencontainers.image.keywords="PDF, manipulation, unified, API, Spring Boot, React"
-
-# Copy backend files
-COPY scripts /scripts
-COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY --from=backend-build /app/app/core/build/libs/*.jar app.jar
-
-# Copy frontend files
-COPY --from=frontend-build /app/dist /usr/share/nginx/html
-
-# Copy nginx configuration
-COPY docker/unified/nginx.conf /etc/nginx/nginx.conf
-COPY docker/unified/entrypoint.sh /entrypoint.sh
-
-# Environment Variables
-ENV DISABLE_ADDITIONAL_FEATURES=false \
-    VERSION_TAG=$VERSION_TAG \
-    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
-    JAVA_CUSTOM_OPTS="" \
-    HOME=/home/stirlingpdfuser \
-    PUID=1000 \
-    PGID=1000 \
-    UMASK=022 \
-    PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
-    UNO_PATH=/usr/lib/libreoffice/program \
-    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
-    PATH=$PATH:/opt/venv/bin \
-    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
-    TMPDIR=/tmp/stirling-pdf \
-    TEMP=/tmp/stirling-pdf \
-    TMP=/tmp/stirling-pdf \
-    MODE=BOTH \
-    BACKEND_INTERNAL_PORT=8081 \
-    VITE_API_BASE_URL=http://localhost:8080
-
-# Install all dependencies
-RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@community https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
-    apk upgrade --no-cache -a && \
-    apk add --no-cache \
-    ca-certificates \
-    tzdata \
-    tini \
-    bash \
-    curl \
-    shadow \
-    su-exec \
-    openssl \
-    openssl-dev \
-    openjdk21-jre \
-    nginx \
-    # Doc conversion
-    gcompat \
-    libc6-compat \
-    libreoffice \
-    # pdftohtml
-    poppler-utils \
-    # OCR MY PDF
-    unpaper \
-    tesseract-ocr-data-eng \
-    tesseract-ocr-data-chi_sim \
-    tesseract-ocr-data-deu \
-    tesseract-ocr-data-fra \
-    tesseract-ocr-data-por \
-    ocrmypdf \
-    # CV
-    py3-opencv \
-    python3 \
-    py3-pip \
-    py3-pillow@testing \
-    py3-pdf2image@testing && \
-    python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
-    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
-    ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
-    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
-    ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
-    mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf /pipeline/watchedFolders /pipeline/finishedFolders && \
-    mkdir -p /var/lib/nginx/tmp /var/log/nginx && \
-    fc-cache -f -v && \
-    chmod +x /scripts/* && \
-    chmod +x /entrypoint.sh && \
-    # User permissions
-    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf /var/lib/nginx /var/log/nginx /usr/share/nginx && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
-
-EXPOSE 8080/tcp
-
-ENTRYPOINT ["tini", "--", "/entrypoint.sh"]
@@ -30,7 +30,6 @@ COPY scripts /scripts
 COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 # first /app directory is for the build stage, second is for the final image
 COPY --from=build /app/app/core/build/libs/*.jar app.jar
-COPY --from=build /app/build/libs/restart-helper.jar restart-helper.jar

 ARG VERSION_TAG

@@ -114,7 +113,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    # User permissions
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar /restart-helper.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar

 EXPOSE 8080/tcp

@@ -30,7 +30,6 @@ COPY scripts /scripts
 COPY app/core/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 # first /app directory is for the build stage, second is for the final image
 COPY --from=build /app/app/core/build/libs/*.jar app.jar
-COPY --from=build /app/build/libs/restart-helper.jar restart-helper.jar

 ARG VERSION_TAG

@@ -105,7 +104,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    # User permissions
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar /restart-helper.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar

 EXPOSE 8080/tcp
 # Set user and run command
@@ -45,7 +45,6 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
 COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY scripts/installFonts.sh /scripts/installFonts.sh
 COPY --from=build /app/app/core/build/libs/*.jar app.jar
-COPY --from=build /app/build/libs/restart-helper.jar restart-helper.jar

 # Set up necessary directories and permissions
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
@@ -66,7 +65,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
    chmod +x /scripts/*.sh && \
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /configs /customFiles /pipeline /tmp/stirling-pdf && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar /restart-helper.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar

 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
@@ -1,58 +0,0 @@
-# Example Docker Compose for Unified Stirling-PDF Container
-# MODE=BACKEND: Backend API only (no frontend)
-
-services:
-  stirling-pdf-backend-only:
-    container_name: Stirling-PDF-Backend-Only
-    build:
-      context: ../..
-      dockerfile: docker/Dockerfile.unified
-    ports:
-      - "8080:8080"
-    volumes:
-      - ./stirling/data:/usr/share/tessdata:rw
-      - ./stirling/config:/configs:rw
-      - ./stirling/logs:/logs:rw
-      - ./stirling/customFiles:/customFiles:rw
-      - ./stirling/pipeline:/pipeline:rw
-    environment:
-      # MODE parameter: BACKEND only
-      MODE: BACKEND
-
-      # Standard Stirling-PDF configuration
-      DISABLE_ADDITIONAL_FEATURES: "false"
-      DOCKER_ENABLE_SECURITY: "false"
-      PUID: 1000
-      PGID: 1000
-      UMASK: "022"
-
-      # Application settings
-      SYSTEM_DEFAULTLOCALE: en-US
-      UI_APPNAME: Stirling-PDF
-      SYSTEM_MAXFILESIZE: "100"
-      METRICS_ENABLED: "true"
-
-      # Optional: Add OCR languages (comma-separated)
-      # TESSERACT_LANGS: "deu,fra,spa"
-
-      # Optional: Java memory settings
-      # JAVA_CUSTOM_OPTS: "-Xmx4g"
-
-    restart: unless-stopped
-
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-        reservations:
-          memory: 2G
-
-# Access the API at: http://localhost:8080/api
-# Swagger UI at: http://localhost:8080/swagger-ui/index.html
@@ -1,59 +0,0 @@
-# Example Docker Compose for Unified Stirling-PDF Container
-# MODE=BOTH (default): Frontend + Backend in single container on port 8080
-
-services:
-  stirling-pdf-unified:
-    container_name: Stirling-PDF-Unified-Both
-    build:
-      context: ../..
-      dockerfile: docker/Dockerfile.unified
-    ports:
-      - "8080:8080"
-    volumes:
-      - ./stirling/data:/usr/share/tessdata:rw
-      - ./stirling/config:/configs:rw
-      - ./stirling/logs:/logs:rw
-      - ./stirling/customFiles:/customFiles:rw
-      - ./stirling/pipeline:/pipeline:rw
-    environment:
-      # MODE parameter: BOTH (default), FRONTEND, or BACKEND
-      MODE: BOTH
-
-      # Backend runs internally on this port when MODE=BOTH
-      BACKEND_INTERNAL_PORT: 8081
-
-      # Standard Stirling-PDF configuration
-      DISABLE_ADDITIONAL_FEATURES: "false"
-      DOCKER_ENABLE_SECURITY: "false"
-      PUID: 1000
-      PGID: 1000
-      UMASK: "022"
-
-      # Application settings
-      SYSTEM_DEFAULTLOCALE: en-US
-      UI_APPNAME: Stirling-PDF
-      UI_HOMEDESCRIPTION: Your locally hosted one-stop-shop for all your PDF needs
-      SYSTEM_MAXFILESIZE: "100"
-      METRICS_ENABLED: "true"
-
-      # Optional: Add OCR languages (comma-separated)
-      # TESSERACT_LANGS: "deu,fra,spa"
-
-      # Optional: Java memory settings
-      # JAVA_CUSTOM_OPTS: "-Xmx4g"
-
-    restart: unless-stopped
-
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-        reservations:
-          memory: 2G
@@ -1,63 +0,0 @@
-# Example Docker Compose for Unified Stirling-PDF Container
-# MODE=FRONTEND: Frontend only, connects to separate backend
-
-services:
-  stirling-pdf-backend:
-    container_name: Stirling-PDF-Backend
-    build:
-      context: ../..
-      dockerfile: docker/Dockerfile.unified
-    ports:
-      - "8081:8080"
-    volumes:
-      - ./stirling/data:/usr/share/tessdata:rw
-      - ./stirling/config:/configs:rw
-      - ./stirling/logs:/logs:rw
-      - ./stirling/customFiles:/customFiles:rw
-      - ./stirling/pipeline:/pipeline:rw
-    environment:
-      MODE: BACKEND
-      DISABLE_ADDITIONAL_FEATURES: "false"
-      DOCKER_ENABLE_SECURITY: "false"
-      PUID: 1000
-      PGID: 1000
-      UMASK: "022"
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-
-  stirling-pdf-frontend:
-    container_name: Stirling-PDF-Frontend
-    build:
-      context: ../..
-      dockerfile: docker/Dockerfile.unified
-    ports:
-      - "8080:8080"
-    environment:
-      MODE: FRONTEND
-
-      # Point to the backend service
-      VITE_API_BASE_URL: http://stirling-pdf-backend:8080
-
-      # Minimal config needed for frontend
-      PUID: 1000
-      PGID: 1000
-    depends_on:
-      - stirling-pdf-backend
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/ || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    deploy:
-      resources:
-        limits:
-          memory: 512M
@@ -1,458 +0,0 @@
-# Stirling-PDF Unified Container
-
-Single Docker container that can run as **frontend + backend**, **frontend only**, or **backend only** using the `MODE` environment variable.
-
-## Quick Start
-
-### MODE=BOTH (Default)
-Single container with both frontend and backend on port 8080:
-
-```bash
-docker run -p 8080:8080 \
-  -e MODE=BOTH \
-  stirlingtools/stirling-pdf:unified
-```
-
-Access at: `http://localhost:8080`
-
-### MODE=FRONTEND
-Frontend only, connecting to separate backend:
-
-```bash
-docker run -p 8080:8080 \
-  -e MODE=FRONTEND \
-  -e VITE_API_BASE_URL=http://backend:8080 \
-  stirlingtools/stirling-pdf:unified
-```
-
-### MODE=BACKEND
-Backend API only:
-
-```bash
-docker run -p 8080:8080 \
-  -e MODE=BACKEND \
-  stirlingtools/stirling-pdf:unified
-```
-
-Access API at: `http://localhost:8080/api`
-Swagger UI at: `http://localhost:8080/swagger-ui/index.html`
-
---
-
-## Architecture
-
-### MODE=BOTH (Default)
-```
-┌─────────────────────────────────────┐
-│     Port 8080 (External)            │
-│  ┌───────────────────────────────┐  │
-│  │         Nginx                 │  │
-│  │  • Serves frontend (/)        │  │
-│  │  • Proxies /api/* → backend   │  │
-│  └───────────┬───────────────────┘  │
-│              │                       │
-│  ┌───────────▼───────────────────┐  │
-│  │    Backend (Internal 8081)    │  │
-│  │  • Spring Boot                │  │
-│  │  • PDF Processing             │  │
-│  │  • UnoServer                  │  │
-│  └───────────────────────────────┘  │
-└─────────────────────────────────────┘
-```
-
-### MODE=FRONTEND
-```
-┌─────────────────────────────┐      ┌──────────────────┐
-│   Frontend Container        │      │  Backend         │
-│   Port 8080                 │      │  (External)      │
-│  ┌───────────────────────┐  │      │                  │
-│  │       Nginx           │  │──────▶  :8080/api       │
-│  │  • Serves frontend    │  │      │                  │
-│  │  • Proxies to backend │  │      │                  │
-│  └───────────────────────┘  │      └──────────────────┘
-└─────────────────────────────┘
-```
-
-### MODE=BACKEND
-```
-┌─────────────────────────────┐
-│   Backend Container         │
-│   Port 8080                 │
-│  ┌───────────────────────┐  │
-│  │   Spring Boot         │  │
-│  │  • API Endpoints      │  │
-│  │  • PDF Processing     │  │
-│  │  • UnoServer          │  │
-│  └───────────────────────┘  │
-└─────────────────────────────┘
-```
-
---
-
-## Environment Variables
-
-### MODE Configuration
-
-| Variable | Values | Default | Description |
-|----------|--------|---------|-------------|
-| `MODE` | `BOTH`, `FRONTEND`, `BACKEND` | `BOTH` | Container operation mode |
-
-### MODE=BOTH Specific
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `BACKEND_INTERNAL_PORT` | `8081` | Internal port for backend when MODE=BOTH |
-
-### MODE=FRONTEND Specific
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `VITE_API_BASE_URL` | `http://backend:8080` | Backend URL for API proxying |
-
-### Standard Configuration
-
-All modes support standard Stirling-PDF environment variables:
-
- `DISABLE_ADDITIONAL_FEATURES` - Enable/disable OCR and LibreOffice features
- `DOCKER_ENABLE_SECURITY` - Enable authentication
- `PUID` / `PGID` - User/Group IDs
- `SYSTEM_MAXFILESIZE` - Max upload size (MB)
- `TESSERACT_LANGS` - Comma-separated OCR language codes
- `JAVA_CUSTOM_OPTS` - Additional JVM options
-
-See full configuration docs at: https://docs.stirlingpdf.com
-
---
-
-## Docker Compose Examples
-
-### Example 1: All-in-One (MODE=BOTH)
-
-**File:** `docker/compose/docker-compose-unified-both.yml`
-
-```yaml
-services:
-  stirling-pdf:
-    image: stirlingtools/stirling-pdf:unified
-    ports:
-      - "8080:8080"
-    volumes:
-      - ./data:/usr/share/tessdata:rw
-      - ./config:/configs:rw
-    environment:
-      MODE: BOTH
-    restart: unless-stopped
-```
-
-### Example 2: Separate Frontend & Backend
-
-**File:** `docker/compose/docker-compose-unified-frontend.yml`
-
-```yaml
-services:
-  backend:
-    image: stirlingtools/stirling-pdf:unified
-    ports:
-      - "8081:8080"
-    environment:
-      MODE: BACKEND
-    volumes:
-      - ./data:/usr/share/tessdata:rw
-      - ./config:/configs:rw
-
-  frontend:
-    image: stirlingtools/stirling-pdf:unified
-    ports:
-      - "8080:8080"
-    environment:
-      MODE: FRONTEND
-      VITE_API_BASE_URL: http://backend:8080
-    depends_on:
-      - backend
-```
-
-### Example 3: Backend API Only
-
-**File:** `docker/compose/docker-compose-unified-backend.yml`
-
-```yaml
-services:
-  stirling-pdf-api:
-    image: stirlingtools/stirling-pdf:unified
-    ports:
-      - "8080:8080"
-    environment:
-      MODE: BACKEND
-    volumes:
-      - ./data:/usr/share/tessdata:rw
-      - ./config:/configs:rw
-    restart: unless-stopped
-```
-
---
-
-## Building the Image
-
-```bash
-# From repository root
-docker build -t stirlingtools/stirling-pdf:unified -f docker/Dockerfile.unified .
-```
-
-### Build Arguments
-
-| Argument | Description |
-|----------|-------------|
-| `VERSION_TAG` | Version tag for the image |
-
-Example:
-```bash
-docker build \
-  --build-arg VERSION_TAG=v1.0.0 \
-  -t stirlingtools/stirling-pdf:unified \
-  -f docker/Dockerfile.unified .
-```
-
---
-
-## Use Cases
-
-### 1. Simple Deployment (MODE=BOTH)
- **Best for:** Personal use, small teams, simple deployments
- **Pros:** Single container, easy setup, minimal configuration
- **Cons:** Frontend and backend scale together
-
-### 2. Scaled Frontend (MODE=FRONTEND + BACKEND)
- **Best for:** High traffic, need to scale frontend independently
- **Pros:** Scale frontend containers separately, CDN-friendly
- **Example:**
-  ```yaml
-  services:
-    backend:
-      image: stirlingtools/stirling-pdf:unified
-      environment:
-        MODE: BACKEND
-      deploy:
-        replicas: 1
-
-    frontend:
-      image: stirlingtools/stirling-pdf:unified
-      environment:
-        MODE: FRONTEND
-        VITE_API_BASE_URL: http://backend:8080
-      deploy:
-        replicas: 5  # Scale frontend independently
-  ```
-
-### 3. API-Only (MODE=BACKEND)
- **Best for:** Headless deployments, custom frontends, API integrations
- **Pros:** Minimal resources, no nginx overhead
- **Example:** Use with external frontend or API consumers
-
-### 4. Multi-Backend Setup
- **Best for:** Load balancing, high availability
- **Example:**
-  ```yaml
-  services:
-    backend-1:
-      image: stirlingtools/stirling-pdf:unified
-      environment:
-        MODE: BACKEND
-
-    backend-2:
-      image: stirlingtools/stirling-pdf:unified
-      environment:
-        MODE: BACKEND
-
-    frontend:
-      image: stirlingtools/stirling-pdf:unified
-      environment:
-        MODE: FRONTEND
-        VITE_API_BASE_URL: http://load-balancer:8080
-  ```
-
---
-
-## Port Configuration
-
-All modes use **port 8080** by default:
-
- **MODE=BOTH**: Nginx listens on 8080, proxies to backend on internal 8081
- **MODE=FRONTEND**: Nginx listens on 8080
- **MODE=BACKEND**: Spring Boot listens on 8080
-
-**Expose port 8080** in all configurations:
-```yaml
-ports:
-  - "8080:8080"
-```
-
---
-
-## Health Checks
-
-### MODE=BOTH and MODE=BACKEND
-```yaml
-healthcheck:
-  test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status || exit 1"]
-  interval: 30s
-  timeout: 10s
-  retries: 3
-```
-
-### MODE=FRONTEND
-```yaml
-healthcheck:
-  test: ["CMD-SHELL", "curl -f http://localhost:8080/ || exit 1"]
-  interval: 30s
-  timeout: 10s
-  retries: 3
-```
-
---
-
-## Troubleshooting
-
-### Check logs
-```bash
-docker logs stirling-pdf-container
-```
-
-Look for the startup banner:
-```
-===================================
-Stirling-PDF Unified Container
-MODE: BOTH
-===================================
-```
-
-### Invalid MODE error
-```
-ERROR: Invalid MODE 'XYZ'. Must be BOTH, FRONTEND, or BACKEND
-```
-**Fix:** Set `MODE` to one of the three valid values.
-
-### Frontend can't connect to backend (MODE=FRONTEND)
-**Check:**
-1. `VITE_API_BASE_URL` points to correct backend URL
-2. Backend container is running and accessible
-3. Network connectivity between containers
-
-### Backend not starting (MODE=BOTH or BACKEND)
-**Check:**
-1. Sufficient memory allocated (4GB recommended)
-2. Java heap size (`JAVA_CUSTOM_OPTS`)
-3. Volume permissions for `/tmp/stirling-pdf`
-
---
-
-## Migration Guide
-
-### From Separate Containers → MODE=BOTH
-
-**Before:**
-```yaml
-services:
-  frontend:
-    image: stirlingtools/stirling-pdf:frontend
-    ports: ["80:80"]
-
-  backend:
-    image: stirlingtools/stirling-pdf:backend
-    ports: ["8080:8080"]
-```
-
-**After:**
-```yaml
-services:
-  stirling-pdf:
-    image: stirlingtools/stirling-pdf:unified
-    ports: ["8080:8080"]
-    environment:
-      MODE: BOTH
-```
-
-### From Legacy → MODE=BACKEND
-```yaml
-services:
-  stirling-pdf:
-    image: stirlingtools/stirling-pdf:latest
-    ports: ["8080:8080"]
-```
-
-**Becomes:**
-```yaml
-services:
-  stirling-pdf:
-    image: stirlingtools/stirling-pdf:unified
-    ports: ["8080:8080"]
-    environment:
-      MODE: BACKEND
-```
-
---
-
-## Performance Tuning
-
-### MODE=BOTH
-```yaml
-environment:
-  JAVA_CUSTOM_OPTS: "-Xmx4g -XX:MaxRAMPercentage=75"
-  BACKEND_INTERNAL_PORT: 8081
-deploy:
-  resources:
-    limits:
-      memory: 4G
-    reservations:
-      memory: 2G
-```
-
-### MODE=FRONTEND (Lightweight)
-```yaml
-deploy:
-  resources:
-    limits:
-      memory: 512M
-    reservations:
-      memory: 256M
-```
-
-### MODE=BACKEND (Heavy Processing)
-```yaml
-environment:
-  JAVA_CUSTOM_OPTS: "-Xmx8g"
-deploy:
-  resources:
-    limits:
-      memory: 10G
-    reservations:
-      memory: 4G
-```
-
---
-
-## Security Considerations
-
-1. **MODE=BOTH**: Backend not exposed externally (runs on internal port)
-2. **MODE=BACKEND**: API exposed directly - consider API authentication
-3. **MODE=FRONTEND**: Only serves static files - minimal attack surface
-
-Enable security features:
-```yaml
-environment:
-  DOCKER_ENABLE_SECURITY: "true"
-  SECURITY_ENABLELOGIN: "true"
-```
-
---
-
-## Support
-
- Documentation: https://docs.stirlingpdf.com
- GitHub Issues: https://github.com/Stirling-Tools/Stirling-PDF/issues
- Docker Hub: https://hub.docker.com/r/stirlingtools/stirling-pdf
-
---
-
-## License
-
-MIT License - See repository for full details
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Build script for Stirling-PDF Unified Container
-# Usage: ./build.sh [version-tag]
-
-set -e
-
-VERSION_TAG=${1:-latest}
-IMAGE_NAME="stirlingtools/stirling-pdf:unified-${VERSION_TAG}"
-
-echo "==================================="
-echo "Building Stirling-PDF Unified Container"
-echo "Version: $VERSION_TAG"
-echo "Image: $IMAGE_NAME"
-echo "==================================="
-
-# Navigate to repository root (assuming script is in docker/unified/)
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-REPO_ROOT="$SCRIPT_DIR/../.."
-
-cd "$REPO_ROOT"
-
-# Build the image
-docker build \
-  --build-arg VERSION_TAG="$VERSION_TAG" \
-  -t "$IMAGE_NAME" \
-  -f docker/Dockerfile.unified \
-  .
-
-echo "==================================="
-echo "✓ Build complete!"
-echo "Image: $IMAGE_NAME"
-echo ""
-echo "Test the image:"
-echo "  MODE=BOTH:     docker run -p 8080:8080 -e MODE=BOTH $IMAGE_NAME"
-echo "  MODE=FRONTEND: docker run -p 8080:8080 -e MODE=FRONTEND $IMAGE_NAME"
-echo "  MODE=BACKEND:  docker run -p 8080:8080 -e MODE=BACKEND $IMAGE_NAME"
-echo "==================================="
@@ -1,176 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Default MODE to BOTH if not set
-MODE=${MODE:-BOTH}
-
-echo "==================================="
-echo "Stirling-PDF Unified Container"
-echo "MODE: $MODE"
-echo "==================================="
-
-# Function to setup OCR (from init.sh)
-setup_ocr() {
-    echo "Setting up OCR languages..."
-
-    # Copy tessdata
-    mkdir -p /usr/share/tessdata
-    cp -rn /usr/share/tessdata-original/* /usr/share/tessdata 2>/dev/null || true
-
-    if [ -d /usr/share/tesseract-ocr/4.00/tessdata ]; then
-        cp -r /usr/share/tesseract-ocr/4.00/tessdata/* /usr/share/tessdata 2>/dev/null || true
-    fi
-
-    if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then
-        cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata 2>/dev/null || true
-    fi
-
-    # Install additional languages if specified
-    if [[ -n "$TESSERACT_LANGS" ]]; then
-        SPACE_SEPARATED_LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
-        pattern='^[a-zA-Z]{2,4}(_[a-zA-Z]{2,4})?$'
-        for LANG in $SPACE_SEPARATED_LANGS; do
-            if [[ $LANG =~ $pattern ]]; then
-                apk add --no-cache "tesseract-ocr-data-$LANG" 2>/dev/null || true
-            fi
-        done
-    fi
-}
-
-# Function to setup user permissions (from init-without-ocr.sh)
-setup_permissions() {
-    echo "Setting up user permissions..."
-
-    export JAVA_TOOL_OPTIONS="${JAVA_BASE_OPTS} ${JAVA_CUSTOM_OPTS}"
-
-    # Update user and group IDs
-    if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
-        usermod -o -u "$PUID" stirlingpdfuser || true
-    fi
-
-    if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
-        groupmod -o -g "$PGID" stirlingpdfgroup || true
-    fi
-
-    umask "$UMASK" || true
-
-    # Install fonts if needed
-    if [[ -n "$LANGS" ]]; then
-        /scripts/installFonts.sh $LANGS
-    fi
-
-    # Ensure directories exist with correct permissions
-    mkdir -p /tmp/stirling-pdf || true
-
-    # Set ownership and permissions
-    chown -R stirlingpdfuser:stirlingpdfgroup \
-        $HOME /logs /scripts /usr/share/fonts/opentype/noto \
-        /configs /customFiles /pipeline /tmp/stirling-pdf \
-        /var/lib/nginx /var/log/nginx /usr/share/nginx \
-        /app.jar 2>/dev/null || echo "[WARN] Some chown operations failed, may run as host user"
-
-    chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto \
-        /configs /customFiles /pipeline /tmp/stirling-pdf 2>/dev/null || true
-}
-
-# Function to configure nginx
-configure_nginx() {
-    local backend_url=$1
-    echo "Configuring nginx with backend URL: $backend_url"
-    sed -i "s|\${BACKEND_URL}|${backend_url}|g" /etc/nginx/nginx.conf
-}
-
-# Function to run as user or root depending on permissions
-run_as_user() {
-    if [ "$(id -u)" = "0" ]; then
-        # Running as root, use su-exec
-        su-exec stirlingpdfuser "$@"
-    else
-        # Already running as non-root
-        exec "$@"
-    fi
-}
-
-# Setup OCR and permissions
-setup_ocr
-setup_permissions
-
-# Handle different modes
-case "$MODE" in
-    BOTH)
-        echo "Starting in BOTH mode: Frontend + Backend on port 8080"
-
-        # Configure nginx to proxy to internal backend
-        configure_nginx "http://localhost:${BACKEND_INTERNAL_PORT:-8081}"
-
-        # Start backend on internal port
-        echo "Starting backend on port ${BACKEND_INTERNAL_PORT:-8081}..."
-        run_as_user sh -c "java -Dfile.encoding=UTF-8 \
-            -Djava.io.tmpdir=/tmp/stirling-pdf \
-            -Dserver.port=${BACKEND_INTERNAL_PORT:-8081} \
-            -jar /app.jar" &
-        BACKEND_PID=$!
-
-        # Start unoserver for document conversion
-        run_as_user /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1 &
-        UNO_PID=$!
-
-        # Wait for backend to start
-        sleep 3
-
-        # Start nginx on port 8080
-        echo "Starting nginx on port 8080..."
-        run_as_user nginx -g "daemon off;" &
-        NGINX_PID=$!
-
-        echo "==================================="
-        echo "✓ Frontend available at: http://localhost:8080"
-        echo "✓ Backend API at: http://localhost:8080/api"
-        echo "✓ Backend running internally on port ${BACKEND_INTERNAL_PORT:-8081}"
-        echo "==================================="
-        ;;
-
-    FRONTEND)
-        echo "Starting in FRONTEND mode: Frontend only on port 8080"
-
-        # Configure nginx with external backend URL
-        BACKEND_URL=${VITE_API_BASE_URL:-http://backend:8080}
-        configure_nginx "$BACKEND_URL"
-
-        # Start nginx on port 8080
-        echo "Starting nginx on port 8080..."
-        run_as_user nginx -g "daemon off;" &
-        NGINX_PID=$!
-
-        echo "==================================="
-        echo "✓ Frontend available at: http://localhost:8080"
-        echo "✓ Proxying API calls to: $BACKEND_URL"
-        echo "==================================="
-        ;;
-
-    BACKEND)
-        echo "Starting in BACKEND mode: Backend only on port 8080"
-
-        # Start backend on port 8080
-        echo "Starting backend on port 8080..."
-        run_as_user sh -c "java -Dfile.encoding=UTF-8 \
-            -Djava.io.tmpdir=/tmp/stirling-pdf \
-            -Dserver.port=8080 \
-            -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1" &
-        BACKEND_PID=$!
-
-        echo "==================================="
-        echo "✓ Backend API available at: http://localhost:8080/api"
-        echo "✓ Swagger UI at: http://localhost:8080/swagger-ui/index.html"
-        echo "==================================="
-        ;;
-
-    *)
-        echo "ERROR: Invalid MODE '$MODE'. Must be BOTH, FRONTEND, or BACKEND"
-        exit 1
-        ;;
-esac
-
-# Wait for all background processes
-wait
@@ -1,118 +0,0 @@
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    # Add .mjs MIME type mapping
-    types {
-        text/javascript mjs;
-    }
-
-    # Gzip compression
-    gzip on;
-    gzip_vary on;
-    gzip_min_length 1024;
-    gzip_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json;
-
-    server {
-        listen 8080;
-        server_name _;
-        root /usr/share/nginx/html;
-        index index.html index.htm;
-
-        # Global settings for file uploads
-        client_max_body_size 100m;
-
-        # Handle client-side routing - support subpaths
-        location / {
-            try_files $uri $uri/ /index.html;
-        }
-
-        # Proxy API calls to backend
-        location /api/ {
-            proxy_pass ${BACKEND_URL}/api/;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Host $host;
-            proxy_set_header X-Forwarded-Port $server_port;
-
-            # Additional headers for proper API proxying
-            proxy_set_header Connection '';
-            proxy_http_version 1.1;
-            proxy_buffering off;
-            proxy_cache off;
-
-            # Timeout settings for large file uploads
-            proxy_connect_timeout 60s;
-            proxy_send_timeout 60s;
-            proxy_read_timeout 60s;
-
-            # Request size limits for file uploads
-            client_max_body_size 100m;
-            proxy_request_buffering off;
-        }
-
-        # Proxy Swagger UI to backend (including versioned paths)
-        location ~ ^/swagger-ui(.*)$ {
-            proxy_pass ${BACKEND_URL}/swagger-ui$1;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Host $host;
-            proxy_set_header X-Forwarded-Port $server_port;
-
-            proxy_set_header Connection '';
-            proxy_http_version 1.1;
-            proxy_buffering off;
-            proxy_cache off;
-        }
-
-        # Proxy API docs to backend (with query parameters and sub-paths)
-        location ~ ^/v3/api-docs(.*)$ {
-            proxy_pass ${BACKEND_URL}/v3/api-docs$1;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Host $host;
-            proxy_set_header X-Forwarded-Port $server_port;
-        }
-
-        # Proxy v1 API docs to backend (with query parameters and sub-paths)
-        location ~ ^/v1/api-docs(.*)$ {
-            proxy_pass ${BACKEND_URL}/v1/api-docs$1;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Host $host;
-            proxy_set_header X-Forwarded-Port $server_port;
-        }
-
-        # Serve .mjs files with correct MIME type (must come before general static assets)
-        location ~* \.mjs$ {
-            try_files $uri =404;
-            add_header Content-Type "text/javascript; charset=utf-8" always;
-            expires 1y;
-            add_header Cache-Control "public, immutable";
-        }
-
-        # Cache static assets
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-            expires 1y;
-            add_header Cache-Control "public, immutable";
-        }
-
-        # Security headers
-        add_header X-Frame-Options "SAMEORIGIN" always;
-        add_header X-Content-Type-Options "nosniff" always;
-        add_header X-XSS-Protection "1; mode=block" always;
-        add_header Referrer-Policy "strict-origin-when-cross-origin" always;
-    }
-}
@@ -1,10 +1,9 @@
 // @ts-check

 import eslint from '@eslint/js';
-import globals from 'globals';
+import globals from "globals";
 import { defineConfig } from 'eslint/config';
 import tseslint from 'typescript-eslint';
-import importPlugin from 'eslint-plugin-import';

 const srcGlobs = [
  'src/**/*.{js,mjs,jsx,ts,tsx}',
@@ -15,37 +14,35 @@ const nodeGlobs = [
 ];

 export default defineConfig(
-  {
-    // Everything that contains 3rd party code that we don't want to lint
-    ignores: [
-      'dist',
-      'node_modules',
-      'public',
-    ],
-  },
  eslint.configs.recommended,
  tseslint.configs.recommended,
+  {
+    ignores: [
+      "dist", // Contains 3rd party code
+      "public", // Contains 3rd party code
+    ],
+  },
  {
    rules: {
-      '@typescript-eslint/no-empty-object-type': [
-        'error',
+      "@typescript-eslint/no-empty-object-type": [
+        "error",
        {
          // Allow empty extending interfaces because there's no real reason not to, and it makes it obvious where to put extra attributes in the future
          allowInterfaces: 'with-single-extends',
        },
      ],
-      '@typescript-eslint/no-explicit-any': 'off', // Temporarily disabled until codebase conformant
-      '@typescript-eslint/no-require-imports': 'off', // Temporarily disabled until codebase conformant
-      '@typescript-eslint/no-unused-vars': [
-        'error',
+      "@typescript-eslint/no-explicit-any": "off", // Temporarily disabled until codebase conformant
+      "@typescript-eslint/no-require-imports": "off", // Temporarily disabled until codebase conformant
+      "@typescript-eslint/no-unused-vars": [
+        "error",
        {
-          'args': 'all', // All function args must be used (or explicitly ignored)
-          'argsIgnorePattern': '^_', // Allow unused variables beginning with an underscore
-          'caughtErrors': 'all', // Caught errors must be used (or explicitly ignored)
-          'caughtErrorsIgnorePattern': '^_', // Allow unused variables beginning with an underscore
-          'destructuredArrayIgnorePattern': '^_', // Allow unused variables beginning with an underscore
-          'varsIgnorePattern': '^_', // Allow unused variables beginning with an underscore
-          'ignoreRestSiblings': true, // Allow unused variables when removing attributes from objects (otherwise this requires explicit renaming like `({ x: _x, ...y }) => y`, which is clunky)
+          "args": "all", // All function args must be used (or explicitly ignored)
+          "argsIgnorePattern": "^_", // Allow unused variables beginning with an underscore
+          "caughtErrors": "all", // Caught errors must be used (or explicitly ignored)
+          "caughtErrorsIgnorePattern": "^_", // Allow unused variables beginning with an underscore
+          "destructuredArrayIgnorePattern": "^_", // Allow unused variables beginning with an underscore
+          "varsIgnorePattern": "^_", // Allow unused variables beginning with an underscore
+          "ignoreRestSiblings": true, // Allow unused variables when removing attributes from objects (otherwise this requires explicit renaming like `({ x: _x, ...y }) => y`, which is clunky)
        },
      ],
    },
@@ -68,21 +65,4 @@ export default defineConfig(
      }
    }
  },
-  // Config for import plugin
-  {
-    ...importPlugin.flatConfigs.recommended,
-    ...importPlugin.flatConfigs.typescript,
-    rules: {
-      // ...importPlugin.flatConfigs.recommended.rules, // Temporarily disabled until codebase conformant
-      ...importPlugin.flatConfigs.typescript.rules,
-      'import/no-cycle': 'error',
-    },
-    settings: {
-      'import/resolver': {
-        typescript: {
-          project: './tsconfig.json',
-        },
-      },
-    },
-  },
 );
@@ -18,6 +18,6 @@
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
+    <script type="module" src="/src/index.jsx"></script>
  </body>
 </html>
@@ -6,24 +6,24 @@
  "proxy": "http://localhost:8080",
  "dependencies": {
    "@atlaskit/pragmatic-drag-and-drop": "^1.7.7",
-    "@embedpdf/core": "^1.3.14",
-    "@embedpdf/engines": "^1.3.14",
-    "@embedpdf/plugin-annotation": "^1.3.14",
-    "@embedpdf/plugin-export": "^1.3.14",
-    "@embedpdf/plugin-history": "^1.3.14",
-    "@embedpdf/plugin-interaction-manager": "^1.3.14",
-    "@embedpdf/plugin-loader": "^1.3.14",
-    "@embedpdf/plugin-pan": "^1.3.14",
-    "@embedpdf/plugin-render": "^1.3.14",
-    "@embedpdf/plugin-rotate": "^1.3.14",
-    "@embedpdf/plugin-scroll": "^1.3.14",
-    "@embedpdf/plugin-search": "^1.3.14",
-    "@embedpdf/plugin-selection": "^1.3.14",
-    "@embedpdf/plugin-spread": "^1.3.14",
-    "@embedpdf/plugin-thumbnail": "^1.3.14",
-    "@embedpdf/plugin-tiling": "^1.3.14",
-    "@embedpdf/plugin-viewport": "^1.3.14",
-    "@embedpdf/plugin-zoom": "^1.3.14",
+    "@embedpdf/core": "^1.3.1",
+    "@embedpdf/engines": "^1.3.1",
+    "@embedpdf/plugin-annotation": "^1.3.1",
+    "@embedpdf/plugin-export": "^1.3.1",
+    "@embedpdf/plugin-history": "^1.3.1",
+    "@embedpdf/plugin-interaction-manager": "^1.3.1",
+    "@embedpdf/plugin-loader": "^1.3.1",
+    "@embedpdf/plugin-pan": "^1.3.1",
+    "@embedpdf/plugin-render": "^1.3.1",
+    "@embedpdf/plugin-rotate": "^1.3.1",
+    "@embedpdf/plugin-scroll": "^1.3.1",
+    "@embedpdf/plugin-search": "^1.3.1",
+    "@embedpdf/plugin-selection": "^1.3.1",
+    "@embedpdf/plugin-spread": "^1.3.1",
+    "@embedpdf/plugin-thumbnail": "^1.3.1",
+    "@embedpdf/plugin-tiling": "^1.3.1",
+    "@embedpdf/plugin-viewport": "^1.3.1",
+    "@embedpdf/plugin-zoom": "^1.3.1",
    "@emotion/react": "^11.14.0",
    "@emotion/styled": "^11.14.1",
    "@iconify/react": "^6.0.2",
@@ -33,7 +33,6 @@
    "@mantine/hooks": "^8.3.1",
    "@mui/icons-material": "^7.3.2",
    "@mui/material": "^7.3.2",
-    "@reactour/tour": "^3.8.0",
    "@tailwindcss/postcss": "^4.1.13",
    "@tanstack/react-virtual": "^3.13.12",
    "autoprefixer": "^10.4.21",
@@ -57,20 +56,16 @@
  },
  "scripts": {
    "predev": "npm run generate-icons",
-    "dev": "vite",
+    "dev": "npm run typecheck && vite",
    "prebuild": "npm run generate-icons",
-    "lint": "eslint --max-warnings=0",
-    "build": "vite build",
+    "lint": "eslint",
+    "build": "npm run typecheck && vite build",
    "preview": "vite preview",
    "typecheck": "tsc --noEmit",
-    "typecheck:core": "tsc --noEmit --project tsconfig.core.json",
-    "typecheck:proprietary": "tsc --noEmit --project tsconfig.proprietary.json",
-    "typecheck:all": "npm run typecheck:core && npm run typecheck:proprietary",
    "check": "npm run typecheck && npm run lint && npm run test:run",
    "generate-licenses": "node scripts/generate-licenses.js",
    "generate-icons": "node scripts/generate-icons.js",
    "generate-icons:verbose": "node scripts/generate-icons.js --verbose",
-    "generate-sample-pdf": "node scripts/sample-pdf/generate.mjs",
    "test": "vitest",
    "test:run": "vitest run",
    "test:watch": "vitest --watch",
@@ -123,8 +118,6 @@
    "@vitejs/plugin-react-swc": "^4.1.0",
    "@vitest/coverage-v8": "^3.2.4",
    "eslint": "^9.36.0",
-    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
    "eslint-plugin-react-hooks": "^5.2.0",
    "jsdom": "^27.0.0",
    "license-checker": "^25.0.1",
@@ -133,11 +126,9 @@
    "postcss-cli": "^11.0.1",
    "postcss-preset-mantine": "^1.18.0",
    "postcss-simple-vars": "^7.0.1",
-    "puppeteer": "^24.25.0",
    "typescript": "^5.9.2",
    "typescript-eslint": "^8.44.1",
    "vite": "^7.1.7",
-    "vite-tsconfig-paths": "^5.1.4",
    "vitest": "^3.2.4"
  },
  "depcheck": {
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-  <path d="M17.05 20.28c-.98.95-2.05.8-3.08.35-1.09-.46-2.09-.48-3.24 0-1.44.62-2.2.44-3.06-.35C2.79 15.25 3.51 7.59 9.05 7.31c1.35.07 2.29.74 3.08.8 1.18-.24 2.31-.93 3.57-.84 1.51.12 2.65.72 3.4 1.8-3.12 1.87-2.38 5.98.48 7.13-.57 1.5-1.31 2.99-2.54 4.09l.01-.01zM12.03 7.25c-.15-2.23 1.66-4.07 3.74-4.25.29 2.58-2.34 4.5-3.74 4.25z"/>
-</svg>
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none">
-  <path d="M0 0h10.5v10.5H0V0z" fill="#F25022"/>
-  <path d="M12.5 0H23v10.5H12.5V0z" fill="#7FBA00"/>
-  <path d="M0 12.5h10.5V23H0V12.5z" fill="#00A4EF"/>
-  <path d="M12.5 12.5H23V23H12.5V12.5z" fill="#FFB900"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="37" height="36" viewBox="0 0 37 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18.5 3.3125C16.5712 3.3125 14.6613 3.6924 12.8793 4.43052C11.0974 5.16864 9.47823 6.25051 8.11437 7.61437C5.35993 10.3688 3.8125 14.1046 3.8125 18C3.8125 24.4919 8.02781 29.9997 13.8588 31.9531C14.5931 32.0706 14.8281 31.6153 14.8281 31.2187V28.7366C10.7597 29.6178 9.89312 26.7684 9.89312 26.7684C9.2175 25.0647 8.26281 24.6094 8.26281 24.6094C6.92625 23.6987 8.36562 23.7281 8.36562 23.7281C9.83437 23.8309 10.6128 25.2409 10.6128 25.2409C11.8906 27.4734 14.0497 26.8125 14.8869 26.46C15.0191 25.5053 15.4009 24.8591 15.8122 24.4919C12.5516 24.1247 9.12937 22.8616 9.12937 17.2656C9.12937 15.6353 9.6875 14.3281 10.6422 13.2853C10.4953 12.9181 9.98125 11.3906 10.7891 9.40781C10.7891 9.40781 12.0228 9.01125 14.8281 10.9059C15.9884 10.5828 17.2516 10.4212 18.5 10.4212C19.7484 10.4212 21.0116 10.5828 22.1719 10.9059C24.9772 9.01125 26.2109 9.40781 26.2109 9.40781C27.0188 11.3906 26.5047 12.9181 26.3578 13.2853C27.3125 14.3281 27.8706 15.6353 27.8706 17.2656C27.8706 22.8762 24.4338 24.11 21.1584 24.4772C21.6872 24.9325 22.1719 25.8284 22.1719 27.1944V31.2187C22.1719 31.6153 22.4069 32.0853 23.1559 31.9531C28.9869 29.985 33.1875 24.4919 33.1875 18C33.1875 16.0712 32.8076 14.1613 32.0695 12.3793C31.3314 10.5974 30.2495 8.97823 28.8856 7.61437C27.5218 6.25051 25.9026 5.16864 24.1207 4.43052C22.3387 3.6924 20.4288 3.3125 18.5 3.3125Z" fill="black"/>
-</svg>
@@ -1,14 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2781_85129)">
-<path d="M8.36055 0.789432C5.96258 1.62131 3.89457 3.20024 2.46029 5.29431C1.026 7.38838 0.301037 9.8872 0.391883 12.4237C0.482728 14.9603 1.38459 17.4008 2.96501 19.3869C4.54543 21.373 6.72109 22.8 9.17243 23.4582C11.1598 23.971 13.2419 23.9935 15.2399 23.5238C17.0499 23.1172 18.7233 22.2476 20.0962 21.0001C21.5251 19.662 22.5622 17.9597 23.0962 16.0763C23.6765 14.0282 23.7798 11.8743 23.3981 9.78006H12.2381V14.4094H18.7012C18.572 15.1478 18.2952 15.8525 17.8873 16.4814C17.4795 17.1102 16.9489 17.6504 16.3274 18.0694C15.5382 18.5915 14.6485 18.9428 13.7156 19.1007C12.7798 19.2747 11.82 19.2747 10.8843 19.1007C9.93591 18.9046 9.03874 18.5132 8.24993 17.9513C6.98271 17.0543 6.0312 15.7799 5.53118 14.3101C5.02271 12.8127 5.02271 11.1893 5.53118 9.69193C5.8871 8.64234 6.47549 7.68669 7.25243 6.89631C8.14154 5.97521 9.26718 5.3168 10.5058 4.99332C11.7445 4.66985 13.0484 4.6938 14.2743 5.06256C15.232 5.35654 16.1078 5.87019 16.8318 6.56256C17.5606 5.83756 18.2881 5.11068 19.0143 4.38193C19.3893 3.99006 19.7981 3.61693 20.1674 3.21568C19.0622 2.1872 17.765 1.38691 16.3499 0.860682C13.7731 -0.0749615 10.9536 -0.100106 8.36055 0.789432Z" fill="white"/>
-<path d="M8.3607 0.789367C10.9536 -0.100776 13.7731 -0.0762934 16.3501 0.858742C17.7654 1.38855 19.062 2.19269 20.1657 3.22499C19.7907 3.62624 19.3951 4.00124 19.0126 4.39124C18.2851 5.11749 17.5582 5.84124 16.832 6.56249C16.1079 5.87012 15.2321 5.35648 14.2745 5.06249C13.0489 4.69244 11.7451 4.66711 10.5061 4.98926C9.26712 5.31141 8.14079 5.96861 7.2507 6.88874C6.47377 7.67912 5.88538 8.63477 5.52945 9.68437L1.64258 6.67499C3.03384 3.91604 5.44273 1.80566 8.3607 0.789367Z" fill="#E33629"/>
-<path d="M0.611401 9.65654C0.820316 8.62116 1.16716 7.61847 1.64265 6.67529L5.52953 9.69217C5.02105 11.1896 5.02105 12.8129 5.52953 14.3103C4.23453 15.3103 2.9389 16.3153 1.64265 17.3253C0.452308 14.9559 0.0892746 12.2562 0.611401 9.65654Z" fill="#F8BD00"/>
-<path d="M12.2381 9.77783H23.3981C23.7799 11.8721 23.6766 14.026 23.0963 16.0741C22.5623 17.9575 21.5252 19.6597 20.0963 20.9978C18.8419 20.0191 17.5819 19.0478 16.3275 18.0691C16.9494 17.6496 17.4802 17.1089 17.8881 16.4793C18.296 15.8498 18.5726 15.1444 18.7013 14.4053H12.2381C12.2363 12.8641 12.2381 11.321 12.2381 9.77783Z" fill="#587DBD"/>
-<path d="M1.64062 17.3251C2.93687 16.3251 4.2325 15.3201 5.5275 14.3101C6.02851 15.7804 6.98138 17.0549 8.25 17.9513C9.04126 18.5106 9.94037 18.8988 10.89 19.0913C11.8257 19.2653 12.7855 19.2653 13.7212 19.0913C14.6542 18.9334 15.5439 18.5821 16.3331 18.0601C17.5875 19.0388 18.8475 20.0101 20.1019 20.9888C18.7292 22.237 17.0558 23.1073 15.2456 23.5144C13.2476 23.9841 11.1655 23.9616 9.17812 23.4488C7.60632 23.0291 6.13814 22.2893 4.86562 21.2757C3.51874 20.2063 2.41867 18.8588 1.64062 17.3251Z" fill="#319F43"/>
-</g>
-<defs>
-<clipPath id="clip0_2781_85129">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/Show More
+++ b/Show More