* fix

* remove donate

* Footer to have link to website

---------

Co-authored-by: a <a>

.github/pull_request_template.md

@@ -4,9 +4,10 @@ Please provide a summary of the changes, including relevant motivation and conte
 
 Closes #(issue_number)
 
-## Checklist:
+## Checklist
 
 - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] My changes generate no new warnings
+- [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)

HowToAddNewLanguage.md

@@ -1,7 +1,6 @@
 <p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" ><br><h1 align="center">Stirling-PDF</h1>
 </p>
 
-
 # How to add new languages to Stirling-PDF
 
 Fork Stirling-PDF and make a new branch out of Main
@@ -14,13 +13,14 @@ https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/stat
 Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/)
 If your language isn't represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia
 
-
 For example to add Polish you would add
+
 ```html
 <a class="dropdown-item lang_dropdown-item" href="" data-language-code="pl_PL">
     <img src="images/flags/pl.svg" alt="icon" width="20" height="15"> Polski
 </a>
 ```
+
 The data-language-code is the code used to reference the file in the next step.
 
 Start by copying the existing english property file
@@ -29,7 +29,6 @@ Start by copying the existing english property file
 
 Copy and rename it to messages_{your data-language-code here}.properties, in the polish example you would set the name to messages_pl_PL.properties
 
-
 Then simply translate all property entries within that file and make a PR into main for others to use!
 
 If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but won't be able to verify the translations themselves)
@@ -48,4 +47,10 @@ ignore = [
 ]
 ```
 
+## Add New Translation Tags
+
+- **Important**: If you add any new translation tags, they must first be added to the `messages_en_GB.properties` file. This ensures consistency across all language files.
+- New translation tags **must be added** to the `messages_en_GB.properties` file to maintain a reference for other languages.
+- After adding the new tags to `messages_en_GB.properties`, add and translate them in the respective language file (e.g., `messages_pl_PL.properties`).
+
 Make sure to place the entry under the correct language section. This helps maintain the accuracy of translation progress statistics and ensures that the translation tool or scripts do not misinterpret the completion rate.

README.md

@@ -170,42 +170,42 @@ Stirling PDF currently supports 38!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                    | ![44%](https://geps.dev/progress/44)   |
+| Arabic (العربية) (ar_AR)                    | ![100%](https://geps.dev/progress/100)   |
 | Basque (Euskara) (eu_ES)                    | ![60%](https://geps.dev/progress/60)   |
 | Bulgarian (Български) (bg_BG)               | ![92%](https://geps.dev/progress/92)   |
 | Catalan (Català) (ca_CA)                    | ![47%](https://geps.dev/progress/47)   |
 | Croatian (Hrvatski) (hr_HR)                 | ![92%](https://geps.dev/progress/92)   |
 | Czech (Česky) (cs_CZ)                       | ![88%](https://geps.dev/progress/88)   |
-| Danish (Dansk) (da_DK)                      | ![9%](https://geps.dev/progress/9)   |
-| Dutch (Nederlands) (nl_NL)                  | ![94%](https://geps.dev/progress/94)   |
+| Danish (Dansk) (da_DK)                      | ![97%](https://geps.dev/progress/97)   |
+| Dutch (Nederlands) (nl_NL)                  | ![93%](https://geps.dev/progress/93)   |
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
 | French (Français) (fr_FR)                   | ![91%](https://geps.dev/progress/91)   |
 | German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99) |
 | Greek (Ελληνικά) (el_GR)                    | ![80%](https://geps.dev/progress/80)   |
-| Hindi (हिंदी) (hi_IN)                          | ![75%](https://geps.dev/progress/75)   |
-| Hungarian (Magyar) (hu_HU)                  | ![74%](https://geps.dev/progress/74)   |
+| Hindi (हिंदी) (hi_IN)                          | ![76%](https://geps.dev/progress/76)   |
+| Hungarian (Magyar) (hu_HU)                  | ![73%](https://geps.dev/progress/73)   |
 | Indonesia (Bahasa Indonesia) (id_ID)        | ![74%](https://geps.dev/progress/74)   |
 | Irish (Gaeilge) (ga_IE)                     | ![96%](https://geps.dev/progress/96)   |
 | Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
 | Japanese (日本語) (ja_JP)                   | ![90%](https://geps.dev/progress/90)   |
 | Korean (한국어) (ko_KR)                     | ![82%](https://geps.dev/progress/82)   |
-| Norwegian (Norsk) (no_NB)                   | ![96%](https://geps.dev/progress/96)   |
+| Norwegian (Norsk) (no_NB)                   | ![95%](https://geps.dev/progress/95)   |
 | Polish (Polski) (pl_PL)                     | ![90%](https://geps.dev/progress/90)   |
 | Portuguese (Português) (pt_PT)              | ![76%](https://geps.dev/progress/76)   |
 | Portuguese Brazilian (Português) (pt_BR)    | ![99%](https://geps.dev/progress/99)   |
-| Romanian (Română) (ro_RO)                   | ![38%](https://geps.dev/progress/38)   |
+| Romanian (Română) (ro_RO)                   | ![98%](https://geps.dev/progress/98)   |
 | Russian (Русский) (ru_RU)                   | ![82%](https://geps.dev/progress/82)   |
 | Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![76%](https://geps.dev/progress/76)   |
 | Simplified Chinese (简体中文) (zh_CN)       | ![96%](https://geps.dev/progress/96)   |
 | Slovakian (Slovensky) (sk_SK)               | ![90%](https://geps.dev/progress/90)   |
 | Spanish (Español) (es_ES)                   | ![99%](https://geps.dev/progress/99)   |
-| Swedish (Svenska) (sv_SE)                   | ![38%](https://geps.dev/progress/38)   |
+| Swedish (Svenska) (sv_SE)                   | ![98%](https://geps.dev/progress/98)   |
 | Thai (ไทย) (th_TH)                          | ![97%](https://geps.dev/progress/97) |
 | Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
-| Turkish (Türkçe) (tr_TR)                    | ![97%](https://geps.dev/progress/97)   |
+| Turkish (Türkçe) (tr_TR)                    | ![96%](https://geps.dev/progress/96)   |
 | Ukrainian (Українська) (uk_UA)              | ![87%](https://geps.dev/progress/87)   |
-| Vietnamese (Tiếng Việt) (vi_VN)             | ![97%](https://geps.dev/progress/97)   |
+| Vietnamese (Tiếng Việt) (vi_VN)             | ![96%](https://geps.dev/progress/96)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 

build.gradle

@@ -32,12 +32,6 @@ java {
 repositories {
     mavenCentral()
     maven { url "https://jitpack.io" }
-    maven {
-        url "https://build.shibboleth.net/nexus/content/repositories/releases/"
-    }
-    maven {
-        url "https://build.shibboleth.net/maven/releases/"
-    }
 }
 
 licenseReport {
@@ -120,10 +114,6 @@ configurations.all {
     exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
 }
 dependencies {
-
-
-
-
     //security updates
     implementation "org.springframework:spring-webmvc:6.1.9"
 
@@ -138,7 +128,7 @@ dependencies {
 
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
 
-if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
+    if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
         runtimeOnly "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE"
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
@@ -147,8 +137,7 @@ if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
         //2.2.x requires rebuild of DB file.. need migration path
         runtimeOnly "com.h2database:h2:2.1.214"
         // implementation "com.h2database:h2:2.2.224"
-    implementation 'org.springframework.security:spring-security-saml2-service-provider:6.3.3'
-      }
+    }
 
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 

src/main/java/stirling/software/SPDF/SPdfApplication.java

@@ -31,6 +31,7 @@ public class SPdfApplication {
 
     @Autowired private Environment env;
 
+
     @Autowired ApplicationProperties applicationProperties;
 
     private static String serverPortStatic;

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationSuccessHandler.java

@@ -45,7 +45,15 @@ public class CustomAuthenticationSuccessHandler
                         ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
                         : null;
 
-        if (savedRequest != null
+        // Check for the stored previous page URL
+        String previousPageUrl = (session != null) ? (String) session.getAttribute("PREVIOUS_PAGE_URL") : null;
+
+        if (previousPageUrl != null) {
+            // Redirect to the stored previous page URL
+            getRedirectStrategy().sendRedirect(request, response, previousPageUrl);
+            // Remove the stored previous page URL from the session
+            session.removeAttribute("PREVIOUS_PAGE_URL");
+        } else if (savedRequest != null
                 && !RequestUriUtils.isStaticResource(
                         request.getContextPath(), savedRequest.getRedirectUrl())) {
             // Redirect to the original destination

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -6,20 +6,24 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+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.security.authentication.ProviderManager;
-import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.ClientRegistrations;
+import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
+import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
@@ -30,11 +34,14 @@ import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationF
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2LogoutSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2UserService;
-import stirling.software.SPDF.config.security.saml.CustomSAMLAuthenticationFailureHandler;
-import stirling.software.SPDF.config.security.saml.CustomSAMLAuthenticationSuccessHandler;
-import stirling.software.SPDF.config.security.saml.SAMLLogoutSuccessHandler;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.model.provider.GithubProvider;
+import stirling.software.SPDF.model.provider.GoogleProvider;
+import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
 @Configuration
@@ -44,15 +51,6 @@ public class SecurityConfiguration {
 
     @Autowired private CustomUserDetailsService userDetailsService;
 
-    @Autowired(required = false)
-    private GrantedAuthoritiesMapper userAuthoritiesMapper;
-
-    @Autowired(required = false)
-    private OpenSaml4AuthenticationProvider samlAuthenticationProvider;
-
-    @Autowired(required = false)
-    private RelyingPartyRegistrationRepository relyingPartyRegistrationRepository;
-
     private static final Logger logger = LoggerFactory.getLogger(SecurityConfiguration.class);
 
     @Bean
@@ -137,7 +135,6 @@ public class SecurityConfiguration {
 
                                                         return trimmedUri.startsWith("/login")
                                                                 || trimmedUri.startsWith("/oauth")
-                                                                || trimmedUri.startsWith("/saml2")
                                                                 || trimmedUri.endsWith(".svg")
                                                                 || trimmedUri.startsWith(
                                                                         "/register")
@@ -187,42 +184,13 @@ public class SecurityConfiguration {
                                                                                         userService,
                                                                                         loginAttemptService))
                                                                         .userAuthoritiesMapper(
-                                                                                userAuthoritiesMapper)))
+                                                                                userAuthoritiesMapper())))
                         .logout(
                                 logout ->
                                         logout.logoutSuccessHandler(
                                                 new CustomOAuth2LogoutSuccessHandler(
                                                         applicationProperties)));
             }
-
-            // Handle SAML Logins
-            if (applicationProperties.getSecurity().getSAML() != null
-                    && applicationProperties.getSecurity().getSAML().getEnabled()
-                    && !applicationProperties
-                            .getSecurity()
-                            .getLoginMethod()
-                            .equalsIgnoreCase("normal")) {
-
-                http.saml2Login(
-                                saml2 ->
-                                        saml2.relyingPartyRegistrationRepository(
-                                                        relyingPartyRegistrationRepository)
-                                                .loginProcessingUrl("/login/saml2/sso/stirling")
-                                                .loginPage("/saml2")
-                                                .authenticationManager(
-                                                        new ProviderManager(
-                                                                samlAuthenticationProvider))
-                                                .successHandler(
-                                                        new CustomSAMLAuthenticationSuccessHandler(
-                                                                loginAttemptService, userService))
-                                                .failureHandler(
-                                                        new CustomSAMLAuthenticationFailureHandler()))
-                        .saml2Metadata(Customizer.withDefaults())
-                        .logout(
-                                logout ->
-                                        logout.logoutSuccessHandler(
-                                                new SAMLLogoutSuccessHandler()));
-            }
         } else {
             http.csrf(csrf -> csrf.disable())
                     .authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
@@ -231,6 +199,178 @@ public class SecurityConfiguration {
         return http.build();
     }
 
+    // Client Registration Repository for OAUTH2 OIDC Login
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.oauth2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    public ClientRegistrationRepository clientRegistrationRepository() {
+        List<ClientRegistration> registrations = new ArrayList<>();
+
+        githubClientRegistration().ifPresent(registrations::add);
+        oidcClientRegistration().ifPresent(registrations::add);
+        googleClientRegistration().ifPresent(registrations::add);
+        keycloakClientRegistration().ifPresent(registrations::add);
+
+        if (registrations.isEmpty()) {
+            logger.error("At least one OAuth2 provider must be configured");
+            System.exit(1);
+        }
+
+        return new InMemoryClientRegistrationRepository(registrations);
+    }
+
+    private Optional<ClientRegistration> googleClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        GoogleProvider google = client.getGoogle();
+        return google != null && google.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistration.withRegistrationId(google.getName())
+                                .clientId(google.getClientId())
+                                .clientSecret(google.getClientSecret())
+                                .scope(google.getScopes())
+                                .authorizationUri(google.getAuthorizationuri())
+                                .tokenUri(google.getTokenuri())
+                                .userInfoUri(google.getUserinfouri())
+                                .userNameAttributeName(google.getUseAsUsername())
+                                .clientName(google.getClientName())
+                                .redirectUri("{baseUrl}/login/oauth2/code/" + google.getName())
+                                .authorizationGrantType(
+                                        org.springframework.security.oauth2.core
+                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> keycloakClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        KeycloakProvider keycloak = client.getKeycloak();
+
+        return keycloak != null && keycloak.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistrations.fromIssuerLocation(keycloak.getIssuer())
+                                .registrationId(keycloak.getName())
+                                .clientId(keycloak.getClientId())
+                                .clientSecret(keycloak.getClientSecret())
+                                .scope(keycloak.getScopes())
+                                .userNameAttributeName(keycloak.getUseAsUsername())
+                                .clientName(keycloak.getClientName())
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> githubClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        GithubProvider github = client.getGithub();
+        return github != null && github.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistration.withRegistrationId(github.getName())
+                                .clientId(github.getClientId())
+                                .clientSecret(github.getClientSecret())
+                                .scope(github.getScopes())
+                                .authorizationUri(github.getAuthorizationuri())
+                                .tokenUri(github.getTokenuri())
+                                .userInfoUri(github.getUserinfouri())
+                                .userNameAttributeName(github.getUseAsUsername())
+                                .clientName(github.getClientName())
+                                .redirectUri("{baseUrl}/login/oauth2/code/" + github.getName())
+                                .authorizationGrantType(
+                                        org.springframework.security.oauth2.core
+                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> oidcClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null
+                || oauth.getIssuer() == null
+                || oauth.getIssuer().isEmpty()
+                || oauth.getClientId() == null
+                || oauth.getClientId().isEmpty()
+                || oauth.getClientSecret() == null
+                || oauth.getClientSecret().isEmpty()
+                || oauth.getScopes() == null
+                || oauth.getScopes().isEmpty()
+                || oauth.getUseAsUsername() == null
+                || oauth.getUseAsUsername().isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(
+                ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
+                        .registrationId("oidc")
+                        .clientId(oauth.getClientId())
+                        .clientSecret(oauth.getClientSecret())
+                        .scope(oauth.getScopes())
+                        .userNameAttributeName(oauth.getUseAsUsername())
+                        .clientName("OIDC")
+                        .build());
+    }
+
+    /*
+    This following function is to grant Authorities to the OAUTH2 user from the values stored in the database.
+    This is required for the internal; 'hasRole()' function to give out the correct role.
+     */
+    @Bean
+    @ConditionalOnProperty(
+            value = "security.oauth2.enabled",
+            havingValue = "true",
+            matchIfMissing = false)
+    GrantedAuthoritiesMapper userAuthoritiesMapper() {
+        return (authorities) -> {
+            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
+
+            authorities.forEach(
+                    authority -> {
+                        // Add existing OAUTH2 Authorities
+                        mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority()));
+
+                        // Add Authorities from database for existing user, if user is present.
+                        if (authority instanceof OAuth2UserAuthority oauth2Auth) {
+                            String useAsUsername =
+                                    applicationProperties
+                                            .getSecurity()
+                                            .getOAUTH2()
+                                            .getUseAsUsername();
+                            Optional<User> userOpt =
+                                    userService.findByUsernameIgnoreCase(
+                                            (String) oauth2Auth.getAttributes().get(useAsUsername));
+                            if (userOpt.isPresent()) {
+                                User user = userOpt.get();
+                                if (user != null) {
+                                    mappedAuthorities.add(
+                                            new SimpleGrantedAuthority(
+                                                    userService.findRole(user).getAuthority()));
+                                }
+                            }
+                        }
+                    });
+            return mappedAuthorities;
+        };
+    }
+
     @Bean
     public IPRateLimitingFilter rateLimitingFilter() {
         int maxRequestsPerIp = 1000000; // Example limit TODO add config level

src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Config.java

@@ -1,211 +0,0 @@
-package stirling.software.SPDF.config.security.oauth2;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.security.oauth2.client.registration.ClientRegistrations;
-import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
-import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
-import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.provider.GithubProvider;
-import stirling.software.SPDF.model.provider.GoogleProvider;
-import stirling.software.SPDF.model.provider.KeycloakProvider;
-
-@Configuration
-@Slf4j
-public class OAuth2Config {
-    @Autowired ApplicationProperties applicationProperties;
-
-    @Autowired @Lazy private UserService userService;
-
-    // Client Registration Repository for OAUTH2 OIDC Login
-    @Bean
-    @ConditionalOnProperty(
-            value = "security.oauth2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public ClientRegistrationRepository clientRegistrationRepository() {
-        List<ClientRegistration> registrations = new ArrayList<>();
-
-        githubClientRegistration().ifPresent(registrations::add);
-        oidcClientRegistration().ifPresent(registrations::add);
-        googleClientRegistration().ifPresent(registrations::add);
-        keycloakClientRegistration().ifPresent(registrations::add);
-
-        if (registrations.isEmpty()) {
-            log.error("At least one OAuth2 provider must be configured");
-            System.exit(1);
-        }
-
-        return new InMemoryClientRegistrationRepository(registrations);
-    }
-
-    private Optional<ClientRegistration> googleClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-        if (oauth == null || !oauth.getEnabled()) {
-            return Optional.empty();
-        }
-        Client client = oauth.getClient();
-        if (client == null) {
-            return Optional.empty();
-        }
-        GoogleProvider google = client.getGoogle();
-        return google != null && google.isSettingsValid()
-                ? Optional.of(
-                        ClientRegistration.withRegistrationId(google.getName())
-                                .clientId(google.getClientId())
-                                .clientSecret(google.getClientSecret())
-                                .scope(google.getScopes())
-                                .authorizationUri(google.getAuthorizationuri())
-                                .tokenUri(google.getTokenuri())
-                                .userInfoUri(google.getUserinfouri())
-                                .userNameAttributeName(google.getUseAsUsername())
-                                .clientName(google.getClientName())
-                                .redirectUri("{baseUrl}/login/oauth2/code/" + google.getName())
-                                .authorizationGrantType(
-                                        org.springframework.security.oauth2.core
-                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
-                                .build())
-                : Optional.empty();
-    }
-
-    private Optional<ClientRegistration> keycloakClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-        if (oauth == null || !oauth.getEnabled()) {
-            return Optional.empty();
-        }
-        Client client = oauth.getClient();
-        if (client == null) {
-            return Optional.empty();
-        }
-        KeycloakProvider keycloak = client.getKeycloak();
-
-        return keycloak != null && keycloak.isSettingsValid()
-                ? Optional.of(
-                        ClientRegistrations.fromIssuerLocation(keycloak.getIssuer())
-                                .registrationId(keycloak.getName())
-                                .clientId(keycloak.getClientId())
-                                .clientSecret(keycloak.getClientSecret())
-                                .scope(keycloak.getScopes())
-                                .userNameAttributeName(keycloak.getUseAsUsername())
-                                .clientName(keycloak.getClientName())
-                                .build())
-                : Optional.empty();
-    }
-
-    private Optional<ClientRegistration> githubClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-        if (oauth == null || !oauth.getEnabled()) {
-            return Optional.empty();
-        }
-        Client client = oauth.getClient();
-        if (client == null) {
-            return Optional.empty();
-        }
-        GithubProvider github = client.getGithub();
-        return github != null && github.isSettingsValid()
-                ? Optional.of(
-                        ClientRegistration.withRegistrationId(github.getName())
-                                .clientId(github.getClientId())
-                                .clientSecret(github.getClientSecret())
-                                .scope(github.getScopes())
-                                .authorizationUri(github.getAuthorizationuri())
-                                .tokenUri(github.getTokenuri())
-                                .userInfoUri(github.getUserinfouri())
-                                .userNameAttributeName(github.getUseAsUsername())
-                                .clientName(github.getClientName())
-                                .redirectUri("{baseUrl}/login/oauth2/code/" + github.getName())
-                                .authorizationGrantType(
-                                        org.springframework.security.oauth2.core
-                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
-                                .build())
-                : Optional.empty();
-    }
-
-    private Optional<ClientRegistration> oidcClientRegistration() {
-        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-        if (oauth == null
-                || oauth.getIssuer() == null
-                || oauth.getIssuer().isEmpty()
-                || oauth.getClientId() == null
-                || oauth.getClientId().isEmpty()
-                || oauth.getClientSecret() == null
-                || oauth.getClientSecret().isEmpty()
-                || oauth.getScopes() == null
-                || oauth.getScopes().isEmpty()
-                || oauth.getUseAsUsername() == null
-                || oauth.getUseAsUsername().isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(
-                ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
-                        .registrationId("oidc")
-                        .clientId(oauth.getClientId())
-                        .clientSecret(oauth.getClientSecret())
-                        .scope(oauth.getScopes())
-                        .userNameAttributeName(oauth.getUseAsUsername())
-                        .clientName("OIDC")
-                        .build());
-    }
-
-    /*
-    This following function is to grant Authorities to the OAUTH2 user from the values stored in the database.
-    This is required for the internal; 'hasRole()' function to give out the correct role.
-     */
-    @Bean
-    @ConditionalOnProperty(
-            value = "security.oauth2.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    GrantedAuthoritiesMapper userAuthoritiesMapper() {
-        return (authorities) -> {
-            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
-
-            authorities.forEach(
-                    authority -> {
-                        // Add existing OAUTH2 Authorities
-                        mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority()));
-
-                        // Add Authorities from database for existing user, if user is present.
-                        if (authority instanceof OAuth2UserAuthority oauth2Auth) {
-                            String useAsUsername =
-                                    applicationProperties
-                                            .getSecurity()
-                                            .getOAUTH2()
-                                            .getUseAsUsername();
-                            Optional<User> userOpt =
-                                    userService.findByUsernameIgnoreCase(
-                                            (String) oauth2Auth.getAttributes().get(useAsUsername));
-                            if (userOpt.isPresent()) {
-                                User user = userOpt.get();
-                                if (user != null) {
-                                    mappedAuthorities.add(
-                                            new SimpleGrantedAuthority(
-                                                    userService.findRole(user).getAuthority()));
-                                }
-                            }
-                        }
-                    });
-            return mappedAuthorities;
-        };
-    }
-}

src/main/java/stirling/software/SPDF/config/security/saml/CustomSAMLAuthenticationFailureHandler.java

@@ -1,51 +0,0 @@
-package stirling.software.SPDF.config.security.saml;
-
-import java.io.IOException;
-
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.DisabledException;
-import org.springframework.security.authentication.LockedException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class CustomSAMLAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
-
-    @Override
-    public void onAuthenticationFailure(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            AuthenticationException exception)
-            throws IOException, ServletException {
-
-        if (exception instanceof BadCredentialsException) {
-            log.error("BadCredentialsException", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/login?error=badcredentials");
-            return;
-        }
-        if (exception instanceof DisabledException) {
-            log.error("User is deactivated: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
-        if (exception instanceof LockedException) {
-            log.error("Account locked: ", exception);
-            getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
-            return;
-        }
-        if (exception instanceof Saml2AuthenticationException) {
-            log.error("SAML2 Authentication error: ", exception);
-            getRedirectStrategy()
-                    .sendRedirect(request, response, "/logout?error=saml2AuthenticationError");
-            return;
-        }
-        log.error("Unhandled authentication exception", exception);
-        super.onAuthenticationFailure(request, response, exception);
-    }
-}

src/main/java/stirling/software/SPDF/config/security/saml/CustomSAMLAuthenticationSuccessHandler.java

@@ -1,60 +0,0 @@
-package stirling.software.SPDF.config.security.saml;
-
-import java.io.IOException;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-import org.springframework.security.web.savedrequest.SavedRequest;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.config.security.LoginAttemptService;
-import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.utils.RequestUriUtils;
-
-@Slf4j
-public class CustomSAMLAuthenticationSuccessHandler
-        extends SavedRequestAwareAuthenticationSuccessHandler {
-
-    private LoginAttemptService loginAttemptService;
-    private UserService userService;
-
-    public CustomSAMLAuthenticationSuccessHandler(
-            LoginAttemptService loginAttemptService, UserService userService) {
-        this.loginAttemptService = loginAttemptService;
-        this.userService = userService;
-    }
-
-    @Override
-    public void onAuthenticationSuccess(
-            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws ServletException, IOException {
-
-        String userName = request.getParameter("username");
-        if (userService.isUserDisabled(userName)) {
-            getRedirectStrategy().sendRedirect(request, response, "/logout?userIsDisabled=true");
-            return;
-        }
-        loginAttemptService.loginSucceeded(userName);
-
-        // Get the saved request
-        HttpSession session = request.getSession(false);
-        SavedRequest savedRequest =
-                (session != null)
-                        ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
-                        : null;
-
-        if (savedRequest != null
-                && !RequestUriUtils.isStaticResource(
-                        request.getContextPath(), savedRequest.getRedirectUrl())) {
-            // Redirect to the original destination
-            super.onAuthenticationSuccess(request, response, authentication);
-        } else {
-            // Redirect to the root URL (considering context path)
-            getRedirectStrategy().sendRedirect(request, response, "/");
-        }
-    }
-}

src/main/java/stirling/software/SPDF/config/security/saml/SAMLLogoutSuccessHandler.java

@@ -1,38 +0,0 @@
-package stirling.software.SPDF.config.security.saml;
-
-import java.io.IOException;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class SAMLLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
-
-    @Override
-    public void onLogoutSuccess(
-            HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException {
-
-        String redirectUrl = determineTargetUrl(request, response, authentication);
-
-        if (response.isCommitted()) {
-            log.debug("Response has already been committed. Unable to redirect to " + redirectUrl);
-            return;
-        }
-
-        getRedirectStrategy().sendRedirect(request, response, redirectUrl);
-    }
-
-    protected String determineTargetUrl(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            Authentication authentication) {
-        // Default to the root URL
-        return "/";
-    }
-}

src/main/java/stirling/software/SPDF/config/security/saml/SamlConfig.java

@@ -1,216 +0,0 @@
-package stirling.software.SPDF.config.security.saml;
-
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.*;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.security.saml2.core.Saml2X509Credential;
-import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
-import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
-import org.springframework.security.saml2.provider.service.metadata.OpenSamlMetadataResolver;
-import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
-import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
-import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
-import org.springframework.security.saml2.provider.service.web.Saml2MetadataFilter;
-
-import lombok.extern.slf4j.Slf4j;
-import stirling.software.SPDF.model.ApplicationProperties;
-
-@Configuration
-@Slf4j
-public class SamlConfig {
-
-    @Autowired ApplicationProperties applicationProperties;
-
-    @Bean
-    public OpenSaml4AuthenticationProvider openSaml4AuthenticationProvider() {
-        OpenSaml4AuthenticationProvider provider = new OpenSaml4AuthenticationProvider();
-        provider.setResponseAuthenticationConverter(
-                responseToken -> {
-                    Saml2AuthenticationToken token = responseToken.getToken();
-                    log.info("Received SAML response: {}", token.getSaml2Response());
-                    // Your custom conversion logic here
-                    // For now, we'll just return the token as is
-                    return token;
-                });
-        return provider;
-    }
-
-    @Bean
-    @ConditionalOnProperty(
-            value = "security.saml.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() {
-        RelyingPartyRegistration registration =
-                RelyingPartyRegistration.withRegistrationId(
-                                applicationProperties.getSecurity().getSAML().getRegistrationId())
-                        .entityId(applicationProperties.getSecurity().getSAML().getEntityId())
-                        .assertionConsumerServiceLocation(
-                                applicationProperties.getSecurity().getSAML().getSpBaseUrl()
-                                        + "/login/saml2/sso/stirling")
-                        .singleLogoutServiceLocation(
-                                applicationProperties.getSecurity().getSAML().getSpBaseUrl()
-                                        + "/logout/saml2/slo")
-                        .singleLogoutServiceResponseLocation(
-                                applicationProperties.getSecurity().getSAML().getSpBaseUrl()
-                                        + "/logout/saml2/slo")
-                        .signingX509Credentials(credentials -> credentials.add(signingCredential()))
-                        .assertingPartyDetails(
-                                party ->
-                                        party.entityId(
-                                                        applicationProperties
-                                                                .getSecurity()
-                                                                .getSAML()
-                                                                .getEntityId())
-                                                .singleSignOnServiceLocation(
-                                                        applicationProperties
-                                                                .getSecurity()
-                                                                .getSAML()
-                                                                .getIdpMetadataLocation())
-                                                .wantAuthnRequestsSigned(true)
-                                                .verificationX509Credentials(
-                                                        c -> c.add(this.realmCertificate())))
-                        .build();
-        return new InMemoryRelyingPartyRegistrationRepository(registration);
-    }
-
-    private Saml2X509Credential signingCredential() {
-        log.info("Starting to load signing credential");
-        try {
-            Resource storeResource =
-                    applicationProperties
-                            .getSecurity()
-                            .getSAML()
-                            .getKeystore()
-                            .getKeystoreResource();
-            log.info("Keystore resource: {}", storeResource.getDescription());
-
-            KeyStore keyStore = KeyStore.getInstance("JKS");
-            try (InputStream is = storeResource.getInputStream()) {
-                keyStore.load(
-                        is,
-                        applicationProperties
-                                .getSecurity()
-                                .getSAML()
-                                .getKeystore()
-                                .getKeystorePassword()
-                                .toCharArray());
-                log.info("Keystore loaded successfully");
-            }
-
-            String keyAlias =
-                    applicationProperties.getSecurity().getSAML().getKeystore().getKeyAlias();
-            log.info("Attempting to retrieve private key with alias: {}", keyAlias);
-
-            PrivateKey privateKey =
-                    (PrivateKey)
-                            keyStore.getKey(
-                                    keyAlias,
-                                    applicationProperties
-                                            .getSecurity()
-                                            .getSAML()
-                                            .getKeystore()
-                                            .getKeyPassword()
-                                            .toCharArray());
-
-            if (privateKey == null) {
-                log.error("Private key not found for alias: {}", keyAlias);
-                throw new RuntimeException("Private key not found in keystore");
-            }
-
-            log.info("Private key retrieved successfully");
-
-            X509Certificate certificate = (X509Certificate) keyStore.getCertificate(keyAlias);
-
-            if (certificate == null) {
-                log.info("Certificate not found for alias: {}", keyAlias);
-                throw new RuntimeException("Certificate not found in keystore");
-            }
-
-            log.info(
-                    "Certificate retrieved successfully. Subject: {}",
-                    certificate.getSubjectX500Principal());
-
-            log.info("Signing credential created successfully");
-            return Saml2X509Credential.signing(privateKey, certificate);
-        } catch (Exception e) {
-            log.error("Error loading signing credential", e);
-            throw new RuntimeException("Error loading signing credential", e);
-        }
-    }
-
-    private Saml2X509Credential realmCertificate() {
-        log.info("Starting to load realm certificate");
-        try {
-            Resource storeResource =
-                    applicationProperties
-                            .getSecurity()
-                            .getSAML()
-                            .getKeystore()
-                            .getKeystoreResource();
-            log.info("Keystore resource: {}", storeResource.getDescription());
-
-            KeyStore keyStore = KeyStore.getInstance("JKS");
-            try (InputStream is = storeResource.getInputStream()) {
-                keyStore.load(
-                        is,
-                        applicationProperties
-                                .getSecurity()
-                                .getSAML()
-                                .getKeystore()
-                                .getKeystorePassword()
-                                .toCharArray());
-                log.info("Keystore loaded successfully");
-            }
-
-            String realmCertificateAlias =
-                    applicationProperties
-                            .getSecurity()
-                            .getSAML()
-                            .getKeystore()
-                            .getRealmCertificateAlias();
-            log.info(
-                    "Attempting to retrieve realm certificate with alias: {}",
-                    realmCertificateAlias);
-
-            X509Certificate certificate =
-                    (X509Certificate) keyStore.getCertificate(realmCertificateAlias);
-
-            if (certificate == null) {
-                log.error("Realm certificate not found for alias: {}", realmCertificateAlias);
-                throw new RuntimeException("Realm certificate not found in keystore");
-            }
-
-            log.info(
-                    "Realm certificate retrieved successfully. Subject: {}",
-                    certificate.getSubjectX500Principal());
-
-            log.info("Realm certificate credential created successfully");
-            return Saml2X509Credential.verification(certificate);
-        } catch (Exception e) {
-            log.error("Error loading realm certificate", e);
-            throw new RuntimeException("Error loading realm certificate", e);
-        }
-    }
-
-    @Bean
-    @ConditionalOnProperty(
-            value = "security.saml.enabled",
-            havingValue = "true",
-            matchIfMissing = false)
-    public Saml2MetadataFilter metadataFilter(RelyingPartyRegistrationRepository registrations) {
-        DefaultRelyingPartyRegistrationResolver registrationResolver =
-                new DefaultRelyingPartyRegistrationResolver(registrations);
-        OpenSamlMetadataResolver metadataResolver = new OpenSamlMetadataResolver();
-        return new Saml2MetadataFilter(registrationResolver, metadataResolver);
-    }
-}

src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java

@@ -0,0 +1,299 @@
+package stirling.software.SPDF.controller.api;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import stirling.software.SPDF.model.PdfMetadata;
+import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
+public class SplitPdfByChaptersController {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(SplitPdfByChaptersController.class);
+
+    @PostMapping(value = "/split-pdf-by-chapters", consumes = "multipart/form-data")
+    @Operation(
+            summary = "Split PDFs by Chapters",
+            description = "Splits a PDF into chapters and returns a ZIP file.")
+    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfByChaptersRequest request)
+            throws Exception {
+        MultipartFile file = request.getFileInput();
+        boolean includeMetadata = request.getIncludeMetadata();
+        Integer bookmarkLevel =
+                request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
+        if (bookmarkLevel < 0) {
+            return ResponseEntity.badRequest().body("Invalid bookmark level".getBytes());
+        }
+        PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
+
+        // checks if the document is encrypted by an empty user password
+        if (sourceDocument.isEncrypted()) {
+            try {
+                sourceDocument.setAllSecurityToBeRemoved(true);
+                logger.info("Removing security from the source document ");
+            } catch (Exception e) {
+                logger.warn("Cannot decrypt the pdf");
+            }
+        }
+        PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
+
+        if (outline == null) {
+            logger.warn("No outline found for {}", file.getOriginalFilename());
+            return ResponseEntity.badRequest().body("No outline found".getBytes());
+        }
+        List<Bookmark> bookmarks = new ArrayList<>();
+        try {
+            bookmarks =
+                    extractOutlineItems(
+                            sourceDocument,
+                            outline.getFirstChild(),
+                            bookmarks,
+                            outline.getFirstChild().getNextSibling(),
+                            0,
+                            bookmarkLevel);
+            // to handle last page edge case
+            bookmarks.get(bookmarks.size() - 1).setEndPage(sourceDocument.getNumberOfPages());
+            Bookmark lastBookmark = bookmarks.get(bookmarks.size() - 1);
+
+        } catch (Exception e) {
+            logger.error("Unable to extract outline items", e);
+            return ResponseEntity.internalServerError()
+                    .body("Unable to extract outline items".getBytes());
+        }
+
+        boolean allowDuplicates = request.getAllowDuplicates();
+        if (!allowDuplicates) {
+            /*
+            duplicates are generated when multiple bookmarks correspond to the same page,
+            if the user doesn't want duplicates mergeBookmarksThatCorrespondToSamePage() method will merge the titles of all
+            the bookmarks that correspond to the same page, and treat them as a single bookmark
+            */
+            bookmarks = mergeBookmarksThatCorrespondToSamePage(bookmarks);
+        }
+        for (Bookmark bookmark : bookmarks) {
+            logger.info(
+                    "{}::::{} to {}",
+                    bookmark.getTitle(),
+                    bookmark.getStartPage(),
+                    bookmark.getEndPage());
+        }
+        List<ByteArrayOutputStream> splitDocumentsBoas =
+                getSplitDocumentsBoas(sourceDocument, bookmarks, includeMetadata);
+
+        Path zipFile = createZipFile(bookmarks, splitDocumentsBoas);
+
+        byte[] data = Files.readAllBytes(zipFile);
+        Files.deleteIfExists(zipFile);
+
+        String filename =
+                Filenames.toSimpleFileName(file.getOriginalFilename())
+                        .replaceFirst("[.][^.]+$", "");
+        sourceDocument.close();
+        return WebResponseUtils.bytesToWebResponse(
+                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    private List<Bookmark> mergeBookmarksThatCorrespondToSamePage(List<Bookmark> bookmarks) {
+        String mergedTitle = "";
+        List<Bookmark> chaptersToBeRemoved = new ArrayList<>();
+        for (Bookmark bookmark : bookmarks) {
+            if (bookmark.getStartPage() == bookmark.getEndPage()) {
+                mergedTitle = mergedTitle.concat(bookmark.getTitle().concat(" "));
+                chaptersToBeRemoved.add(bookmark);
+            } else {
+                if (!mergedTitle.isEmpty()) {
+                    if (mergedTitle.length() > 255) {
+                        mergedTitle = mergedTitle.substring(0, 253) + "...";
+                    }
+
+                    bookmarks.set(
+                            bookmarks.indexOf(bookmark),
+                            new Bookmark(
+                                    mergedTitle, bookmark.getStartPage(), bookmark.getEndPage()));
+                }
+                mergedTitle = "";
+            }
+        }
+        bookmarks.removeAll(chaptersToBeRemoved);
+        return bookmarks;
+    }
+
+    private static List<Bookmark> extractOutlineItems(
+            PDDocument sourceDocument,
+            PDOutlineItem current,
+            List<Bookmark> bookmarks,
+            PDOutlineItem nextParent,
+            int level,
+            int maxLevel)
+            throws Exception {
+
+        while (current != null) {
+
+            String currentTitle = current.getTitle().replace("/", "");
+            int firstPage =
+                    sourceDocument.getPages().indexOf(current.findDestinationPage(sourceDocument));
+            PDOutlineItem child = current.getFirstChild();
+            PDOutlineItem nextSibling = current.getNextSibling();
+            int endPage;
+            if (child != null && level < maxLevel) {
+                endPage =
+                        sourceDocument
+                                .getPages()
+                                .indexOf(child.findDestinationPage(sourceDocument));
+            } else if (nextSibling != null) {
+                endPage =
+                        sourceDocument
+                                .getPages()
+                                .indexOf(nextSibling.findDestinationPage(sourceDocument));
+            } else if (nextParent != null) {
+
+                endPage =
+                        sourceDocument
+                                .getPages()
+                                .indexOf(nextParent.findDestinationPage(sourceDocument));
+            } else {
+                endPage = -2;
+                /*
+                happens when we have something like this:
+                Outline Item 2
+                    Outline Item 2.1
+                        Outline Item 2.1.1
+                    Outline Item 2.2
+                        Outline 2.2.1
+                        Outline 2.2.2 <--- this item neither has an immediate next parent nor an immediate next sibling
+                Outline Item 3
+                 */
+            }
+            if (!bookmarks.isEmpty()
+                    && bookmarks.get(bookmarks.size() - 1).getEndPage() == -2
+                    && firstPage
+                            >= bookmarks
+                                    .get(bookmarks.size() - 1)
+                                    .getStartPage()) { // for handling the above-mentioned case
+                Bookmark previousBookmark = bookmarks.get(bookmarks.size() - 1);
+                previousBookmark.setEndPage(firstPage);
+            }
+            bookmarks.add(new Bookmark(currentTitle, firstPage, endPage));
+
+            // Recursively process children
+            if (child != null && level < maxLevel) {
+                extractOutlineItems(
+                        sourceDocument, child, bookmarks, nextSibling, level + 1, maxLevel);
+            }
+
+            current = nextSibling;
+        }
+        return bookmarks;
+    }
+
+    private Path createZipFile(
+            List<Bookmark> bookmarks, List<ByteArrayOutputStream> splitDocumentsBoas)
+            throws Exception {
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        String fileNumberFormatter = "%0" + (Integer.toString(bookmarks.size()).length()) + "d ";
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+
+                // split files will be named as "[FILE_NUMBER] [BOOKMARK_TITLE].pdf"
+
+                String fileName =
+                        String.format(fileNumberFormatter, i)
+                                + bookmarks.get(i).getTitle()
+                                + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+
+                logger.info("Wrote split document {} to zip file", fileName);
+            }
+        } catch (Exception e) {
+            logger.error("Failed writing to zip", e);
+            throw e;
+        }
+
+        logger.info("Successfully created zip file with split documents: {}", zipFile);
+        return zipFile;
+    }
+
+    public List<ByteArrayOutputStream> getSplitDocumentsBoas(
+            PDDocument sourceDocument, List<Bookmark> bookmarks, boolean includeMetadata)
+            throws Exception {
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
+        PdfMetadata metadata = null;
+        if (includeMetadata) {
+            metadata = PdfUtils.extractMetadataFromPdf(sourceDocument);
+        }
+        for (Bookmark bookmark : bookmarks) {
+            try (PDDocument splitDocument = new PDDocument()) {
+                boolean isSinglePage = (bookmark.getStartPage() == bookmark.getEndPage());
+
+                for (int i = bookmark.getStartPage();
+                        i < bookmark.getEndPage() + (isSinglePage ? 1 : 0);
+                        i++) {
+                    PDPage page = sourceDocument.getPage(i);
+                    splitDocument.addPage(page);
+                    logger.info("Adding page {} to split document", i);
+                }
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                if (includeMetadata) {
+                    PdfUtils.setMetadataToPdf(splitDocument, metadata);
+                }
+
+                splitDocument.save(baos);
+
+                splitDocumentsBoas.add(baos);
+            } catch (Exception e) {
+                logger.error("Failed splitting documents and saving them", e);
+                throw e;
+            }
+        }
+        return splitDocumentsBoas;
+    }
+}
+
+@Data
+@EqualsAndHashCode
+@NoArgsConstructor
+@AllArgsConstructor
+class Bookmark {
+    private String title;
+    private int startPage;
+    private int endPage;
+}

src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java

@@ -43,6 +43,7 @@ public class PageNumbersController {
                     "This operation takes an input PDF file and adds page numbers to it. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> addPageNumbers(@ModelAttribute AddPageNumbersRequest request)
             throws IOException {
+
         MultipartFile file = request.getFileInput();
         String customMargin = request.getCustomMargin();
         int position = request.getPosition();
@@ -52,7 +53,8 @@ public class PageNumbersController {
         int pageNumber = startingNumber;
         byte[] fileBytes = file.getBytes();
         PDDocument document = Loader.loadPDF(fileBytes);
-
+        float font_size = request.getFontSize();
+        String font_type = request.getFontType();
         float marginFactor;
         switch (customMargin.toLowerCase()) {
             case "small":
@@ -73,7 +75,7 @@ public class PageNumbersController {
                 break;
         }
 
-        float fontSize = 12.0f;
+        float fontSize = font_size;
         if (pagesToNumber == null || pagesToNumber.length() == 0) {
             pagesToNumber = "all";
         }
@@ -131,7 +133,20 @@ public class PageNumbersController {
                     new PDPageContentStream(
                             document, page, PDPageContentStream.AppendMode.APPEND, true, true);
             contentStream.beginText();
-            contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), fontSize);
+            switch (font_type.toLowerCase()) {
+                case "helvetica":
+                    contentStream.setFont(
+                            new PDType1Font(Standard14Fonts.FontName.HELVETICA), fontSize);
+                    break;
+                case "courier":
+                    contentStream.setFont(
+                            new PDType1Font(Standard14Fonts.FontName.COURIER), fontSize);
+                    break;
+                case "times":
+                    contentStream.setFont(
+                            new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN), fontSize);
+                    break;
+            }
             contentStream.newLineAtOffset(x, y);
             contentStream.showText(text);
             contentStream.endText();

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.*;
@@ -49,6 +50,13 @@ public class AccountWebController {
             return "redirect:/";
         }
 
+        // Store the previous page URL in the session before redirecting to the login page
+        HttpSession session = request.getSession();
+        String referer = request.getHeader("Referer");
+        if (referer != null && !referer.contains("/login")) {
+            session.setAttribute("PREVIOUS_PAGE_URL", referer);
+        }
+
         Map<String, String> providerList = new HashMap<>();
 
         OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
@@ -83,8 +91,6 @@ public class AccountWebController {
         model.addAttribute("loginMethod", applicationProperties.getSecurity().getLoginMethod());
         model.addAttribute(
                 "oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled());
-        model.addAttribute(
-                "samlEnabled", applicationProperties.getSecurity().getSAML().getEnabled());
 
         model.addAttribute("currentPage", "login");
 

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.model;
 
-import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -12,11 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
 
-import lombok.Data;
 import stirling.software.SPDF.config.YamlPropertySourceFactory;
 import stirling.software.SPDF.model.provider.GithubProvider;
 import stirling.software.SPDF.model.provider.GoogleProvider;
@@ -135,7 +130,6 @@ public class ApplicationProperties {
         private Boolean csrfDisabled;
         private InitialLogin initialLogin;
         private OAUTH2 oauth2;
-        private SAML saml;
         private int loginAttemptCount;
         private long loginResetTimeMinutes;
         private String loginMethod = "all";
@@ -180,14 +174,6 @@ public class ApplicationProperties {
             this.oauth2 = oauth2;
         }
 
-        public SAML getSAML() {
-            return saml != null ? saml : new SAML();
-        }
-
-        public void setSAML(SAML saml) {
-            this.saml = saml;
-        }
-
         public Boolean getEnableLogin() {
             return enableLogin;
         }
@@ -249,34 +235,6 @@ public class ApplicationProperties {
             }
         }
 
-        @Data
-        public static class SAML {
-            private Boolean enabled = false;
-            private String entityId;
-            private String registrationId;
-            private String spBaseUrl;
-            private String idpMetadataLocation;
-            private KeyStore keystore;
-
-            @Data
-            public static class KeyStore {
-                private String keystoreLocation;
-                private String keystorePassword;
-                private String keyAlias;
-                private String keyPassword;
-                private String realmCertificateAlias;
-
-                public Resource getKeystoreResource() {
-                    if (keystoreLocation.startsWith("classpath:")) {
-                        return new ClassPathResource(
-                                keystoreLocation.substring("classpath:".length()));
-                    } else {
-                        return new FileSystemResource(keystoreLocation);
-                    }
-                }
-            }
-        }
-
         public static class OAUTH2 {
             private Boolean enabled = false;
             private String issuer;

src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java

@@ -0,0 +1,21 @@
+package stirling.software.SPDF.model.api;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SplitPdfByChaptersRequest extends PDFFile {
+    @Schema(description = "Whether to include Metadata or not", example = "true")
+    private Boolean includeMetadata;
+
+    @Schema(description = "Whether to allow duplicates or not", example = "true")
+    private Boolean allowDuplicates;
+
+    @Schema(description = "Maximum bookmark level required", example = "2")
+    private Integer bookmarkLevel;
+}

src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java

@@ -15,6 +15,9 @@ public class AddPageNumbersRequest extends PDFWithPageNums {
             allowableValues = {"small", "medium", "large"})
     private String customMargin;
 
+    private float fontSize;
+    private String fontType;
+
     @Schema(description = "Position: 1 of 9 positions", minimum = "1", maximum = "9")
     private int position;
 

src/main/java/stirling/software/SPDF/repository/UserRepository.java

@@ -4,6 +4,7 @@ import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import stirling.software.SPDF.model.User;
@@ -13,7 +14,8 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsernameIgnoreCase(String username);
 
     @Query("FROM User u LEFT JOIN FETCH u.settings where upper(u.username) = upper(:username)")
-    Optional<User> findByUsernameIgnoreCaseWithSettings(String username);
+    Optional<User> findByUsernameIgnoreCaseWithSettings(@Param("username") String username);
+
 
     Optional<User> findByUsername(String username);
 

src/main/java/stirling/software/SPDF/utils/RequestUriUtils.java

@@ -4,7 +4,16 @@ public class RequestUriUtils {
 
     public static boolean isStaticResource(String requestURI) {
 
-        return isStaticResource("", requestURI);
+        return requestURI.startsWith("/css/")
+                || requestURI.startsWith("/fonts/")
+                || requestURI.startsWith("/js/")
+                || requestURI.startsWith("/images/")
+                || requestURI.startsWith("/public/")
+                || requestURI.startsWith("/pdfjs/")
+                || requestURI.startsWith("/pdfjs-legacy/")
+                || requestURI.endsWith(".svg")
+                || requestURI.endsWith(".webmanifest")
+                || requestURI.startsWith("/api/v1/info/status");
     }
 
     public static boolean isStaticResource(String contextPath, String requestURI) {
@@ -15,7 +24,6 @@ public class RequestUriUtils {
                 || requestURI.startsWith(contextPath + "/images/")
                 || requestURI.startsWith(contextPath + "/public/")
                 || requestURI.startsWith(contextPath + "/pdfjs/")
-                || requestURI.startsWith(contextPath + "/saml2")
                 || requestURI.endsWith(".svg")
                 || requestURI.endsWith(".webmanifest")
                 || requestURI.startsWith(contextPath + "/api/v1/info/status");

src/main/resources/application.properties

@@ -1,12 +1,5 @@
 multipart.enabled=true
 
-otel.metrics.exporter=prometheus
-otel.exporter.prometheus.port=9464
-otel.service.name=stirling-pdf
-
-logging.level.org.springframework.security.saml2=DEBUG
-logging.level.org.springframework.security=DEBUG
-
 logging.level.org.springframework=WARN
 logging.level.org.hibernate=WARN
 logging.level.org.eclipse.jetty=WARN

src/main/resources/messages_bg_BG.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Изберете PDF(и)
 multiPdfPrompt=Изберете PDF (2+)
 multiPdfDropPrompt=Изберете (или плъзнете и пуснете) всички PDF файлове, от които се нуждаете

src/main/resources/messages_ca_CA.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Selecciona PDF(s)
 multiPdfPrompt=Selecciona PDFs (2+)
 multiPdfDropPrompt=Selecciona (o arrossega) els documents PDF

src/main/resources/messages_cs_CZ.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Vyberte PDF soubory
 multiPdfPrompt=Vyberte PDF soubory (2+)
 multiPdfDropPrompt=Vyberte (nebo přetáhněte) všechny požadované PDF soubory

src/main/resources/messages_de_DE.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=PDF(s) auswählen
 multiPdfPrompt=PDFs auswählen(2+)
 multiPdfDropPrompt=Wählen Sie alle gewünschten PDFs aus (oder ziehen Sie sie per Drag & Drop hierhin)

src/main/resources/messages_el_GR.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Επιλογή PDF(s)
 multiPdfPrompt=Επιλογή PDFs (2+)
 multiPdfDropPrompt=Επιλογή (ή τράβηγμα αρχείου και απόθεση) όλων των PDF που χρειάζεστε

src/main/resources/messages_en_GB.properties

@@ -3,7 +3,8 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Select PDF(s)
 multiPdfPrompt=Select PDFs (2+)
 multiPdfDropPrompt=Select (or drag & drop) all PDFs you require

src/main/resources/messages_en_US.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Select PDF(s)
 multiPdfPrompt=Select PDFs (2+)
 multiPdfDropPrompt=Select (or drag & drop) all PDFs you require

src/main/resources/messages_es_ES.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Seleccionar PDF(s)
 multiPdfPrompt=Seleccionar PDFs (2+)
 multiPdfDropPrompt=Seleccione (o arrastre y suelte) todos los PDFs que quiera
@@ -179,7 +180,7 @@ adminUserSettings.user=Usuario
 adminUserSettings.addUser=Añadir Nuevo Usuario
 adminUserSettings.deleteUser=Eliminar Usuario
 adminUserSettings.confirmDeleteUser=¿Se debe eliminar al usuario?
-adminUserSettings.confirmChangeUserStatus= Se debe habilitar/deshabilitar el usuario?
+adminUserSettings.confirmChangeUserStatus=Se debe habilitar/deshabilitar el usuario?
 adminUserSettings.usernameInfo=El nombre de usuario solo puede contener letras, números y los siguientes caracteres especiales @._+- o debe ser una dirección de correo electrónico válida.
 adminUserSettings.roles=Roles
 adminUserSettings.role=Rol

src/main/resources/messages_eu_ES.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Hautatu PDFa(k)
 multiPdfPrompt=Hautatu PDFak (2+)
 multiPdfDropPrompt=Hautatu (edo arrastatu eta jaregin) nahi dituzun PDFak

src/main/resources/messages_fr_FR.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Sélectionnez le(s) PDF
 multiPdfPrompt=Sélectionnez les PDF
 multiPdfDropPrompt=Sélectionnez (ou glissez-déposez) tous les PDF dont vous avez besoin

src/main/resources/messages_ga_IE.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Roghnaigh PDF(s)
 multiPdfPrompt=Roghnaigh PDFs (2+)
 multiPdfDropPrompt=Roghnaigh (nó tarraing & scaoil) gach PDF atá uait

src/main/resources/messages_hi_IN.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=पीडीएफ़(फ़ाइलें) चुनें
 multiPdfPrompt=पीडीएफ़(फ़ाइलें) चुनें (2+)
 multiPdfDropPrompt=सभी पीडीएफ़(फ़ाइलें) को चुनें (या खींचें और छोड़ें)
@@ -109,25 +110,25 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
-navbar.favorite=Favorites
+navbar.favorite=पसंदीदा
 navbar.darkmode=डार्क मोड
-navbar.language=Languages
+navbar.language=भाषा
 navbar.settings=सेटिंग्स
-navbar.allTools=Tools
-navbar.multiTool=Multi Tools
-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.allTools=साधन
+navbar.multiTool=विभिन्न साधन
+navbar.sections.organize=संगठित करें
+navbar.sections.convertTo=पीडीएफ में कनवर्ट करें
+navbar.sections.convertFrom=पीडीएफ से कनवर्ट करें
+navbar.sections.security=संकेत और सुरक्षा
+navbar.sections.advance=उन्नत
+navbar.sections.edit=देखें और संपादित करें
 
 #############
 #  SETTINGS #
 #############
 settings.title=सेटिंग्स
 settings.update=अपडेट उपलब्ध है
-settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
+settings.updateAvailable={0} वर्तमान स्थापित संस्करण है. एक नया संस्करण ({1}) उपलब्ध है.
 settings.appVersion=ऐप संस्करण:
 settings.downloadOption.title=डाउनलोड विकल्प चुनें (एकल फ़ाइल गैर-ज़िप डाउनलोड के लिए):
 settings.downloadOption.1=एक ही विंडो में खोलें

src/main/resources/messages_hr_HR.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Odaberi PDF(ove)
 multiPdfPrompt=Odaberi PDF-ove (2+)
 multiPdfDropPrompt=Odaberi (ili povuci i ispusti) sve potrebne PDF-ove

src/main/resources/messages_hu_HU.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Válasszon PDF-fájlokat
 multiPdfPrompt=Válasszon PDF-fájlokat (2+)
 multiPdfDropPrompt=Válassza ki (vagy húzza ide) az összes szükséges PDF-fájlt

src/main/resources/messages_id_ID.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl=right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Pilih PDF
 multiPdfPrompt=Pilih PDF (2+)
 multiPdfDropPrompt=Pilih (atau seret & letakkan)) semua PDF yang Anda butuhkan

src/main/resources/messages_it_IT.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Dimensione del font
+addPageNumbers.fontName=Nome del font
 pdfPrompt=Scegli PDF
 multiPdfPrompt=Scegli 2 o più PDF
 multiPdfDropPrompt=Scegli (o trascina e rilascia) uno o più PDF
@@ -802,7 +803,7 @@ ocr.submit=Scansiona testo nel PDF con OCR
 extractImages.title=Estrai immagini
 extractImages.header=Estrai immagini
 extractImages.selectText=Seleziona il formato in cui salvare le immagini estratte
-extractImages.allowDuplicates=Save duplicate images
+extractImages.allowDuplicates=Salva le immagini duplicate
 extractImages.submit=Estrai
 
 

src/main/resources/messages_ja_JP.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=PDFを選択
 multiPdfPrompt=PDFを選択 (2つ以上)
 multiPdfDropPrompt=PDFを選択 (又はドラッグ&ドロップ)

src/main/resources/messages_ko_KR.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=PDF 파일 선택
 multiPdfPrompt=여러 PDF 파일 선택
 multiPdfDropPrompt=사용할 모든 PDF 문서를 선택(또는 드래그 앤 드롭)합니다

src/main/resources/messages_nl_NL.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Selecteer PDF('s)
 multiPdfPrompt=Selecteer PDF's (2+)
 multiPdfDropPrompt=Selecteer (of sleep & zet neer) alle PDF's die je nodig hebt

src/main/resources/messages_no_NB.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Velg PDF(er)
 multiPdfPrompt=Velg PDF-filer (2+)
 multiPdfDropPrompt=Velg (eller dra og slipp) alle PDF-ene du trenger

src/main/resources/messages_pl_PL.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Wybierz PDF
 multiPdfPrompt=Wybierz PDF (2+)
 multiPdfDropPrompt=Wybierz (lub przeciągnij i puść) wszystkie dokumenty PDF

src/main/resources/messages_pt_BR.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Selecione PDF(s)
 multiPdfPrompt=Selecione PDFs (2+)
 multiPdfDropPrompt=Selecione (ou arraste e solte) todos os PDFs necessários

src/main/resources/messages_pt_PT.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Selecione PDF(s)
 multiPdfPrompt=Selecione PDFs (2+)
 multiPdfDropPrompt=Selecione (ou arraste e solte) todos os PDFs necessários

src/main/resources/messages_ru_RU.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Выберите PDF(ы)
 multiPdfPrompt=Выберите PDFы (2+)
 multiPdfDropPrompt=Выберите (или перетащите) все необходимые PDFы

src/main/resources/messages_sk_SK.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Vyberte PDF súbor(y)
 multiPdfPrompt=Vyberte PDF súbory (2+)
 multiPdfDropPrompt=Vyberte (alebo pretiahnite) všetky požadované PDF súbory

src/main/resources/messages_sr_LATN_RS.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Odaberi PDF(ove)
 multiPdfPrompt=Odaberi PDF-ove (2+)
 multiPdfDropPrompt=Odaberi (prevuci i pusti ) sve PDF-ove koji su vam potrebni

src/main/resources/messages_th_TH.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=เลือก PDF
 multiPdfPrompt=เลือก PDF หลายไฟล์ (2 ขึ้นไป)
 multiPdfDropPrompt=เลือก (หรือลากและวาง) PDF ทั้งหมดที่คุณต้องการ

src/main/resources/messages_tr_TR.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=PDF(leri) seçin
 multiPdfPrompt=PDFleri seçin (2+)
 multiPdfDropPrompt=Tüm gerekli PDF'leri seçin (ya da sürükleyip bırakın)

src/main/resources/messages_uk_UA.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Оберіть PDF(и)
 multiPdfPrompt=Оберіть PDFи (2+)
 multiPdfDropPrompt=Оберіть (або перетягніть) всі необхідні PDFи

src/main/resources/messages_vi_VN.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=Chọn (các) tệp PDF
 multiPdfPrompt=Chọn các tệp PDF (2+)
 multiPdfDropPrompt=Chọn (hoặc kéo và thả) tất cả các tệp PDF bạn cần

src/main/resources/messages_zh_CN.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=选择PDF
 multiPdfPrompt=选择多个PDF（2个或更多）
 multiPdfDropPrompt=选择（或拖拽）所需的PDF

src/main/resources/messages_zh_TW.properties

@@ -1,9 +1,10 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr=left to right, rtl = right to left)
+# the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
-
+addPageNumbers.fontSize=Font Size
+addPageNumbers.fontName=Font Name
 pdfPrompt=選擇 PDF 檔案
 multiPdfPrompt=選擇多個 PDF 檔案
 multiPdfDropPrompt=選擇（或拖放）所有需要的 PDF 檔案

src/main/resources/settings.yml.template

@@ -47,18 +47,6 @@ security:
     useAsUsername: email # Default is 'email'; custom fields can be used as the username
     scopes: openid, profile, email # Specify the scopes for which the application will request permissions
     provider: google # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
-  saml:
-    enabled: false # set to 'true' to enable SAML login (Note: enableLogin must also be 'true' for this to work)
-    registrationId: stirling
-    entityId: '' # Entity ID for the Service Provider (SP)
-    idpMetadataLocation: '' # URL or file path to the Identity Provider (IdP) metadata
-    spBaseUrl: '' # Base URL for the Service Provider (SP)
-    keystore:
-      keystoreLocation: /config/keystore.jks
-      keystorePassword: stirlingstore
-      keyAlias: stirling
-      keyPassword: stirlingkey
-      realmCertificateAlias: master
 
 system:
   defaultLocale: en-US # Set the default language (e.g. 'de-DE', 'fr-FR', etc)

src/main/resources/static/css/footer.css

@@ -18,7 +18,17 @@
   text-align: center; /* Centers the text inside the div */
   width: 100%; /* Full width to center the text properly */
 }
+.stirling-link {
+  text-decoration: none; /* Remove the underline */
+  color: inherit; /* Keep the text color the same as the surrounding text */
+  cursor: pointer; /* Change the cursor to indicate it's clickable */
+  font-weight: bold; /* Make it bold to subtly hint that it's clickable */
+  transition: color 0.3s ease; /* Add a smooth transition effect for color change on hover */
+}
 
+.stirling-link:hover {
+  color: #007BFF; /* Change the color on hover to a noticeable link color */
+}
 .footer-icon {
   font-size: 2rem;
 }

src/main/resources/static/js/multitool/PdfActionsManager.js

@@ -70,12 +70,12 @@ class PdfActionsManager {
 
   insertFileButtonCallback(e) {
     var imgContainer = this.getPageContainer(e.target);
-    this.addPdfs(imgContainer);
+    this.addFiles(imgContainer);
   }
 
-  setActions({ movePageTo, addPdfs, rotateElement }) {
+  setActions({ movePageTo, addFiles, rotateElement }) {
     this.movePageTo = movePageTo;
-    this.addPdfs = addPdfs;
+    this.addFiles = addFiles;
     this.rotateElement = rotateElement;
 
     this.moveUpButtonCallback = this.moveUpButtonCallback.bind(this);
@@ -153,7 +153,7 @@ class PdfActionsManager {
     const insertFileButtonRight = document.createElement("button");
     insertFileButtonRight.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button");
     insertFileButtonRight.innerHTML = `<span class="material-symbols-rounded">add</span>`;
-    insertFileButtonRight.onclick = () => addPdfs();
+    insertFileButtonRight.onclick = () => addFiles();
     insertFileButtonRightContainer.appendChild(insertFileButtonRight);
 
     div.appendChild(insertFileButtonRightContainer);

src/main/resources/templates/fragments/footer.html

@@ -10,7 +10,8 @@
 
     <!-- powered by section -->
     <div class="footer-powered-by">
-      <span th:text="#{poweredBy} + ' Stirling PDF'"></span>
-    </div>
+	  <span th:text="#{poweredBy}"></span>
+	  <a href="https://stirlingpdf.com" class="stirling-link">Stirling PDF</a>
+	</div>
   </div>
 </footer>

src/main/resources/templates/fragments/navbar.html

@@ -397,11 +397,6 @@
               <a href="https://discord.gg/Cn8pWhQRxZ" class="mx-1" role="button" th:title="#{joinDiscord}">
                 <img th:src="@{'/images/discord.svg'}" alt="discord">
               </a>
-              <a href="https://github.com/sponsors/Frooodle" class="mx-1" role="button" th:title="#{donate}">
-                <span class="material-symbols-rounded fill footer-icon" style="font-size: 2.5rem;">
-                  favorite
-                </span>
-              </a>
             </div>
 
             <a th:href="@{'/swagger-ui/index.html'}" class="btn btn-sm btn-outline-primary mx-1" role="button"

src/main/resources/templates/login.html

@@ -114,7 +114,7 @@
           <img class="my-4" th:src="@{'/favicon.svg'}" alt="favicon" width="144" height="144">
 
           <h1 class="h1 mb-3 fw-normal" th:text="${@appName}">Stirling-PDF</h1>
-          <div th:if="(${oAuth2Enabled} or ${samlEnabled}) and (${loginMethod} == 'all' or ${loginMethod} == 'oauth2')">
+          <div th:if="${oAuth2Enabled} and (${loginMethod} == 'all' or ${loginMethod} == 'oauth2')">
             <a href="#" class="w-100 btn btn-lg btn-primary" data-bs-toggle="modal" data-bs-target="#loginsModal" th:text="#{login.ssoSignIn}">Login Via SSO</a>
             <br>
             <br>
@@ -168,7 +168,7 @@
       </main>
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
-    <div th:if="${oAuth2Enabled or samlEnabled}" class="modal fade" id="loginsModal" tabindex="-1" role="dialog" aria-labelledby="loginsModalLabel" aria-hidden="true">
+    <div th:if="${oAuth2Enabled}" class="modal fade" id="loginsModal" tabindex="-1" role="dialog" aria-labelledby="loginsModalLabel" aria-hidden="true">
       <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
           <div class="modal-header">
@@ -183,9 +183,6 @@
             <div class="mb-3" th:each="provider : ${providerlist}">
               <a th:href="@{|/oauth2/authorization/${provider.key}|}" th:text="${provider.value}" class="w-100 btn btn-lg btn-primary">OpenID Connect</a>
             </div>
-            <div class="mb-3" th:if="${samlEnabled}">
-              <a th:href="@{'/saml2/authenticate/stirling'}" class="w-100 btn btn-lg btn-primary" th:text="#{login.ssoSignIn}">SAML</a>
-            </div>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" th:text="#{close}"></button>
@@ -194,4 +191,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

src/main/resources/templates/misc/add-page-numbers.html

@@ -1,140 +1,153 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
-  <head>
+<head>
   <th:block th:insert="~{fragments/common :: head(title=#{addPageNumbers.title}, header=#{addPageNumbers.header})}"></th:block>
-    <style>
-      .a4container {
-        position: relative;
-        width: 50%;
-        aspect-ratio: 0.707/1;
-        border: 1px solid #ddd;
-        box-sizing: border-box;
-        background-color: white;
-      }
+  <style>
+    .a4container {
+      position: relative;
+      width: 50%;
+      aspect-ratio: 0.707/1;
+      border: 1px solid #ddd;
+      box-sizing: border-box;
+      background-color: white;
+    }
 
-      .pageNumber {
-        position: absolute;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 1em;
-        color: #333;
-        cursor: pointer;
-        background-color: #ccc;
-        width: 15%;
-        height: 15%;
-        transform: translate(-50%, -50%);
-      }
+    .pageNumber {
+      position: absolute;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 1em;
+      color: #333;
+      cursor: pointer;
+      background-color: #ccc;
+      width: 15%;
+      height: 15%;
+      transform: translate(-50%, -50%);
+    }
 
-      .pageNumber:hover {
-        background-color: #eee;
-      }
+    .pageNumber:hover {
+      background-color: #eee;
+    }
 
-      #myForm {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-top: 20px;
-      }
+    #myForm {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 20px;
+    }
 
-      .selectedPosition {
-        background-color: #0a0;
-      }
+    .selectedPosition {
+      background-color: #0a0;
+    }
 
-      .selectedPosition.selectedHovered {
-        background-color: #006600;
-      }
-    </style>
-  </head>
+    .selectedPosition.selectedHovered {
+      background-color: #006600;
+    }
+  </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-6 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon other">123</span>
-                <span class="tool-header-text" th:text="#{addPageNumbers.header}"></span>
-              </div>
-              <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/misc/add-page-numbers'}">
-                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
-                <br>
-                <div class="mb-3">
-                  <label for="customMargin" th:text="#{addPageNumbers.selectText.2}"></label>
-                  <select class="form-control" id="customMargin" name="customMargin">
-                    <option value="small" th:text="#{sizes.small}"></option>
-                    <option value="medium" selected th:text="#{sizes.medium}"></option>
-                    <option value="large" th:text="#{sizes.large}"></option>
-                    <option value="x-large" th:text="#{sizes.x-large}"></option>
-                  </select>
-                </div>
-                <div class="mb-3">
-                  <label th:text="#{addPageNumbers.selectText.3}"></label>
-                  <div class="a4container">
-                    <div class="pageNumber" id="1" style="top: 10%; left: 10%;">1</div>
-                    <div class="pageNumber" id="2" style="top: 10%; left: 50%;">2</div>
-                    <div class="pageNumber" id="3" style="top: 10%; left: 90%;">3</div>
-                    <div class="pageNumber" id="4" style="top: 50%; left: 10%;">4</div>
-                    <div class="pageNumber" id="5" style="top: 50%; left: 50%;">5</div>
-                    <div class="pageNumber" id="6" style="top: 50%; left: 90%;">6</div>
-                    <div class="pageNumber" id="7" style="top: 90%; left: 10%;">7</div>
-                    <div class="pageNumber selectedPosition" id="8" style="top: 90%; left: 50%;">8</div>
-                    <div class="pageNumber" id="9" style="top: 90%; left: 90%;">9</div>
-                  </div>
-                </div>
-                <input type="hidden" id="numberInput" name="position" value="8">
-                <div class="mb-3">
-                  <label for="startingNumber" th:text="#{addPageNumbers.selectText.4}"></label>
-                  <input type="number" class="form-control" id="startingNumber" name="startingNumber" min="1" required value="1">
-                </div>
-                <div class="mb-3">
-                  <label for="pagesToNumber" th:text="#{addPageNumbers.selectText.5}"></label>
-                  <input type="text" class="form-control" id="pagesToNumber" name="pagesToNumber" th:placeholder="#{addPageNumbers.numberPagesDesc}">
-                </div>
-                <div class="mb-3">
-                  <label for="customText" th:text="#{addPageNumbers.selectText.6}"></label>
-                  <input type="text" class="form-control" id="customText" name="customText" th:placeholder="#{addPageNumbers.customNumberDesc}">
-                </div>
-                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{addPageNumbers.submit}"></button>
-              </form>
-            </div>
+<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-6 bg-card">
+          <div class="tool-header">
+            <span class="material-symbols-rounded tool-header-icon other">123</span>
+            <span class="tool-header-text" th:text="#{addPageNumbers.header}"></span>
           </div>
+          <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/misc/add-page-numbers'}">
+            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+            <br>
+            <div class="mb-3">
+              <label for="customMargin" th:text="#{addPageNumbers.selectText.2}"></label>
+              <select class="form-control" id="customMargin" name="customMargin">
+                <option value="small" th:text="#{sizes.small}"></option>
+                <option value="medium" selected th:text="#{sizes.medium}"></option>
+                <option value="large" th:text="#{sizes.large}"></option>
+                <option value="x-large" th:text="#{sizes.x-large}"></option>
+              </select>
+            </div>
+            <div class="mb-3">
+              <label th:text="#{addPageNumbers.selectText.3}"></label>
+              <div class="a4container">
+                <div class="pageNumber" id="1" style="top: 10%; left: 10%;">1</div>
+                <div class="pageNumber" id="2" style="top: 10%; left: 50%;">2</div>
+                <div class="pageNumber" id="3" style="top: 10%; left: 90%;">3</div>
+                <div class="pageNumber" id="4" style="top: 50%; left: 10%;">4</div>
+                <div class="pageNumber" id="5" style="top: 50%; left: 50%;">5</div>
+                <div class="pageNumber" id="6" style="top: 50%; left: 90%;">6</div>
+                <div class="pageNumber" id="7" style="top: 90%; left: 10%;">7</div>
+                <div class="pageNumber selectedPosition" id="8" style="top: 90%; left: 50%;">8</div>
+                <div class="pageNumber" id="9" style="top: 90%; left: 90%;">9</div>
+              </div>
+            </div>
+            <input type="hidden" id="numberInput" name="position" value="8">
+            <div class="mb-3">
+              <label for="fontSize" th:text="#{addPageNumbers.fontSize}"></label>
+              <input type="number" class="form-control" id="fontSize" name="fontSize" min="1" value="12" required>
+            </div>
+            <div class="mb-3">
+              <label for="fontType" th:text="#{addPageNumbers.fontName}"></label>
+              <select class="form-control" id="fontType" name="fontType">
+                <option value="Times Roman">Times</option>
+
+                <option value="Helvetica">Helvetica</option>
+                <option value="Courier New">Courier</option>
+              </select>
+            </div>
+            <div class="mb-3">
+              <label for="startingNumber" th:text="#{addPageNumbers.selectText.4}"></label>
+              <input type="number" class="form-control" id="startingNumber" name="startingNumber" min="1" required value="1">
+            </div>
+            <div class="mb-3">
+              <label for="pagesToNumber" th:text="#{addPageNumbers.selectText.5}"></label>
+              <input type="text" class="form-control" id="pagesToNumber" name="pagesToNumber" th:placeholder="#{addPageNumbers.numberPagesDesc}">
+            </div>
+            <div class="mb-3">
+              <label for="customText" th:text="#{addPageNumbers.selectText.6}"></label>
+              <input type="text" class="form-control" id="customText" name="customText" th:placeholder="#{addPageNumbers.customNumberDesc}">
+            </div>
+            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{addPageNumbers.submit}"></button>
+          </form>
         </div>
-        <script>
-          let cells = document.querySelectorAll('.pageNumber');
-          let inputField = document.getElementById('numberInput');
-
-          cells.forEach(cell => {
-            cell.addEventListener('click', function(e) {
-              cells.forEach(cell => {
-                cell.classList.remove('selectedPosition'); // Remove selected class from all cells
-                cell.classList.remove('selectedHovered'); // Also remove selectedHovered class
-              });
-              let selectedLocation = e.target.id;
-              inputField.value = selectedLocation;
-              e.target.classList.add('selectedPosition'); // Add selected class to clicked cell
-              e.target.classList.add('selectedHovered'); // Add selectedHovered class
-            });
-
-            cell.addEventListener('mouseenter', function(e) {
-              if(e.target.classList.contains('selectedPosition')) {
-                e.target.classList.add('selectedHovered');
-              }
-            });
-
-            cell.addEventListener('mouseleave', function(e) {
-              if(e.target.classList.contains('selectedPosition')) {
-                e.target.classList.remove('selectedHovered');
-              }
-            });
-          });
-        </script>
       </div>
-      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
-  </body>
-</html>
+    <script>
+      let cells = document.querySelectorAll('.pageNumber');
+      let inputField = document.getElementById('numberInput');
+
+      cells.forEach(cell => {
+        cell.addEventListener('click', function(e) {
+          cells.forEach(cell => {
+            cell.classList.remove('selectedPosition'); // Remove selected class from all cells
+            cell.classList.remove('selectedHovered'); // Also remove selectedHovered class
+          });
+          let selectedLocation = e.target.id;
+          inputField.value = selectedLocation;
+          e.target.classList.add('selectedPosition'); // Add selected class to clicked cell
+          e.target.classList.add('selectedHovered'); // Add selectedHovered class
+        });
+
+        cell.addEventListener('mouseenter', function(e) {
+          if(e.target.classList.contains('selectedPosition')) {
+            e.target.classList.add('selectedHovered');
+          }
+        });
+
+        cell.addEventListener('mouseleave', function(e) {
+          if(e.target.classList.contains('selectedPosition')) {
+            e.target.classList.remove('selectedHovered');
+          }
+        });
+      });
+    </script>
+  </div>
+  <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+</div>
+</body>
+</html>