added missing labels

updating paths (DOCKER_SECURITY_ENABLE > ADDITIONAL_FEATURES)

Dockerfile

@@ -5,8 +5,7 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 COPY scripts /scripts
 COPY pipeline /pipeline
 COPY stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-#COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
-COPY build/libs/*.jar app.jar
+COPY stirling-pdf/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 

Dockerfile.fat

@@ -5,6 +5,7 @@ COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
+COPY stirling-pdf/build.gradle stirling-pdf/.
 COPY common/build.gradle common/.
 COPY proprietary/build.gradle proprietary/.
 RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
@@ -27,7 +28,7 @@ FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be02
 COPY scripts /scripts
 COPY pipeline /pipeline
 COPY stirling-pdf/src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-COPY --from=build /app/build/libs/*.jar app.jar
+COPY --from=build /app/stirling-pdf/build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 

Dockerfile.ultra-lite

@@ -18,7 +18,7 @@ COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh
 COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY scripts/installFonts.sh /scripts/installFonts.sh
 COPY pipeline /pipeline
-COPY build/libs/*.jar app.jar
+COPY stirling-pdf/build/libs/*.jar app.jar
 
 # Set up necessary directories and permissions
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \

build.gradle

@@ -46,11 +46,9 @@ sourceSets {
                 && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
                 exclude 'stirling/software/proprietary/security/**'
             }
-
             if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
                 exclude '**/stirling/software/SPDF/UI/impl/**'
             }
-
         }
     }
 
@@ -62,7 +60,9 @@ sourceSets {
                 exclude 'stirling/software/proprietary/security/**'
             }
 
-            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+            if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
+                || (project.hasProperty('STIRLING_PDF_DESKTOP_UI')
+                && project.getProperty('STIRLING_PDF_DESKTOP_UI') != 'false')) {
                 exclude '**/stirling/software/SPDF/UI/impl/**'
             }
         }
@@ -71,7 +71,7 @@ sourceSets {
 
 allprojects {
     group = 'stirling.software'
-    version = '0.46.2'
+    version = '0.47.0'
 
     configurations.configureEach {
         exclude group: 'commons-logging', module: 'commons-logging'
@@ -214,7 +214,7 @@ jpackage {
         installDir = "C:/Program Files/Stirling-PDF"
     }
 
-    // MacOS-specific configuration
+    // macOS-specific configuration
     mac {
         appVersion = getMacVersion(project.version.toString())
         icon = "stirling-pdf/src/main/resources/static/favicon.icns"
@@ -279,11 +279,6 @@ jpackage {
     licenseFile = "LICENSE"
 }
 
-//tasks.wrapper {
-//    gradleVersion = "8.14"
-//    distributionType = Wrapper.DistributionType.ALL
-//}
-
 tasks.register('jpackageMacX64') {
     group = 'distribution'
     description = 'Packages app for MacOS x86_64'
@@ -481,7 +476,7 @@ tasks.named("test") {
 }
 
 tasks.register('writeVersion') {
-    def propsFile = file("$projectDir/stirling-pdf/src/main/resources/version.properties")
+    def propsFile = file("$projectDir/common/src/main/resources/version.properties")
     def propsDir = propsFile.parentFile
 
     doLast {
@@ -505,6 +500,7 @@ tasks.register('writeVersion') {
 }
 
 processResources.dependsOn(writeVersion)
+project(':stirling-pdf').tasks.bootJar.dependsOn(writeVersion)
 
 tasks.register('printVersion') {
     doLast {
@@ -530,3 +526,13 @@ tasks.named('bootRun') {
         println "Delegating to :stirling-pdf:bootRun"
     }
 }
+
+tasks.named('build') {
+    group = 'build'
+    description = 'Delegates to :stirling-pdf:bootJar'
+    dependsOn ':stirling-pdf:bootJar'
+
+    doFirst {
+        println "Delegating to :stirling-pdf:bootJar"
+    }
+}

common/build.gradle

@@ -1,3 +1,8 @@
+// Configure bootRun to disable it or point to a main class
+bootRun {
+    enabled = false
+}
+
 dependencies {
     api 'org.springframework.boot:spring-boot-starter-web'
     api 'org.springframework.boot:spring-boot-starter-thymeleaf'

common/src/main/java/stirling/software/common/configuration/AppConfig.java

@@ -13,18 +13,22 @@ import java.util.function.Predicate;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.Scope;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.spring6.SpringTemplateEngine;
-
+import org.springframework.core.Ordered;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -253,6 +257,32 @@ public class AppConfig {
         return applicationProperties.getSystem().getDatasource();
     }
 
+    
+    @Bean(name = "runningProOrHigher")
+    @Profile("default")
+    public boolean runningProOrHigher() {
+    	return false;
+    }
+
+    @Bean(name = "runningEE")
+    @Profile("default")
+    public boolean runningEnterprise() {
+    	return false;
+    }
+
+    @Bean(name = "GoogleDriveEnabled")
+    @Profile("default")
+    public boolean googleDriveEnabled() {
+        return false;
+    }
+    
+    @Bean(name = "license")
+    @Profile("default")
+    public String licenseType() {
+        return "NORMAL";
+    }
+    
+    
     @Bean(name = "disablePixel")
     public boolean disablePixel() {
     	return Boolean.parseBoolean(env.getProperty("DISABLE_PIXEL", "false"));

proprietary/build.gradle

@@ -1,7 +1,9 @@
 repositories {
     maven { url = "https://build.shibboleth.net/maven/releases" }
 }
-
+bootRun {
+    enabled = false
+}
 dependencies {
     implementation project(':common')
 

proprietary/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

proprietary/gradlew

@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

proprietary/gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java

@@ -9,6 +9,7 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import lombok.Getter;
@@ -59,6 +60,7 @@ public class DatabaseConfig {
      */
     @Bean
     @Qualifier("dataSource")
+    @Primary
     public DataSource dataSource() throws UnsupportedProviderException {
         DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
 

proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java

@@ -2,9 +2,10 @@ package stirling.software.proprietary.security.configuration.ee;
 
 import static stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier.License;
 
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
@@ -28,18 +29,23 @@ public class EEAppConfig {
         migrateEnterpriseSettingsToPremium(this.applicationProperties);
     }
 
+    @Profile("security")
     @Bean(name = "runningProOrHigher")
-    @Qualifier("runningProOrHigher")
+    @Primary
     public boolean runningProOrHigher() {
         return licenseKeyChecker.getPremiumLicenseEnabledResult() != License.NORMAL;
     }
 
+    @Profile("security")
     @Bean(name = "license")
+    @Primary
     public String licenseType() {
         return licenseKeyChecker.getPremiumLicenseEnabledResult().name();
     }
 
+    @Profile("security")
     @Bean(name = "runningEE")
+    @Primary
     public boolean runningEnterprise() {
         return licenseKeyChecker.getPremiumLicenseEnabledResult() == License.ENTERPRISE;
     }
@@ -49,7 +55,9 @@ public class EEAppConfig {
         return applicationProperties.getPremium().getProFeatures().isSsoAutoLogin();
     }
 
+    @Profile("security")
     @Bean(name = "GoogleDriveEnabled")
+    @Primary
     public boolean googleDriveEnabled() {
         return runningProOrHigher()
                 && applicationProperties.getPremium().getProFeatures().getGoogleDrive().isEnabled();

proprietary/src/main/java/stirling/software/proprietary/security/model/User.java

@@ -15,6 +15,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import stirling.software.common.model.enumeration.Role;
+
 import stirling.software.common.model.enumeration.Role;
 import stirling.software.proprietary.model.Team;
 

proprietary/src/main/resources/templates/enterprise/teams.html

@@ -59,7 +59,10 @@
                         <form th:action="@{'/api/v1/team/delete'}" method="post" style="display:inline-block"
                               onsubmit="return confirmDeleteTeam()">
                           <input type="hidden" name="teamId" th:value="${team.id}" />
-                          <button type="submit" class="data-btn data-btn-danger data-btn-sm" th:title="#{adminUserSettings.deleteTeam}">
+                          <button type="submit" class="data-btn data-btn-danger data-btn-sm" 
+                            th:disabled="${!@runningProOrHigher}" 
+                            th:classappend="${!@runningProOrHigher} ? 'disabled' : ''"
+                            th:title="${@runningProOrHigher} ? #{adminUserSettings.deleteTeam} : #{enterpriseEdition.proTeamFeatureDisabled}">
                             <span class="material-symbols-rounded">delete</span> <span th:text="#{delete}">Delete</span>
                           </button>
                         </form>
@@ -108,7 +111,7 @@
                 </button>
                 <button type="submit" class="data-btn data-btn-primary">
                   <span class="material-symbols-rounded">check</span>
-                  <span th:text="#{adminUserSettings.submit}">Create</span>
+                  <span th:text="#{adminUserSettings.createTeam}">Create</span>
                 </button>
               </div>
             </div>

src/main/resources/messages_en_US.properties

@@ -259,6 +259,7 @@ enterpriseEdition.button=Upgrade to Pro
 enterpriseEdition.warning=This feature is only available to Pro users.
 enterpriseEdition.yamlAdvert=Stirling PDF Pro supports YAML configuration files and other SSO features.
 enterpriseEdition.ssoAdvert=Looking for more user management features? Check out Stirling PDF Pro
+enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro license or higher
 
 
 #################
@@ -1512,14 +1513,13 @@ error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
 
-
 #remove-image
 removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
 
-
+#split-by-chapters
 splitByChapters.title=Split PDF by Chapters
 splitByChapters.header=Split PDF by Chapters
 splitByChapters.bookmarkLevel=Bookmark Level
@@ -1586,8 +1586,8 @@ validateSignature.cert.bits=bits
 #  Cookie banner   #
 ####################
 cookieBanner.popUp.title=How we use Cookies
-cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you—helping us improve our tools and keep building features you'll love.
-cookieBanner.popUp.description.2=If you’d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
+cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you\u2014helping us improve our tools and keep building features you'll love.
+cookieBanner.popUp.description.2=If you\u2019d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
 cookieBanner.popUp.acceptAllBtn=Okay
 cookieBanner.popUp.acceptNecessaryBtn=No Thanks
 cookieBanner.popUp.showPreferencesBtn=Manage preferences
@@ -1599,13 +1599,13 @@ cookieBanner.preferencesModal.closeIconLabel=Close modal
 cookieBanner.preferencesModal.serviceCounterLabel=Service|Services
 cookieBanner.preferencesModal.subtitle=Cookie Usage
 cookieBanner.preferencesModal.description.1=Stirling PDF uses cookies and similar technologies to enhance your experience and understand how our tools are used. This helps us improve performance, develop the features you care about, and provide ongoing support to our users.
-cookieBanner.preferencesModal.description.2=Stirling PDF cannot—and will never—track or access the content of the documents you use.
+cookieBanner.preferencesModal.description.2=Stirling PDF cannot\u2014and will never\u2014track or access the content of the documents you use.
 cookieBanner.preferencesModal.description.3=Your privacy and trust are at the core of what we do.
 cookieBanner.preferencesModal.necessary.title.1=Strictly Necessary Cookies
 cookieBanner.preferencesModal.necessary.title.2=Always Enabled
-cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms—which is why they can’t be turned off.
+cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms\u2014which is why they can\u2019t be turned off.
 cookieBanner.preferencesModal.analytics.title=Analytics
-cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
+cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured\u2014Stirling PDF cannot and will never track the content of the documents you work with.
 
 #fakeScan
 fakeScan.title=Fake Scan

stirling-pdf/.gitignore

@@ -123,8 +123,8 @@ SwaggerDoc.json
 *.tar.gz
 *.rar
 *.db
-/build/*
-/stirling-pdf/build/*
+/build
+/stirling-pdf/build/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

stirling-pdf/build.gradle

@@ -80,25 +80,58 @@ sourceSets {
         resources {
             srcDirs += ['../configs']
         }
+        java {
+            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+                exclude 'stirling/software/SPDF/UI/impl/**'
+            }
+
+        }
     }
+    test {
+        java {
+            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
+                || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
+                && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
+                exclude 'stirling/software/proprietary/security/**'
+            }
+            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+                exclude 'stirling/software/SPDF/UI/impl/**'
+            }
+        }
+    }
+
 }
 
+
+// Disable regular jar
 jar {
+    enabled = false
+}
+
+// Configure and enable bootJar for this project
+bootJar {
+    enabled = true
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     zip64 = true
 
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
+    // Don't include all dependencies directly like the old jar task did
+    // from {
+    //     configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    // }
+
+    // Exclude signature files to prevent "Invalid signature file digest" errors
+    exclude 'META-INF/*.SF'
+    exclude 'META-INF/*.DSA'
+    exclude 'META-INF/*.RSA'
+    exclude 'META-INF/*.EC'
 
     manifest {
         attributes(
-            'Main-Class': 'stirling.software.SPDF.SPDFApplication',
             'Implementation-Title': 'Stirling-PDF',
             'Implementation-Version': project.version
         )
     }
 }
 
-jar.dependsOn ':common:jar'
-jar.dependsOn ':proprietary:jar'
+bootJar.dependsOn ':common:jar'
+bootJar.dependsOn ':proprietary:jar'

stirling-pdf/build/resources/main/templates/security/get-info-on-pdf.html

@@ -0,0 +1,594 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{getPdfInfo.title}, header=#{getPdfInfo.header})}"></th:block>
+</head>
+
+<body>
+<div id="page-container">
+  <div id="content-wrap">
+    <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+    <br><br>
+    <div class="container">
+      <div class="row justify-content-center">
+        <div class="col-md-7 bg-card">
+          <div class="tool-header">
+            <span class="material-symbols-rounded tool-header-icon other">info</span>
+            <span class="tool-header-text" th:text="#{getPdfInfo.header}"></span>
+          </div>
+          <form id="pdfInfoForm" method="post" enctype="multipart/form-data" th:action="@{'/api/v1/security/get-info-on-pdf'}">
+            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, remoteCall='false', accept='application/pdf')}"></div>
+
+            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{getPdfInfo.submit}"></button>
+          </form>
+          <div class="container mt-0">
+            <!-- PDF Summary section -->
+            <div id="pdf-summary" class="card mt-3 mb-3" style="display: none;">
+              <div class="card-header">
+                <h5 class="mb-0" id="summary-heading">PDF Summary</h5>
+              </div>
+              <div class="card-body">
+                <!-- Quick overview of key details -->
+                <div class="row">
+                  <div class="col-md-6">
+                    <h6 id="summary-basic-info-heading">Basic Information</h6>
+                    <ul class="list-unstyled">
+                      <li><strong>Pages:</strong> <span id="summary-pages">-</span></li>
+                      <li><strong>File Size:</strong> <span id="summary-size">-</span></li>
+                      <li><strong>PDF Version:</strong> <span id="summary-version">-</span></li>
+                      <li><strong>Language:</strong> <span id="summary-language">-</span></li>
+                    </ul>
+                  </div>
+                  <div class="col-md-6">
+                    <h6 id="summary-doc-info-heading">Document Information</h6>
+                    <ul class="list-unstyled">
+                      <li><strong>Title:</strong> <span id="summary-title">-</span></li>
+                      <li><strong>Author:</strong> <span id="summary-author">-</span></li>
+                      <li><strong>Created:</strong> <span id="summary-created">-</span></li>
+                      <li><strong>Modified:</strong> <span id="summary-modified">-</span></li>
+                    </ul>
+                  </div>
+                </div>
+
+                <!-- Security section -->
+                <div class="mt-4 mb-3">
+                  <h6 id="summary-security-heading">Security Status</h6>
+                  <div class="row">
+                    <div class="col-md-4">
+                      <div id="encryption-status" class="card mb-2 h-100">
+                        <div class="card-body p-2 d-flex align-items-center">
+                          <span id="encryption-icon" class="me-2"><i class="bi bi-lock"></i></span>
+                          <span id="encryption-text" class="small">Encryption: Unknown</span>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-md-4">
+                      <div id="permissions-status" class="card mb-2 h-100">
+                        <div class="card-body p-2 d-flex align-items-center">
+                          <span id="permissions-icon" class="me-2"><i class="bi bi-shield"></i></span>
+                          <span id="permissions-text" class="small">Permissions: Unknown</span>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-md-4">
+                      <div id="compliance-status" class="card mb-2 h-100">
+                        <div class="card-body p-2 d-flex align-items-center">
+                          <span id="compliance-icon" class="me-2"><i class="bi bi-check-circle"></i></span>
+                          <span id="compliance-text" class="small">Compliance: Unknown</span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <!-- Detailed alerts -->
+                <div id="summary-alerts" class="mt-3">
+                  <!-- Will be populated with detailed alerts for encryption, permissions, etc. -->
+                </div>
+
+                <!-- Descriptive note about PDF characteristics -->
+                <div class="card mt-3">
+                  <div class="card-header">
+                    <h6 class="mb-0">PDF Overview</h6>
+                  </div>
+                  <div class="card-body">
+                    <p id="summary-text" class="mb-0"></p>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!-- Iterate over each main section in the JSON -->
+            <div id="json-content">
+              <!-- JavaScript will populate this section -->
+            </div>
+
+            <!-- Button to download the JSON -->
+            <a href="#" id="downloadJson" class="btn btn-primary mt-3" style="display: none;" th:text="#{getPdfInfo.downloadJson}">Download JSON</a>
+          </div>
+          <script th:src="@{'/js/fetch-utils.js'}"></script>
+          <script th:inline="javascript">
+            // Pre-load message translations
+            const getPdfInfoSummary = /*[[#{getPdfInfo.summary}]]*/ "PDF Summary";
+            const getPdfInfoSummaryEncrypted = /*[[#{getPdfInfo.summary.encrypted}]]*/ "This PDF is encrypted so may face issues with some applications";
+            const getPdfInfoSummaryPermissions = /*[[#{getPdfInfo.summary.permissions}]]*/ "This PDF has {0} restricted permissions which may limit what you can do with it";
+            const getPdfInfoSummaryCompliance = /*[[#{getPdfInfo.summary.compliance}]]*/ "This PDF complies with the {0} standard, meaning it is suitable for {1}";
+            const getPdfInfoSummaryBasicInfo = /*[[#{getPdfInfo.summary.basicInfo}]]*/ "Basic Information";
+            const getPdfInfoSummaryDocInfo = /*[[#{getPdfInfo.summary.docInfo}]]*/ "Document Information";
+            const getPdfInfoSummarySecuritySection = /*[[#{getPdfInfo.summary.security.section}]]*/ "Security Status";
+            const getPdfInfoSummaryEncryptedAlert = /*[[#{getPdfInfo.summary.encrypted.alert}]]*/ "Encrypted PDF - This document is password protected";
+            const getPdfInfoSummaryNotEncryptedAlert = /*[[#{getPdfInfo.summary.not.encrypted.alert}]]*/ "Unencrypted PDF - No password protection";
+            const getPdfInfoSummaryPermissionsAlert = /*[[#{getPdfInfo.summary.permissions.alert}]]*/ "Restricted Permissions - {0} actions are not allowed";
+            const getPdfInfoSummaryAllPermissionsAlert = /*[[#{getPdfInfo.summary.all.permissions.alert}]]*/ "All Permissions Allowed";
+            const getPdfInfoSummaryComplianceAlert = /*[[#{getPdfInfo.summary.compliance.alert}]]*/ "{0} Compliant";
+            const getPdfInfoSummaryNoComplianceAlert = /*[[#{getPdfInfo.summary.no.compliance.alert}]]*/ "No Compliance Standards";
+            
+            // Update the summary headings
+            document.addEventListener('DOMContentLoaded', function() {
+              document.getElementById('summary-heading').textContent = getPdfInfoSummary;
+              document.getElementById('summary-basic-info-heading').textContent = getPdfInfoSummaryBasicInfo;
+              document.getElementById('summary-doc-info-heading').textContent = getPdfInfoSummaryDocInfo;
+              document.getElementById('summary-security-heading').textContent = getPdfInfoSummarySecuritySection;
+            });
+            
+            // Pre-load section descriptions
+            const getPdfInfoSectionBasicInfo = /*[[#{getPdfInfo.section.BasicInfo}]]*/ "Basic Information about the PDF document including file size, page count, and language";
+            const getPdfInfoSectionMetadata = /*[[#{getPdfInfo.section.Metadata}]]*/ "Document metadata including title, author, creation date and other document properties";
+            const getPdfInfoSectionDocumentInfo = /*[[#{getPdfInfo.section.DocumentInfo}]]*/ "Technical details about the PDF document structure and version";
+            const getPdfInfoSectionCompliancy = /*[[#{getPdfInfo.section.Compliancy}]]*/ "PDF standards compliance information (PDF/A, PDF/X, etc.)";
+            const getPdfInfoSectionEncryption = /*[[#{getPdfInfo.section.Encryption}]]*/ "Security and encryption details of the document";
+            const getPdfInfoSectionPermissions = /*[[#{getPdfInfo.section.Permissions}]]*/ "Document permission settings that control what actions can be performed";
+            const getPdfInfoSectionOther = /*[[#{getPdfInfo.section.Other}]]*/ "Additional document components like bookmarks, layers, and embedded files";
+            const getPdfInfoSectionFormFields = /*[[#{getPdfInfo.section.FormFields}]]*/ "Interactive form fields present in the document";
+            const getPdfInfoSectionPerPageInfo = /*[[#{getPdfInfo.section.PerPageInfo}]]*/ "Detailed information about each page in the document";
+
+            document.getElementById("pdfInfoForm").addEventListener("submit", function(event) {
+              event.preventDefault();
+              
+              // Clear previous results when submitting a new form
+              document.getElementById('json-content').innerHTML = '';
+              document.getElementById('pdf-summary').style.display = 'none';
+              document.getElementById('downloadJson').style.display = 'none';
+
+              const formData = new FormData(event.target);
+
+              fetchWithCsrf('api/v1/security/get-info-on-pdf', {
+                method: 'POST',
+                body: formData
+              }).then(response => response.json()).then(data => {
+                // Populate and display the enhanced PDF summary
+                populateSummarySection(data);
+                
+                displayJsonData(data);
+                setDownloadLink(data);
+                document.getElementById("downloadJson").style.display = "block";
+              }).catch(error => console.error('Error:', error));
+              
+            // Function to reset all summary elements to default state
+            function resetSummaryElements() {
+              // Reset basic information fields
+              document.getElementById('summary-pages').textContent = '-';
+              document.getElementById('summary-size').textContent = '-';
+              document.getElementById('summary-version').textContent = '-';
+              document.getElementById('summary-language').textContent = '-';
+              
+              // Reset document information fields
+              document.getElementById('summary-title').textContent = '-';
+              document.getElementById('summary-author').textContent = '-';
+              document.getElementById('summary-created').textContent = '-';
+              document.getElementById('summary-modified').textContent = '-';
+              
+              // Reset security status cards
+              const cards = ['encryption-status', 'permissions-status', 'compliance-status'];
+              cards.forEach(id => {
+                const card = document.getElementById(id);
+                // Remove all classes except the base ones
+                card.className = 'card mb-2 h-100';
+              });
+              
+              // Reset status text and icons
+              document.getElementById('encryption-icon').innerHTML = '<i class="bi bi-lock"></i>';
+              document.getElementById('encryption-text').textContent = 'Encryption: Unknown';
+              
+              document.getElementById('permissions-icon').innerHTML = '<i class="bi bi-shield"></i>';
+              document.getElementById('permissions-text').textContent = 'Permissions: Unknown';
+              
+              document.getElementById('compliance-icon').innerHTML = '<i class="bi bi-check-circle"></i>';
+              document.getElementById('compliance-text').textContent = 'Compliance: Unknown';
+              
+              // Clear alerts container
+              document.getElementById('summary-alerts').innerHTML = '';
+              
+              // Reset summary text
+              document.getElementById('summary-text').innerHTML = '';
+            }
+            
+            // Function to populate the enhanced summary section
+            function populateSummarySection(data) {
+              // Reset all elements first
+              resetSummaryElements();
+              
+              // Get basic information
+              if (data.BasicInfo) {
+                document.getElementById('summary-pages').textContent = data.BasicInfo["Number of pages"] || "-";
+                
+                // Format file size nicely
+                let fileSize = data.BasicInfo["FileSizeInBytes"];
+                if (fileSize) {
+                  const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+                  const i = Math.floor(Math.log(fileSize) / Math.log(1024));
+                  fileSize = (fileSize / Math.pow(1024, i)).toFixed(2) + ' ' + sizes[i];
+                  document.getElementById('summary-size').textContent = fileSize;
+                }
+                
+                document.getElementById('summary-language').textContent = data.BasicInfo["Language"] || "-";
+              }
+              
+              // Get document information
+              if (data.DocumentInfo) {
+                document.getElementById('summary-version').textContent = data.DocumentInfo["PDF version"] || "-";
+              }
+              
+              // Get metadata
+              if (data.Metadata) {
+                document.getElementById('summary-title').textContent = data.Metadata["Title"] || "-";
+                document.getElementById('summary-author').textContent = data.Metadata["Author"] || "-";
+                document.getElementById('summary-created').textContent = data.Metadata["CreationDate"] || "-";
+                document.getElementById('summary-modified').textContent = data.Metadata["ModificationDate"] || "-";
+              }
+              
+              // Update security status cards
+              
+              // Encryption status
+              const encryptionStatusCard = document.getElementById('encryption-status');
+              const encryptionIcon = document.getElementById('encryption-icon');
+              const encryptionText = document.getElementById('encryption-text');
+              
+              if (data.Encryption && data.Encryption.IsEncrypted) {
+                encryptionIcon.innerHTML = '<i class="bi bi-lock-fill"></i>';
+                encryptionText.textContent = getPdfInfoSummaryEncryptedAlert;
+              } else {
+                encryptionIcon.innerHTML = '<i class="bi bi-unlock-fill"></i>';
+                encryptionText.textContent = getPdfInfoSummaryNotEncryptedAlert;
+              }
+              
+              // Permissions status
+              const permissionsStatusCard = document.getElementById('permissions-status');
+              const permissionsIcon = document.getElementById('permissions-icon');
+              const permissionsText = document.getElementById('permissions-text');
+              
+              let restrictedPermissions = [];
+              if (data.Permissions) {
+                for (const [permission, state] of Object.entries(data.Permissions)) {
+                  if (state === "Not Allowed") {
+                    restrictedPermissions.push(permission);
+                  }
+                }
+              }
+              
+              if (restrictedPermissions.length > 0) {
+                permissionsIcon.innerHTML = '<i class="bi bi-shield-lock-fill"></i>';
+                const formattedAlert = getPdfInfoSummaryPermissionsAlert.replace('{0}', restrictedPermissions.length);
+                permissionsText.textContent = formattedAlert;
+              } else {
+                permissionsIcon.innerHTML = '<i class="bi bi-shield-check"></i>';
+                permissionsText.textContent = getPdfInfoSummaryAllPermissionsAlert;
+              }
+              
+              // Compliance status
+              const complianceStatusCard = document.getElementById('compliance-status');
+              const complianceIcon = document.getElementById('compliance-icon');
+              const complianceText = document.getElementById('compliance-text');
+              
+              let hasCompliance = false;
+              let compliantStandards = [];
+              
+              if (data.Compliancy) {
+                for (const [standard, compliant] of Object.entries(data.Compliancy)) {
+                  if (compliant === true) {
+                    hasCompliance = true;
+                    const standardName = standard.replace("Is", "").replace("Compliant", "");
+                    compliantStandards.push(standardName);
+                  }
+                }
+              }
+              
+              if (hasCompliance) {
+                complianceIcon.innerHTML = '<i class="bi bi-check-circle-fill"></i>';
+                const formattedAlert = getPdfInfoSummaryComplianceAlert.replace('{0}', compliantStandards.join(', '));
+                complianceText.textContent = formattedAlert;
+              } else {
+                complianceIcon.innerHTML = '<i class="bi bi-dash-circle"></i>';
+                complianceText.textContent = getPdfInfoSummaryNoComplianceAlert;
+              }
+              
+              // Create detailed characteristic alerts
+              const alertsContainer = document.getElementById('summary-alerts');
+              
+              // Clear previous alerts
+              alertsContainer.innerHTML = '';
+              
+              // Create a single comprehensive security details section
+              let hasSummaryInfo = false;
+              
+              // Create a consolidated security details card if there are security details worth highlighting
+              if ((data.Encryption && data.Encryption.IsEncrypted) || 
+                  restrictedPermissions.length > 0 || 
+                  hasCompliance) {
+                
+                const securityDetailsCard = document.createElement('div');
+                securityDetailsCard.className = 'card mt-3 mb-3';
+                
+                const cardHeader = document.createElement('div');
+                cardHeader.className = 'card-header';
+                cardHeader.innerHTML = '<h6 class="mb-0">Detailed Security Information</h6>';
+                securityDetailsCard.appendChild(cardHeader);
+                
+                const cardBody = document.createElement('div');
+                cardBody.className = 'card-body';
+                
+                // Add detailed encryption info
+                if (data.Encryption && data.Encryption.IsEncrypted) {
+                  const encryptionDiv = document.createElement('div');
+                  encryptionDiv.className = 'mb-3';
+                  encryptionDiv.innerHTML = '<h6>Encryption Details:</h6>';
+                  
+                  const encryptionList = document.createElement('ul');
+                  encryptionList.className = 'list-unstyled';
+                  
+                  if (data.Encryption.EncryptionAlgorithm) {
+                    encryptionList.innerHTML += `<li><strong>Algorithm:</strong> ${data.Encryption.EncryptionAlgorithm}</li>`;
+                  }
+                  if (data.Encryption.KeyLength) {
+                    encryptionList.innerHTML += `<li><strong>Key Length:</strong> ${data.Encryption.KeyLength} bits</li>`;
+                  }
+                  
+                  encryptionDiv.appendChild(encryptionList);
+                  cardBody.appendChild(encryptionDiv);
+                  hasSummaryInfo = true;
+                }
+                
+                // Add detailed permissions info
+                if (restrictedPermissions.length > 0) {
+                  const permissionsDiv = document.createElement('div');
+                  permissionsDiv.className = 'mb-3';
+                  permissionsDiv.innerHTML = '<h6>Restricted Permissions:</h6>';
+                  
+                  const permissionsList = document.createElement('ul');
+                  restrictedPermissions.forEach(perm => {
+                    permissionsList.innerHTML += `<li>${perm}</li>`;
+                  });
+                  
+                  permissionsDiv.appendChild(permissionsList);
+                  cardBody.appendChild(permissionsDiv);
+                  hasSummaryInfo = true;
+                }
+                
+                // Add detailed compliance info
+                if (hasCompliance) {
+                  const complianceDiv = document.createElement('div');
+                  complianceDiv.className = 'mb-3';
+                  complianceDiv.innerHTML = '<h6>Standards Compliance:</h6>';
+                  
+                  const complianceList = document.createElement('ul');
+                  complianceList.className = 'list-unstyled';
+                  
+                  compliantStandards.forEach(standard => {
+                    let standardDescription = '';
+                    
+                    // Add brief descriptions for standards
+                    if (standard === "PDF/A") {
+                      standardDescription = 'ISO standard for long-term document archiving';
+                    } else if (standard === "PDF/X") {
+                      standardDescription = 'ISO standard for printing and graphic arts exchange';
+                    } else if (standard === "PDF/UA") {
+                      standardDescription = 'ISO standard for universal accessibility';
+                    } else if (standard === "PDF/E") {
+                      standardDescription = 'ISO standard for engineering documents';
+                    } else if (standard === "PDF/VT") {
+                      standardDescription = 'ISO standard for variable and transactional printing';
+                    }
+                    
+                    complianceList.innerHTML += `<li><strong>${standard}:</strong> ${standardDescription}</li>`;
+                  });
+                  
+                  complianceDiv.appendChild(complianceList);
+                  cardBody.appendChild(complianceDiv);
+                  hasSummaryInfo = true;
+                }
+                
+                securityDetailsCard.appendChild(cardBody);
+                
+                if (hasSummaryInfo) {
+                  alertsContainer.appendChild(securityDetailsCard);
+                }
+              }
+              
+              // Generate a general document summary
+              const summaryTextElement = document.getElementById('summary-text');
+              
+              // Create a general summary for the document
+              let generalSummary = `This is a ${data.BasicInfo["Number of pages"] || "multi"}-page PDF`;
+              
+              if (data.Metadata && data.Metadata["Title"]) {
+                generalSummary += ` titled "${data.Metadata["Title"]}"`;
+              }
+              
+              if (data.Metadata && data.Metadata["Author"]) {
+                generalSummary += ` created by ${data.Metadata["Author"]}`;
+              }
+              
+              if (data.DocumentInfo && data.DocumentInfo["PDF version"]) {
+                generalSummary += ` (PDF version ${data.DocumentInfo["PDF version"]})`;
+              }
+              
+              // Add security information to the general summary if relevant
+              if (data.Encryption && data.Encryption.IsEncrypted) {
+                generalSummary += '. The document is password protected';
+                
+                if (data.Encryption.EncryptionAlgorithm) {
+                  generalSummary += ` using ${data.Encryption.EncryptionAlgorithm}`;
+                  
+                  if (data.Encryption.KeyLength) {
+                    generalSummary += ` (${data.Encryption.KeyLength} bit)`;
+                  }
+                }
+              }
+              
+              if (restrictedPermissions.length > 0) {
+                generalSummary += `. It has ${restrictedPermissions.length} restricted permissions`;
+              }
+              
+              // Add compliance standards if available
+              if (hasCompliance && compliantStandards.length > 0) {
+                generalSummary += `. This document complies with the ${compliantStandards.join(', ')} PDF standard${compliantStandards.length > 1 ? 's' : ''}`;
+              }
+              
+              generalSummary += '.';
+              
+              // Remove SummaryData from JSON to avoid duplication
+              if (data.SummaryData) {
+                delete data.SummaryData;
+              }
+              
+              summaryTextElement.innerHTML = generalSummary;
+              
+              // Display the summary section
+              document.getElementById('pdf-summary').style.display = 'block';
+            }
+              
+            function generateSummaryFromData(summaryData) {
+              let summary = [];
+              
+              // Handle encryption information
+              if (summaryData.encrypted) {
+                summary.push(getPdfInfoSummaryEncrypted);
+              }
+              
+              // Handle permissions information
+              if (summaryData.restrictedPermissions && summaryData.restrictedPermissions.length > 0) {
+                const formattedPermissionsText = getPdfInfoSummaryPermissions.replace('{0}', summaryData.restrictedPermissionsCount);
+                summary.push(formattedPermissionsText);
+              }
+              
+              // Handle standard compliance information
+              if (summaryData.standardCompliance) {
+                const formattedComplianceText = getPdfInfoSummaryCompliance
+                  .replace('{0}', summaryData.standardCompliance);
+                summary.push(formattedComplianceText);
+              }
+              
+              return summary.join(' ');
+            }
+            });
+
+            function displayJsonData(jsonData) {
+              const jsonContent = document.getElementById('json-content');
+
+              while (jsonContent.firstChild) {
+                jsonContent.removeChild(jsonContent.firstChild);
+              }
+
+              for (const key in jsonData) {
+                const sectionElem = createJsonSection(key, jsonData[key]);
+                jsonContent.appendChild(sectionElem);
+              }
+            }
+
+            function setDownloadLink(jsonData) {
+              const downloadLink = document.getElementById('downloadJson');
+              const dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(jsonData, null, 4));
+              downloadLink.setAttribute("href", dataStr);
+              downloadLink.setAttribute("download", "data.json");
+            }
+
+            function createJsonSection(key, value, depth = 0) {
+              let safeKey = (typeof key === "string") ? key.replace(/[^a-zA-Z0-9]/g, '_') : key;
+              const card = document.createElement('div');
+              card.className = 'card mb-3';
+
+              const header = document.createElement('div');
+              header.className = 'card-header';
+              header.id = `${safeKey}-heading-${depth}`;
+              const h5Elem = document.createElement('h5');
+              h5Elem.className = 'mb-0 d-flex align-items-center';
+
+              // Create the main content (button or text)
+              if (key === 'XMPMetadata' && typeof value === "string") {
+                const buttonElem = createButtonElement(key, safeKey, depth);
+                h5Elem.appendChild(buttonElem);
+              } else if (value && typeof value === 'object') {
+                if (Array.isArray(value) && value.length === 0) {
+                  h5Elem.textContent = `${key}: Empty array`;
+                } else if (!Array.isArray(value) && Object.keys(value).length === 0) {
+                  h5Elem.textContent = `${key}: Empty object`;
+                } else {
+                  const buttonElem = createButtonElement(key, safeKey, depth);
+                  h5Elem.appendChild(buttonElem);
+                }
+              } else {
+                h5Elem.textContent = `${key}: ${String(value)}`;
+              }
+              
+              // Info buttons removed as requested
+
+              header.appendChild(h5Elem);
+              card.appendChild(header);
+
+              const content = document.createElement('div');
+              content.id = `${safeKey}-content-${depth}`;
+              content.className = 'collapse';
+              content.setAttribute('aria-labelledby', `${safeKey}-heading-${depth}`);
+
+              if (key === 'XMPMetadata' && typeof value === "string") {
+                const body = document.createElement('div');
+                body.className = 'card-body';
+                const preElem = document.createElement('pre');
+                preElem.textContent = value;  // Not escaping since we're using textContent
+                body.appendChild(preElem);
+                content.appendChild(body);
+              } else if (value && typeof value === 'object' && !Array.isArray(value)) {
+                const body = document.createElement('div');
+                body.className = 'card-body';
+                for (const subKey in value) {
+                  const subElem = createJsonSection(subKey, value[subKey], depth + 1);
+                  body.appendChild(subElem);
+                }
+                content.appendChild(body);
+              } else if (value && typeof value === 'object' && Array.isArray(value)) {
+                const body = document.createElement('div');
+                body.className = 'card-body';
+                value.forEach((val, index) => {
+                  const subElem = createJsonSection(`${key}[${index}]`, val, depth + 1);
+                  body.appendChild(subElem);
+                });
+                content.appendChild(body);
+              }
+
+              card.appendChild(content);
+              return card;
+            }
+            function createButtonElement(key, safeKey, depth) {
+              const buttonElem = document.createElement('button');
+              buttonElem.className = 'btn btn-link';
+              buttonElem.type = 'button';
+              buttonElem.dataset.bsToggle = "collapse";
+              buttonElem.dataset.bsTarget = `#${safeKey}-content-${depth}`;
+              buttonElem.setAttribute('aria-expanded', 'true');
+              buttonElem.setAttribute('aria-controls', `${safeKey}-content-${depth}`);
+              buttonElem.textContent = key;
+              return buttonElem;
+            }
+            const collapsibleElems = document.querySelectorAll('[data-bs-toggle="collapse"]');
+            collapsibleElems.forEach(elem => {
+              new bootstrap.Collapse(elem);
+            });
+          </script>
+        </div>
+      </div>
+    </div>
+  </div>
+  <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+</div>
+</body>
+</html>

stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java

@@ -39,10 +39,6 @@ import stirling.software.common.util.UrlUtils;
             "stirling.software.SPDF",
             "stirling.software.common",
             "stirling.software.proprietary"
-        },
-        exclude = {
-            DataSourceAutoConfiguration.class,
-            DataSourceTransactionManagerAutoConfiguration.class
         })
 public class SPDFApplication {
 
@@ -208,17 +204,35 @@ public class SPDFApplication {
     }
 
     private static String[] getActiveProfile(String[] args) {
-        if (args == null) {
-            return new String[] {"default"};
-        }
-
-        for (String arg : args) {
-            if (arg.contains("spring.profiles.active")) {
-                return arg.substring(args[0].indexOf('=') + 1).split(", ");
+        // 1. Check for explicitly passed profiles
+        if (args != null) {
+            for (String arg : args) {
+                if (arg.startsWith("--spring.profiles.active=")) {
+                    String[] provided = arg.substring(arg.indexOf('=') + 1).split(",");
+                    if (provided.length > 0) {
+                    	   log.info("#######0000000000000###############################");
+                        return provided;
+                    }
+                }
             }
         }
-
-        return new String[] {"default"};
+        log.info("######################################");
+        // 2. Detect if SecurityConfiguration is present on classpath
+        if (isClassPresent("stirling.software.proprietary.security.configuration.SecurityConfiguration")) {
+        	log.info("security");
+            return new String[] { "security" };
+        } else {
+        	log.info("default");
+            return new String[] { "default" };
+        }
+    }
+    private static boolean isClassPresent(String className) {
+        try {
+            Class.forName(className, false, SPDFApplication.class.getClassLoader());
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
     }
 
     public static String getStaticBaseUrl() {

stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
 
-@Service
 @Slf4j
+@Service
 public class EndpointConfiguration {
 
     private static final String REMOVE_BLANKS = "remove-blanks";

stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java

@@ -1,13 +1,11 @@
 package stirling.software.SPDF.config;
 
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
 
 @Component
 @Slf4j

stirling-pdf/src/main/resources/application.properties

@@ -29,8 +29,6 @@ spring.thymeleaf.encoding=UTF-8
 spring.web.resources.mime-mappings.webmanifest=application/manifest+json
 spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
 
-management.endpoints.web.exposure.include=beans
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
 spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
@@ -45,3 +43,5 @@ springdoc.swagger-ui.url=/v1/api-docs
 springdoc.swagger-ui.path=/index.html
 posthog.api.key=phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq
 posthog.host=https://eu.i.posthog.com
+
+spring.main.allow-bean-definition-overriding=true

stirling-pdf/src/main/resources/messages_en_GB.properties

@@ -1,8 +1,180 @@
+account.adminTitle=Administrator Tools
+account.adminNotif=You have admin privileges. Access system settings and user management.
+view=View
+cancel=Cancel
+adminUserSettings.teams=View/Edit Teams
+adminUserSettings.team=Team
+adminUserSettings.manageTeams=Manage Teams
+adminUserSettings.createTeam=Create Team
+adminUserSettings.viewTeam=View Team
+adminUserSettings.deleteTeam=Delete Team
+adminUserSettings.teamName=Team Name
+adminUserSettings.teamExists=Team already exists
+adminUserSettings.teamCreated=Team created successfully
+adminUserSettings.teamChanged=User's team was updated
+adminUserSettings.totalMembers=Total Members
+
+teamCreated=Team created successfully
+teamExists=A team with that name already exists
+teamNameExists=Another team with that name already exists
+teamNotFound=Team not found
+teamDeleted=Team deleted
+teamHasUsers=Cannot delete a team with users assigned
+teamRenamed=Team renamed successfully
+merge.generateToc=Generate table of contents in the merged file?
+# Table of Contents Feature
+home.editTableOfContents.title=Edit Table of Contents
+home.editTableOfContents.desc=Add or edit bookmarks and table of contents in PDF documents
+editTableOfContents.tags=bookmarks,toc,navigation,index,table of contents,chapters,sections,outline
+editTableOfContents.title=Edit Table of Contents
+editTableOfContents.header=Add or Edit PDF Table of Contents
+editTableOfContents.replaceExisting=Replace existing bookmarks (uncheck to append to existing)
+editTableOfContents.editorTitle=Bookmark Editor
+editTableOfContents.editorDesc=Add and arrange bookmarks below. Click + to add child bookmarks.
+editTableOfContents.addBookmark=Add New Bookmark
+editTableOfContents.desc.1=This tool allows you to add or edit the table of contents (bookmarks) in a PDF document.
+editTableOfContents.desc.2=You can create a hierarchical structure by adding child bookmarks to parent bookmarks.
+editTableOfContents.desc.3=Each bookmark requires a title and target page number.
+editTableOfContents.submit=Apply Table of Contents
+
+
 ###########
 # Generic #
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amharic
+lang.ara=Arabic
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (Cyrillic)
+lang.bel=Belarusian
+lang.ben=Bengali
+lang.bod=Tibetan
+lang.bos=Bosnian
+lang.bre=Breton
+lang.bul=Bulgarian
+lang.cat=Catalan
+lang.ceb=Cebuano
+lang.ces=Czech
+lang.chi_sim=Chinese (Simplified)
+lang.chi_sim_vert=Chinese (Simplified, Vertical)
+lang.chi_tra=Chinese (Traditional)
+lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.chr=Cherokee
+lang.cos=Corsican
+lang.cym=Welsh
+lang.dan=Danish
+lang.dan_frak=Danish (Fraktur)
+lang.deu=German
+lang.deu_frak=German (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greek
+lang.eng=English
+lang.enm=English, Middle (1100-1500)
+lang.epo=Esperanto
+lang.equ=Math / equation detection module
+lang.est=Estonian
+lang.eus=Basque
+lang.fao=Faroese
+lang.fas=Persian
+lang.fil=Filipino
+lang.fin=Finnish
+lang.fra=French
+lang.frk=Frankish
+lang.frm=French, Middle (ca.1400-1600)
+lang.fry=Western Frisian
+lang.gla=Scottish Gaelic
+lang.gle=Irish
+lang.glg=Galician
+lang.grc=Ancient Greek
+lang.guj=Gujarati
+lang.hat=Haitian, Haitian Creole
+lang.heb=Hebrew
+lang.hin=Hindi
+lang.hrv=Croatian
+lang.hun=Hungarian
+lang.hye=Armenian
+lang.iku=Inuktitut
+lang.ind=Indonesian
+lang.isl=Icelandic
+lang.ita=Italian
+lang.ita_old=Italian (Old)
+lang.jav=Javanese
+lang.jpn=Japanese
+lang.jpn_vert=Japanese (Vertical)
+lang.kan=Kannada
+lang.kat=Georgian
+lang.kat_old=Georgian (Old)
+lang.kaz=Kazakh
+lang.khm=Central Khmer
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Northern Kurdish
+lang.kor=Korean
+lang.kor_vert=Korean (Vertical)
+lang.lao=Lao
+lang.lat=Latin
+lang.lav=Latvian
+lang.lit=Lithuanian
+lang.ltz=Luxembourgish
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedonian
+lang.mlt=Maltese
+lang.mon=Mongolian
+lang.mri=Maori
+lang.msa=Malay
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Dutch; Flemish
+lang.nor=Norwegian
+lang.oci=Occitan (post 1500)
+lang.ori=Oriya
+lang.osd=Orientation and script detection module
+lang.pan=Panjabi, Punjabi
+lang.pol=Polish
+lang.por=Portuguese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Romanian, Moldavian, Moldovan
+lang.rus=Russian
+lang.san=Sanskrit
+lang.sin=Sinhala, Sinhalese
+lang.slk=Slovak
+lang.slk_frak=Slovak (Fraktur)
+lang.slv=Slovenian
+lang.snd=Sindhi
+lang.spa=Spanish
+lang.spa_old=Spanish (Old)
+lang.sqi=Albanian
+lang.srp=Serbian
+lang.srp_latn=Serbian (Latin)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Swedish
+lang.syr=Syriac
+lang.tam=Tamil
+lang.tat=Tatar
+lang.tel=Telugu
+lang.tgk=Tajik
+lang.tgl=Tagalog
+lang.tha=Thai
+lang.tir=Tigrinya
+lang.ton=Tonga (Tonga Islands)
+lang.tur=Turkish
+lang.uig=Uighur, Uyghur
+lang.ukr=Ukrainian
+lang.urd=Urdu
+lang.uzb=Uzbek
+lang.uzb_cyrl=Uzbek (Cyrillic)
+lang.vie=Vietnamese
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
 pdfPrompt=Select PDF(s)
@@ -130,6 +302,65 @@ enterpriseEdition.ssoAdvert=Looking for more user management features? Check out
 enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro licence or higher
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
+
+
+#############
+#  NAVBAR   #
+#############
+navbar.favorite=Favorites
+navbar.recent=New and recently updated
+navbar.darkmode=Dark Mode
+navbar.language=Languages
+navbar.settings=Settings
+navbar.allTools=Tools
+navbar.multiTool=Multi Tool
+navbar.search=Search
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
+
+#############
+#  SETTINGS #
+#############
+settings.title=Settings
+settings.update=Update available
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
+settings.appVersion=App Version:
+settings.downloadOption.title=Choose download option (For single file non zip downloads):
+settings.downloadOption.1=Open in same window
+settings.downloadOption.2=Open in new window
+settings.downloadOption.3=Download file
+settings.zipThreshold=Zip files when the number of downloaded files exceeds
+settings.signOut=Sign Out
+settings.accountSettings=Account Settings
+settings.bored.help=Enables easter egg game
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
+
+changeCreds.title=Change Credentials
+changeCreds.header=Update Your Account Details
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.newUsername=New Username
+changeCreds.oldPassword=Current Password
+changeCreds.newPassword=New Password
+changeCreds.confirmNewPassword=Confirm New Password
+changeCreds.submit=Submit Changes
+
+
+
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
@@ -1417,3 +1648,38 @@ cookieBanner.preferencesModal.necessary.description=These cookies are essential
 cookieBanner.preferencesModal.analytics.title=Analytics
 cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
 
+#fakeScan
+fakeScan.title=Fake Scan
+fakeScan.header=Fake Scan
+fakeScan.description=Create a PDF that looks like it was scanned
+fakeScan.selectPDF=Select PDF:
+fakeScan.quality=Scan Quality
+fakeScan.quality.low=Low
+fakeScan.quality.medium=Medium
+fakeScan.quality.high=High
+fakeScan.rotation=Rotation Angle
+fakeScan.rotation.none=None
+fakeScan.rotation.slight=Slight
+fakeScan.rotation.moderate=Moderate
+fakeScan.rotation.severe=Severe
+fakeScan.submit=Create Fake Scan
+
+#home.fakeScan
+home.fakeScan.title=Fake Scan
+home.fakeScan.desc=Create a PDF that looks like it was scanned
+fakeScan.tags=scan,simulate,realistic,convert
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Enable Advanced Scan Settings
+fakeScan.colorspace=Colorspace
+fakeScan.colorspace.grayscale=Grayscale
+fakeScan.colorspace.color=Color
+fakeScan.border=Border (px)
+fakeScan.rotate=Base Rotation (degrees)
+fakeScan.rotateVariance=Rotation Variance (degrees)
+fakeScan.brightness=Brightness
+fakeScan.contrast=Contrast
+fakeScan.blur=Blur
+fakeScan.noise=Noise
+fakeScan.yellowish=Yellowish (simulate old paper)
+fakeScan.resolution=Resolution (DPI)

stirling-pdf/src/main/resources/static/3rdPartyLicenses.json

@@ -45,77 +45,77 @@
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
             "moduleUrl": "https://github.com/FasterXML/jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
             "moduleUrl": "https://github.com/FasterXML/jackson",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
             "moduleUrl": "https://github.com/FasterXML/jackson-dataformats-text",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
             "moduleUrl": "https://github.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-base",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
             "moduleUrl": "https://github.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-json-provider",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-base",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
             "moduleUrl": "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "com.fasterxml.jackson:jackson-bom",
             "moduleUrl": "https://github.com/FasterXML/jackson-bom",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -161,14 +161,20 @@
         {
             "moduleName": "com.google.code.gson:gson",
             "moduleUrl": "https://github.com/google/gson",
-            "moduleVersion": "2.11.0",
+            "moduleVersion": "2.13.1",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "com.google.errorprone:error_prone_annotations",
+            "moduleVersion": "2.11.0",
+            "moduleLicense": "Apache 2.0",
+            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "com.google.errorprone:error_prone_annotations",
             "moduleUrl": "https://errorprone.info/error_prone_annotations",
-            "moduleVersion": "2.27.0",
+            "moduleVersion": "2.38.0",
             "moduleLicense": "Apache 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -491,7 +497,7 @@
         {
             "moduleName": "com.zaxxer:HikariCP",
             "moduleUrl": "https://github.com/brettwooldridge/HikariCP",
-            "moduleVersion": "5.1.0",
+            "moduleVersion": "6.3.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -512,7 +518,7 @@
         {
             "moduleName": "commons-codec:commons-codec",
             "moduleUrl": "https://commons.apache.org/proper/commons-codec/",
-            "moduleVersion": "1.17.2",
+            "moduleVersion": "1.18.0",
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -523,6 +529,20 @@
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "commons-io:commons-io",
+            "moduleUrl": "https://commons.apache.org/proper/commons-io/",
+            "moduleVersion": "2.11.0",
+            "moduleLicense": "Apache License, Version 2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+            "moduleName": "commons-io:commons-io",
+            "moduleUrl": "https://commons.apache.org/proper/commons-io/",
+            "moduleVersion": "2.13.0",
+            "moduleLicense": "Apache-2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "commons-io:commons-io",
             "moduleUrl": "https://commons.apache.org/proper/commons-io/",
@@ -546,7 +566,7 @@
         {
             "moduleName": "io.micrometer:micrometer-commons",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.6",
+            "moduleVersion": "1.15.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -557,24 +577,31 @@
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "io.micrometer:micrometer-core",
+            "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
+            "moduleVersion": "1.15.0",
+            "moduleLicense": "The Apache Software License, Version 2.0",
+            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "io.micrometer:micrometer-jakarta9",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.6",
+            "moduleVersion": "1.15.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-observation",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.6",
+            "moduleVersion": "1.15.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "io.micrometer:micrometer-registry-prometheus",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.6",
+            "moduleVersion": "1.15.0",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -683,6 +710,13 @@
             "moduleLicense": "GPL2 w/ CPE",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "jakarta.mail:jakarta.mail-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "2.1.3",
+            "moduleLicense": "GPL2 w/ CPE",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
         {
             "moduleName": "jakarta.persistence:jakarta.persistence-api",
             "moduleUrl": "https://www.eclipse.org",
@@ -697,6 +731,13 @@
             "moduleLicense": "GPL2 w/ CPE",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "jakarta.servlet:jakarta.servlet-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "6.1.0",
+            "moduleLicense": "GPL2 w/ CPE",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
         {
             "moduleName": "jakarta.transaction:jakarta.transaction-api",
             "moduleUrl": "https://projects.eclipse.org/projects/ee4j.jta",
@@ -776,7 +817,7 @@
         },
         {
             "moduleName": "net.bytebuddy:byte-buddy",
-            "moduleVersion": "1.15.11",
+            "moduleVersion": "1.17.5",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -835,6 +876,13 @@
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "org.apache.commons:commons-text",
+            "moduleUrl": "https://commons.apache.org/proper/commons-text",
+            "moduleVersion": "1.10.0",
+            "moduleLicense": "Apache License, Version 2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "org.apache.commons:commons-text",
             "moduleUrl": "https://commons.apache.org/proper/commons-text",
@@ -919,7 +967,7 @@
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-el",
             "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.40",
+            "moduleVersion": "10.1.41",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -957,6 +1005,13 @@
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
+        {
+            "moduleName": "org.bouncycastle:bcpkix-jdk18on",
+            "moduleUrl": "https://www.bouncycastle.org/java.html",
+            "moduleVersion": "1.72",
+            "moduleLicense": "Bouncy Castle Licence",
+            "moduleLicenseUrl": "https://www.bouncycastle.org/licence.html"
+        },
         {
             "moduleName": "org.bouncycastle:bcpkix-jdk18on",
             "moduleUrl": "https://www.bouncycastle.org/download/bouncy-castle-java/",
@@ -971,6 +1026,13 @@
             "moduleLicense": "Bouncy Castle Licence",
             "moduleLicenseUrl": "https://www.bouncycastle.org/licence.html"
         },
+        {
+            "moduleName": "org.bouncycastle:bcutil-jdk18on",
+            "moduleUrl": "https://www.bouncycastle.org/java.html",
+            "moduleVersion": "1.72",
+            "moduleLicense": "Bouncy Castle Licence",
+            "moduleLicenseUrl": "https://www.bouncycastle.org/licence.html"
+        },
         {
             "moduleName": "org.bouncycastle:bcutil-jdk18on",
             "moduleUrl": "https://www.bouncycastle.org/download/bouncy-castle-java/",
@@ -1021,182 +1083,182 @@
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-annotations",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-plus",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlet",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlets",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-webapp",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-common",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-api",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-common",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-alpn-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-client",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-ee",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-http",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-io",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-plus",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-security",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-server",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-session",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-util",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
         {
             "moduleName": "org.eclipse.jetty:jetty-xml",
             "moduleUrl": "https://jetty.org/",
-            "moduleVersion": "12.0.19",
+            "moduleVersion": "12.0.21",
             "moduleLicense": "Eclipse Public License - Version 2.0",
             "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
         },
@@ -1238,7 +1300,7 @@
         {
             "moduleName": "org.hibernate.orm:hibernate-core",
             "moduleUrl": "https://www.hibernate.org/orm/6.6",
-            "moduleVersion": "6.6.13.Final",
+            "moduleVersion": "6.6.15.Final",
             "moduleLicense": "GNU Library General Public License v2.1 or later",
             "moduleLicenseUrl": "https://www.opensource.org/licenses/LGPL-2.1"
         },
@@ -1455,294 +1517,294 @@
         {
             "moduleName": "org.springframework.boot:spring-boot",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-actuator-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-autoconfigure",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-devtools",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-actuator",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jdbc",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-jetty",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-json",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-logging",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-mail",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-oauth2-client",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-security",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-thymeleaf",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-validation",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-web",
             "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-commons",
             "moduleUrl": "https://spring.io/projects/spring-data",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.data:spring-data-jpa",
             "moduleUrl": "https://projects.spring.io/spring-data-jpa",
-            "moduleVersion": "3.4.5",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-config",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-crypto",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-client",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-core",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-oauth2-jose",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-saml2-service-provider",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.security:spring-security-web",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.5",
+            "moduleVersion": "6.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework.session:spring-session-core",
             "moduleUrl": "https://spring.io/projects/spring-session",
-            "moduleVersion": "3.4.3",
+            "moduleVersion": "3.5.0",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aop",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-aspects",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-beans",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-context",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-context-support",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-core",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-expression",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jcl",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-jdbc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-orm",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-tx",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-web",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
         {
             "moduleName": "org.springframework:spring-webmvc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.6",
+            "moduleVersion": "6.2.7",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
@@ -1786,14 +1848,14 @@
         {
             "moduleName": "org.webjars:webjars-locator-lite",
             "moduleUrl": "https://webjars.org",
-            "moduleVersion": "1.0.1",
+            "moduleVersion": "1.1.0",
             "moduleLicense": "MIT",
             "moduleLicenseUrl": "https://github.com/webjars/webjars-locator-lite/blob/main/LICENSE.md"
         },
         {
             "moduleName": "org.yaml:snakeyaml",
             "moduleUrl": "https://bitbucket.org/snakeyaml/snakeyaml",
-            "moduleVersion": "2.3",
+            "moduleVersion": "2.4",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -1819,4 +1881,4 @@
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         }
     ]
-}
+}

stirling-pdf/src/main/resources/templates/account.html

@@ -79,7 +79,7 @@
                 </div>
                 <div class="data-body">
                   <div style="display: flex; gap: 0.5rem;">
-                    <input type="password" class="data-form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly style="flex: 1;">
+                    <input class="data-form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly style="flex: 1;">
                     <button class="data-btn data-btn-secondary" id="copyBtn" type="button" onclick="copyToClipboard()" title="Copy to clipboard">
                       <span class="material-symbols-rounded">content_copy</span>
                     </button>
@@ -220,9 +220,6 @@
           </form>
         </div>
       </div>
-      
-      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-    </div>
     
     <!-- JavaScript for validation -->
     <script th:inline="javascript">
@@ -324,7 +321,6 @@
       }
 
       document.addEventListener("DOMContentLoaded", async function() {
-        showApiKey();
         try {
           /*<![CDATA[*/
           const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
@@ -339,6 +335,9 @@
         } catch (error) {
           console.error('There was an error:', error);
         }
+        finally {
+          showApiKey();
+        }
       });
 
       async function refreshApiKey() {
@@ -467,360 +466,8 @@
 	    });
 	  });
 	</script>
-  <th:block th:insert="~{fragments/common :: head(title=#{account.title})}"></th:block>
-  </head>
-
-  <body>
-    <th:block th:insert="~{fragments/common :: game}"></th:block>
-    <div id="page-container">
-      <div id="content-wrap">
-        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-9 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon organize">settings_account_box</span>
-                <span class="tool-header-text" th:text="#{account.accountSettings}">User Settings</span>
-              </div>
-
-              <!-- User Settings Title -->
-              <th:block th:if="${messageType}">
-              <div class="alert alert-danger">
-                <span th:text="#{${messageType}}">Default message if not found</span>
-              </div>
-              </th:block>
-
-              <!-- At the top of the user settings -->
-              <h3 class="text-center"><span th:text="#{welcome} + ' ' + ${username}">User</span>!</h3>
-              <th:block th:if="${error}">
-              <div class="alert alert-danger" role="alert">
-                <span th:text="${error}">Error Message</span>
-              </div>
-              </th:block>
-
-              <!-- Change Username Form -->
-              <th:block th:if="not ${oAuth2Login} or not ${saml2Login}">
-              <h4 th:text="#{account.changeUsername}">Change Username?</h4>
-              <form id="formsavechangeusername" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-username'}" method="post">
-                <div class="mb-3">
-                  <label for="newUsername" th:text="#{account.newUsername}">Change Username</label>
-                  <input type="text" class="form-control" name="newUsername" id="newUsername" th:placeholder="#{account.newUsername}">
-                  <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
-                </div>
-                <div class="mb-3">
-                  <label for="currentPasswordChangeUsername" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="currentPasswordChangeUsername" id="currentPasswordChangeUsername" th:placeholder="#{password}">
-                </div>
-                <div class="mb-3">
-                  <button type="submit" class="btn btn-primary" th:text="#{account.changeUsername}">Change Username</button>
-                </div>
-              </form>
-              </th:block>
-
-              <!-- Change Password Form -->
-              <th:block th:if="not ${oAuth2Login} or not ${saml2Login}">
-              <h4 th:text="#{account.changePassword}">Change Password?</h4>
-              <form id="formsavechangepassword" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-password'}" method="post">
-                <div class="mb-3">
-                  <label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
-                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{account.oldPassword}">
-                </div>
-                <div class="mb-3">
-                  <label for="newPassword" th:text="#{account.newPassword}">New Password</label>
-                  <input type="password" class="form-control" name="newPassword" id="newPassword" th:placeholder="#{account.newPassword}">
-                </div>
-                <div class="mb-3">
-                  <label for="confirmNewPassword" th:text="#{account.confirmNewPassword}">Confirm New Password</label>
-                  <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
-                </div>
-                <div class="mb-3">
-                  <span id="confirmPasswordError" style="display: none;" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
-                  <button type="submit" class="btn btn-primary" th:text="#{account.changePassword}">Change Password</button>
-                </div>
-              </form>
-              </th:block>
-
-            <!-- API Key Form -->
-            <h4 th:text="#{account.yourApiKey}">API Key</h4>
-              <div class="card mt-4 mb-4">
-                <div class="card-header" th:text="#{account.yourApiKey}"></div>
-                <div class="card-body">
-                  <div class="input-group mb-3">
-                    <input type="password" class="form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly>
-                    <div class="input-group-append">
-                      <button class="btn btn-secondary" id="copyBtn" type="button" onclick="copyToClipboard()">
-                        <span class="material-symbols-rounded">
-                        content_copy
-                      </span>
-                      </button>
-                      <button class="btn btn-secondary" id="showBtn" type="button" onclick="showApiKey()">
-                        <span class="material-symbols-rounded" id="eyeIcon">
-                          visibility
-                        </span>
-                      </button>
-                      <button class="btn btn-secondary" id="refreshBtn" type="button" onclick="refreshApiKey()">
-                        <span class="material-symbols-rounded">
-                          refresh
-                        </span>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <script th:inline="javascript">
-                jQuery.validator.addMethod("usernamePattern", function(value, element) {
-                  // Regular expression for user name: Min. 3 characters, max. 50 characters
-                  const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
-
-                  // Regular expression for email addresses: Max. 320 characters, with RFC-like validation
-                  const regexEmail = /^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?:\.[A-Za-z]{2,})$/;
-
-                  // Check if the field is optional or meets the requirements
-                  return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
-                }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
-                $(document).ready(function() {
-                  $.validator.addMethod("passwordMatch", function(value, element) {
-                    return $('#newPassword').val() === $('#confirmNewPassword').val();
-                  }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
-                  $('#formsavechangepassword').validate({
-                    rules: {
-                      currentPassword: {
-                        required: true
-                      },
-                      newPassword: {
-                        required: true
-                      },
-                      confirmNewPassword: {
-                        required: true,
-                        passwordMatch: true
-                      },
-                      errorPlacement: function(error, element) {
-                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
-                            $("#confirmPasswordError").text(error.text()).show();
-                          } else {
-                              error.insertAfter(element);
-                          }
-                      },
-                      success: function(label, element) {
-                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
-                            $("#confirmPasswordError").hide();
-                          }
-                      }
-                    }
-                  });
-
-                  $('#formsavechangeusername').validate({
-                    rules: {
-                      newUsername: {
-                        required: true,
-                        usernamePattern: true
-                      },
-                      currentPasswordChangeUsername: {
-                        required: true
-                      }
-                      },
-                      messages: {
-                        newUsername: {
-                              usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
-                          },
-                      },
-                      errorPlacement: function(error, element) {
-                          if (element.attr("name") === "newUsername") {
-                              $("#usernameError").text(error.text()).show();
-                          } else {
-                              error.insertAfter(element);
-                          }
-                      },
-                      success: function(label, element) {
-                          if ($(element).attr("name") === "newUsername") {
-                              $("#usernameError").hide();
-                          }
-                      }
-                  });
-                });
-              </script>
-
-              <script th:inline="javascript">
-                function copyToClipboard() {
-                  const apiKeyElement = document.getElementById("apiKey");
-                  apiKeyElement.select();
-                  document.execCommand("copy");
-                }
-
-                function showApiKey() {
-                  const apiKeyElement = document.getElementById("apiKey");
-                  const copyBtn = document.getElementById("copyBtn");
-                  const eyeIcon = document.getElementById("eyeIcon");
-                  if (apiKeyElement.type === "password") {
-                    apiKeyElement.type = "text";
-                    eyeIcon.textContent = "visibility_off";
-                    copyBtn.disabled = false;  // Enable copy button when API key is visible
-                  } else {
-                    apiKeyElement.type = "password";
-                    eyeIcon.textContent = "visibility";
-                    copyBtn.disabled = true;  // Disable copy button when API key is hidden
-                  }
-                }
-
-                document.addEventListener("DOMContentLoaded", async function() {
-                  showApiKey();
-                  try {
-                    /*<![CDATA[*/
-                    const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
-                    /*]]>*/
-                    let response = await window.fetchWithCsrf(urlGetApiKey, { method: 'POST' });
-                    if (response.status === 200) {
-                      let apiKey = await response.text();
-                      manageUIState(apiKey);
-                    } else {
-                      manageUIState(null);
-                    }
-                  } catch (error) {
-                    console.error('There was an error:', error);
-                  }
-                });
-
-                async function refreshApiKey() {
-                  try {
-                    /*<![CDATA[*/
-                    const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
-                    /*]]>*/
-                    let response = await window.fetchWithCsrf(urlUpdateApiKey, { method: 'POST' });
-                    if (response.status === 200) {
-                      let apiKey = await response.text();
-                      manageUIState(apiKey);
-                      document.getElementById("apiKey").type = 'text';
-                      document.getElementById("copyBtn").disabled = false;
-                    } else {
-                      alert('Error refreshing API key.');
-                    }
-                  } catch (error) {
-                    console.error('There was an error:', error);
-                  }
-                }
-
-                function manageUIState(apiKey) {
-                  const apiKeyElement = document.getElementById("apiKey");
-                  const showBtn = document.getElementById("showBtn");
-                  const copyBtn = document.getElementById("copyBtn");
-
-                  if (apiKey && apiKey.trim().length > 0) {
-                    apiKeyElement.value = apiKey;
-                    showBtn.disabled = false;
-                    copyBtn.disabled = false;
-                  } else {
-                    apiKeyElement.value = "";
-                    showBtn.disabled = true;
-                    copyBtn.disabled = true;
-                  }
-                }
-              </script>
-
-              <h4 th:text="#{account.syncTitle}">Sync browser settings with Account</h4>
-              <div class="bg-card container mt-4">
-                <h3 th:text="#{account.settingsCompare}">Settings Comparison:</h3>
-                <table id="settingsTable" class="table table-bordered table-sm table-striped">
-                  <thead>
-                    <tr>
-                      <th scope="col" th:text="#{account.property}">Property</th>
-                      <th scope="col" th:text="#{account.accountSettings}">Account Setting</th>
-                      <th scope="col" th:text="#{account.webBrowserSettings}">Web Browser Setting</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <!-- This will be dynamically populated by JavaScript -->
-                  </tbody>
-                </table>
-
-                <div class="buttons-container mt-3 text-center">
-                  <button id="syncToBrowser" class="btn btn-primary btn-sm" th:text="#{account.syncToBrowser}">Sync Account -> Browser</button>
-                  <button id="syncToAccount" class="btn btn-secondary btn-sm" th:text="#{account.syncToAccount}">Sync Account <- Browser</button>
-                </div>
-              </div>
-
-              <script th:inline="javascript">
-                document.addEventListener("DOMContentLoaded", async function() {
-                  const settingsTableBody = document.querySelector("#settingsTable tbody");
-
-                  /*<![CDATA[*/
-                  var accountSettingsString = /*[[${settings}]]*/ {};
-                  /*]]>*/
-                  var accountSettings = JSON.parse(accountSettingsString);
-
-                  let allKeys = new Set([...Object.keys(accountSettings), ...Object.keys(localStorage)]);
-
-                  allKeys.forEach(key => {
-                    if(key === 'debug' || key === '0' || key === '1' || key.includes('pdfjs') || key.includes('posthog') || key.includes('pageViews')) return;  // Ignoring specific keys
-
-                    const accountValue = accountSettings[key] || '-';
-                    const browserValue = localStorage.getItem(key) || '-';
-
-                    const row = settingsTableBody.insertRow();
-                    const propertyCell = row.insertCell(0);
-                    const accountCell = row.insertCell(1);
-                    const browserCell = row.insertCell(2);
-
-                    propertyCell.textContent = key;
-                    accountCell.textContent = accountValue;
-                    browserCell.textContent = browserValue;
-                  });
-
-                  document.getElementById('syncToBrowser').addEventListener('click', function() {
-                    // First, clear the local storage
-                    localStorage.clear();
-
-                    // Then, set the account settings to local storage
-                    for (let key in accountSettings) {
-                      if(key !== 'debug' && key !== '0' && key !== '1' && !key.includes('pdfjs') && !key.includes('posthog') && !key.includes('pageViews')) { // Only sync non-ignored keys
-                        localStorage.setItem(key, accountSettings[key]);
-                      }
-                    }
-                    location.reload();  // Refresh the page after sync
-                  });
-
-                  document.getElementById('syncToAccount').addEventListener('click', async  function() {
-                    /*<![CDATA[*/
-                    const urlUpdateUserSettings = /*[[@{/api/v1/user/updateUserSettings}]]*/ "/api/v1/user/updateUserSettings";
-                    /*]]>*/
-
-                    let settings = {};
-                    for (let i = 0; i < localStorage.length; i++) {
-                      const key = localStorage.key(i);
-                      if(key !== 'debug' && key !== '0' && key !== '1' && !key.includes('pdfjs') && !key.includes('posthog') && !key.includes('pageViews')) {
-                        settings[key] = localStorage.getItem(key);
-                      }
-                    }
-
-                    try {
-                      const response = await window.fetchWithCsrf(urlUpdateUserSettings, {
-                        method: 'POST',
-                        headers: {
-                          'Content-Type': 'application/json',
-                        },
-                        body: JSON.stringify(settings)
-                      });
-
-                      if (response.ok) {
-                        location.reload();
-                      } else {
-                        alert('Error syncing settings to account');
-                      }
-                    } catch (error) {
-                      console.error('Error:', error);
-                      alert('Error syncing settings to account');
-                    }
-                  });
-                });
-              </script>
-              <div class="mb-3 mt-4 text-center">
-                <a th:href="@{'/logout'}" role="button" class="btn btn-danger" th:text="#{account.signOut}">Sign Out</a>
-                <a th:if="${role == 'ROLE_ADMIN'}" class="btn btn-info" th:href="@{'/adminSettings'}" role="button" th:text="#{account.adminSettings}" target="_blank">Admin Settings</a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
+              
+      
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>

stirling-pdf/src/main/resources/templates/adminSettings.html

@@ -245,7 +245,7 @@
       </div>
 
       <!-- Add User Modal -->
-      <div class="modal fade" id="addUserModal" tabindex="-1" aria-labelledby="addUserModalLabel" aria-hidden="true">
+      <div class="modal fade" id="addUserModal" tabindex="-1" style="z-index: 10000;" aria-labelledby="addUserModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered">
           <form id="formsaveuser" th:action="@{'/api/v1/user/admin/saveUser'}" method="post" class="modal-content data-modal">
             <div class="data-modal-header">
@@ -457,320 +457,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
-  <th:block th:insert="~{fragments/common :: head(title=#{adminUserSettings.title}, header=#{adminUserSettings.header})}"></th:block>
-    <style>
-      .active-user {
-        color: green;
-        text-shadow: 0 0 5px green;
-      }
-
-      .text-overflow {
-        max-width: 100px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow:ellipsis;
-      }
-    </style>
-  </head>
-
-  <body>
-    <th:block th:insert="~{fragments/common :: game}"></th:block>
-    <div id="page-container">
-      <div id="content-wrap">
-        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-9 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon organize">manage_accounts</span>
-                <span class="tool-header-text" th:text="#{adminUserSettings.header}">Admin User Control Settings</span>
-              </div>
-
-              <!-- User Settings Title -->
-			<div style="background: var(--md-sys-color-outline-variant);padding: .8rem; margin: 10px 0; border-radius: 2rem; text-align: center;">
-			    <a href="#" 
-			       th:data-bs-toggle="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : 'modal'"
-			       th:data-bs-target="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : '#addUserModal'"
-			       th:class="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? 'btn btn-danger' : 'btn btn-outline-success'"
-			       th:title="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? #{adminUserSettings.maxUsersReached} : #{adminUserSettings.addUser}">
-			        <span class="material-symbols-rounded">person_add</span>
-			        <span th:text="#{adminUserSettings.addUser}">Add New User</span>
-			    </a>
-			    
-			    <a href="#" 
-			       data-bs-toggle="modal" 
-			       data-bs-target="#changeUserRoleModal" 
-			       class="btn btn-outline-success" 
-			       th:title="#{adminUserSettings.changeUserRole}">
-			        <span class="material-symbols-rounded">edit</span>
-			        <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
-			    </a>
-			    
-			    <a th:href="@{'/usage'}" th:if="${@runningEE}"
-				   class="btn btn-outline-success" 
-				   th:title="#{adminUserSettings.usage}">
-				    <span class="material-symbols-rounded">analytics</span>
-				    <span th:text="#{adminUserSettings.usage}">Usage Statistics</span>
-				</a>
-
-			    <div class="my-4">
-			        <strong style="margin-left: 20px;" th:text="#{adminUserSettings.totalUsers}">Total Users:</strong> 
-			        <span th:text="${totalUsers}"></span> 
-			        <span th:if="${@runningProOrHigher}" th:text="'/'+${maxPaidUsers}"></span>
-			        
-			        <strong style="margin-left: 20px;" th:text="#{adminUserSettings.activeUsers}">Active Users:</strong> 
-			        <span th:text="${activeUsers}"></span>
-			        
-			        <strong style="margin-left: 20px;" th:text="#{adminUserSettings.disabledUsers}">Disabled Users:</strong> 
-			        <span th:text="${disabledUsers}"></span>
-			    </div>
-			</div>
-
-
-              <div th:if="${addMessage}" class="p-3" style="background: var(--md-sys-color-outline-variant);border-radius: 2rem; text-align: center;">
-                <div class="alert alert-danger mb-auto">
-                  <span th:text="#{${addMessage}}">Default message if not found</span>
-                </div>
-              </div>
-              <div th:if="${changeMessage}" class="p-3" style="background: var(--md-sys-color-outline-variant);border-radius: 2rem; text-align: center;">
-                <div class="alert alert-danger mb-auto">
-                  <span th:text="#{${changeMessage}}">Default message if not found</span>
-                </div>
-              </div>
-              <div th:if="${deleteMessage}" class="alert alert-danger">
-                <span th:text="#{${deleteMessage}}">Default message if not found</span>
-              </div>
-              <div class="bg-card mt-3 mb-3 table-responsive">
-                <table class="table table-striped table-hover">
-                  <thead>
-                    <tr>
-                      <th scope="col">#</th>
-                      <th scope="col" th:title="#{username}" th:text="#{username}">Username</th>
-                      <th scope="col" th:title="#{adminUserSettings.roles}" th:text="#{adminUserSettings.roles}">Roles</th>
-                      <th scope="col" th:title="#{adminUserSettings.authenticated}" class="text-overflow" th:text="#{adminUserSettings.authenticated}">Authenticated</th>
-                      <th scope="col" th:title="#{adminUserSettings.lastRequest}" class="text-overflow" th:text="#{adminUserSettings.lastRequest}">Last Request</th>
-                      <th scope="col" th:title="#{adminUserSettings.actions}" th:text="#{adminUserSettings.actions}" colspan="2">Actions</th>
-                      <!-- <th scope="col"></th> -->
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr th:each="user : ${users}">
-                      <th scope="row" style="align-content: center;" th:text="${user.id}"></th>
-                      <td style="align-content: center;" th:text="${user.username}" th:classappend="${userSessions[user.username] ? 'active-user' : ''}"></td>
-                      <td style="align-content: center;" th:text="#{${user.roleName}}"></td>
-                      <td style="align-content: center;" th:text="${user.authenticationType}"></td>
-                      <td style="align-content: center;" th:text="${userLastRequest[user.username] != null ? #dates.format(userLastRequest[user.username], 'yyyy-MM-dd HH:mm:ss') : 'N/A'}"></td>
-                      <td style="align-content: center;">
-                        <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post" onsubmit="return confirmDeleteUser()">
-                          <button type="submit" th:title="#{adminUserSettings.deleteUser}" class="btn btn-info btn-sm"><span class="material-symbols-rounded">person_remove</span></button>
-                        </form>
-                        <a th:if="${user.username == currentUsername}" th:title="#{adminUserSettings.editOwnProfil}" th:href="@{'/account'}" class="btn btn-outline-success btn-sm"><span class="material-symbols-rounded">edit</span></a>
-                      </td>
-                      <td style="align-content: center;">
-                        <form th:action="@{'/api/v1/user/admin/changeUserEnabled/' + ${user.username}}" method="post" onsubmit="return confirmChangeUserStatus()">
-                          <input type="hidden" name="enabled" th:value="!${user.enabled}" />
-                          <button type="submit" th:if="${user.enabled}" th:title="#{adminUserSettings.enabledUser}" class="btn btn-success btn-sm">
-                            <span class="material-symbols-rounded">person</span>
-                          </button>
-                          <button type="submit" th:unless="${user.enabled}" th:title="#{adminUserSettings.disabledUser}" class="btn btn-danger btn-sm">
-                            <span class="material-symbols-rounded">person_off</span>
-                          </button>
-                        </form>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <p th:if="${!@runningProOrHigher}" th:text="#{enterpriseEdition.ssoAdvert}"></p>
-
-              <script th:inline="javascript">
-                const delete_confirm_text = /*[[#{adminUserSettings.confirmDeleteUser}]]*/ 'Should the user be deleted?';
-                const change_confirm_text = /*[[#{adminUserSettings.confirmChangeUserStatus}]]*/ 'Should the user be disabled/enabled?';
-                function confirmDeleteUser() {
-                  return confirm(delete_confirm_text);
-                }
-                function confirmChangeUserStatus() {
-                  return confirm(change_confirm_text);
-                }
-              </script>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- change User role Modal start -->
-      <div class="modal fade" id="changeUserRoleModal" tabindex="-1" aria-labelledby="changeUserRoleModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h2 th:text="#{adminUserSettings.changeUserRole}">Change User's Role</h2>
-              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
-                <span class="material-symbols-rounded">close</span>
-              </button>
-            </div>
-            <div class="modal-body">
-              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{downgradeCurrentUserLongMessage}" th:text="#{help}">Help</button>
-              <form th:action="@{'/api/v1/user/admin/changeRole'}" method="post">
-                <div class="mb-3">
-                  <label for="username" th:text="#{username}">Username</label>
-                  <select name="username" class="form-control" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="user : ${users}" th:if="${user.username != currentUsername}" th:value="${user.username}" th:text="${user.username}">Username</option>
-                  </select>
-                </div>
-                <div class="mb-3">
-                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
-                  <select name="role" class="form-control" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
-                  </select>
-                </div>
-
-                <!-- Add other fields as required -->
-                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
-              </form>
-            </div>
-            <div class="modal-footer"></div>
-          </div>
-        </div>
-      </div>
-      <!-- change User role Modal end -->
-
-      <!-- Add User Modal start -->
-      <div class="modal fade" id="addUserModal" tabindex="-1" aria-labelledby="addUserModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title" id="addUserModalLabel" th:text="#{adminUserSettings.addUser}">Add New User</h5>
-              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
-                <span class="material-symbols-rounded">close</span>
-              </button>
-            </div>
-            <div class="modal-body">
-              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{adminUserSettings.usernameInfo}" th:text="#{help}">Help</button>
-              <form id="formsaveuser" th:action="@{'/api/v1/user/admin/saveUser'}" method="post">
-                <div class="mb-3">
-                  <label for="username" th:text="#{username}">Username</label>
-                  <input type="text" class="form-control" name="username" id="username" th:title="#{adminUserSettings.usernameInfo}" required>
-                  <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
-                </div>
-                <div class="mb-3" id="passwordContainer">
-                  <label for="password" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="password" id="password" required>
-                </div>
-                <div class="mb-3">
-                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
-                  <select name="role" class="form-control" id="role" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
-                  </select>
-                </div>
-                <div class="mb-3">
-                  <label for="authType">Authentication Type</label>
-                  <select id="authType" name="authType" class="form-control" required>
-                    <option value="web" selected>WEB</option>
-                    <option value="sso">SSO</option>
-                  </select>
-                </div>
-                <div class="form-check mb-3" id="checkboxContainer">
-                  <input type="checkbox" class="form-check-input" id="forceChange" name="forceChange">
-                  <label class="form-check-label" for="forceChange" th:text="#{adminUserSettings.forceChange}">Force user to change username/password on login</label>
-                </div>
-                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
-              </form>
-            </div>
-            <div class="modal-footer"></div>
-          </div>
-        </div>
-      </div>
-      <!-- Add User Modal end -->
-
-      <script th:inline="javascript">
-        jQuery.validator.addMethod("usernamePattern", function(value, element) {
-          // Regular expression for user name: Min. 3 characters, max. 50 characters
-          const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
-
-          // Regular expression for email addresses: Max. 320 characters, with RFC-like validation
-          const regexEmail = /^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?:\.[A-Za-z]{2,})$/;
-
-          // Check if the field is optional or meets the requirements
-          return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
-        }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
-        $(document).ready(function() {
-          $('[data-toggle="tooltip"]').tooltip();
-
-          $('#formsaveuser').validate({
-            rules: {
-              username: {
-                required: true,
-                usernamePattern: true
-              },
-              password: {
-                required: true
-              },
-              role: {
-                required: true
-              },
-              authType: {
-                required: true
-              }
-            },
-            messages: {
-                username: {
-                    usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
-                },
-            },
-            errorPlacement: function(error, element) {
-              if (element.attr("name") === "username") {
-                $("#usernameError").text(error.text()).show();
-              } else if (element.attr("name") !== "role" && element.attr("name") !== "authType") {
-                error.insertAfter(element);
-              }
-            },
-            success: function(label, element) {
-              if ($(element).attr("name") === "username") {
-                $("#usernameError").hide();
-              }
-            }
-          });
-
-          $('#username').on('input', function() {
-              var usernameInput = $(this);
-              var isValid = usernameInput[0].checkValidity();
-              var errorSpan = $('#usernameError');
-
-              if (isValid) {
-                  usernameInput.removeClass('invalid').addClass('valid');
-                  errorSpan.hide();
-              } else {
-                  usernameInput.removeClass('valid').addClass('invalid');
-                  errorSpan.show();
-              }
-          });
-
-          $('#authType').on('change', function() {
-              var authType = $(this).val();
-              var passwordField = $('#password');
-              var passwordFieldContainer = $('#passwordContainer');
-              var checkboxContainer = $('#checkboxContainer');
-
-              if (authType === 'sso') {
-                  passwordField.removeAttr('required');
-                  passwordField.prop('disabled', true).val('');
-                  passwordFieldContainer.slideUp('fast');
-                  checkboxContainer.slideUp('fast');
-              } else {
-                  passwordField.prop('disabled', false);
-                  passwordField.attr('required', 'required');
-                  passwordFieldContainer.slideDown('fast');
-                  checkboxContainer.slideDown('fast');
-              }
-          });
-        });
-      </script>
-      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-    </div>
-  </body>
-</html>
+</html>

stirling-pdf/src/main/resources/templates/convert/pdf-to-text.html

@@ -22,13 +22,13 @@
                 <div class="mb-3">
                   <label th:text="#{PDFToText.selectText.1}"></label>
                   <select class="form-control" name="outputFormat">
-                    <option th:if="${@endpointConfigurationService.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
+                    <option th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
                     <option value="txt">TXT</option>
                   </select>
                 </div>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToText.submit}"></button>
               </form>
-              <p th:if="${@endpointConfigurationService.isEndpointEnabled('pdf-to-rtf')}" class="mt-3" th:text="#{PDFToText.credit}"></p>
+              <p th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" class="mt-3" th:text="#{PDFToText.credit}"></p>
                     <option th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
                     <option value="txt">TXT</option>
                   </select>

stirling-pdf/src/main/resources/templates/fragments/navElements.html

@@ -267,7 +267,6 @@
       <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('show-javascript', 'javascript', 'home.showJS.title', 'home.showJS.desc', 'showJS.tags', 'advance')}">
       </div>
-      <div th:replace="~{fragments/navbarEntry :: navbarEntry('fake-scan', 'scanner', 'fakeScan.title', 'fakeScan.description', 'fakeScan.tags', 'advance')}"></div>
       <div
         th:replace="~{fragments/navbarEntryCustom :: navbarEntry('split-by-size-or-count', '/images/split-size.svg#icon-split-size', 'home.autoSizeSplitPDF.title', 'home.autoSizeSplitPDF.desc', 'autoSizeSplitPDF.tags', 'advance')}">
       </div>

stirling-pdf/src/main/resources/templates/fragments/navbarEntry.html

@@ -1,5 +1,5 @@
 <th:block th:fragment="navbarEntry(endpoint, toolIcon, titleKey, descKey, tagKey, toolGroup)"
-th:if="${@endpointConfigurationService.isEndpointEnabled(endpoint)}">
+th:if="${@endpointConfiguration.isEndpointEnabled(endpoint)}">
   <a th:id="@{${endpoint}}" class="dropdown-item" style="position:relative" th:href="@{${endpoint}}"
     th:data-bs-link="@{${endpoint}}"
     th:classappend="${endpoint.equals(currentPage)} ?  ${toolGroup} + ' active' : '' + ${toolGroup}"