From 5170cd2444c847bc710278b7c1cc087227ffbd64 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 15 Feb 2026 01:12:54 +0000 Subject: [PATCH] build --- .../security/controller/api/AuthControllerLoginTest.java | 3 ++- .../software/proprietary/security/service/JwtServiceTest.java | 4 +++- frontend/src-tauri/tauri.conf.json | 2 +- frontend/src/core/testing/serverExperienceSimulations.ts | 2 +- .../shared/config/configSections/AdminSecuritySection.tsx | 2 +- .../src/proprietary/testing/serverExperienceSimulations.ts | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/AuthControllerLoginTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/AuthControllerLoginTest.java index 86bcf50e8c..57aefeaa25 100644 --- a/app/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/AuthControllerLoginTest.java +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/AuthControllerLoginTest.java @@ -58,6 +58,7 @@ class AuthControllerLoginTest { void setUp() { securityProperties = new ApplicationProperties.Security(); securityProperties.setLoginMethod("all"); + securityProperties.getJwt().setTokenExpiryMinutes(60); AuthController controller = new AuthController( @@ -175,7 +176,7 @@ class AuthControllerLoginTest { void refreshReturnsNewTokenWhenValid() throws Exception { User user = buildUser(); when(jwtService.extractToken(any())).thenReturn("old"); - when(jwtService.extractUsername("old")).thenReturn("user@example.com"); + when(jwtService.extractUsernameAllowExpired("old")).thenReturn("user@example.com"); when(userDetailsService.loadUserByUsername("user@example.com")).thenReturn(user); when(jwtService.generateToken(eq("user@example.com"), any(Map.class))) .thenReturn("new-token"); diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java index e8a6d60453..f8083d0246 100644 --- a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java @@ -31,6 +31,7 @@ import org.springframework.security.core.Authentication; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import stirling.software.common.model.ApplicationProperties; import stirling.software.proprietary.security.model.JwtVerificationKey; import stirling.software.proprietary.security.model.User; import stirling.software.proprietary.security.model.exception.AuthenticationFailureException; @@ -64,7 +65,8 @@ class JwtServiceTest { Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded()); testVerificationKey = new JwtVerificationKey("test-key-id", encodedPublicKey); - jwtService = new JwtService(true, keystoreService); + ApplicationProperties applicationProperties = new ApplicationProperties(); + jwtService = new JwtService(true, keystoreService, applicationProperties); } @Test diff --git a/frontend/src-tauri/tauri.conf.json b/frontend/src-tauri/tauri.conf.json index 1dee578dd1..3fb356c753 100644 --- a/frontend/src-tauri/tauri.conf.json +++ b/frontend/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "Stirling-PDF", - "version": "2.4.6", + "version": "2.4.5", "identifier": "stirling.pdf.dev", "build": { "frontendDist": "../dist", diff --git a/frontend/src/core/testing/serverExperienceSimulations.ts b/frontend/src/core/testing/serverExperienceSimulations.ts index 7bafd20005..b1ea3bcfe2 100644 --- a/frontend/src/core/testing/serverExperienceSimulations.ts +++ b/frontend/src/core/testing/serverExperienceSimulations.ts @@ -38,7 +38,7 @@ const FREE_LICENSE_INFO: LicenseInfo = { const BASE_NO_LOGIN_CONFIG: AppConfig = { enableAnalytics: true, - appVersion: '2.4.6', + appVersion: '2.4.5', serverCertificateEnabled: false, enableAlphaFunctionality: false, serverPort: 8080, diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx index e5c1f41caf..881ae2e242 100644 --- a/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx +++ b/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx @@ -392,7 +392,7 @@ export default function AdminSecuritySection() { } description={t('admin.settings.security.jwt.keyRetentionDays.description', 'Number of days to retain old JWT keys for verification')} - value={settings?.jwt?.keyRetentionDays || 7} + value={settings?.jwt?.keyRetentionDays || 30} onChange={(value) => setSettings({ ...settings, jwt: { ...settings?.jwt, keyRetentionDays: Number(value) } })} min={1} max={365} diff --git a/frontend/src/proprietary/testing/serverExperienceSimulations.ts b/frontend/src/proprietary/testing/serverExperienceSimulations.ts index dad9866f3c..faaf2181cd 100644 --- a/frontend/src/proprietary/testing/serverExperienceSimulations.ts +++ b/frontend/src/proprietary/testing/serverExperienceSimulations.ts @@ -48,7 +48,7 @@ const FREE_LICENSE_INFO: LicenseInfo = { const BASE_NO_LOGIN_CONFIG: AppConfig = { enableAnalytics: true, - appVersion: '2.4.6', + appVersion: '2.4.5', serverCertificateEnabled: false, enableAlphaFunctionality: false, enableDesktopInstallSlide: true,