Skip to content

[stable30] fix: refactor request token handling and do not update with invalid result #53521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 10 commits into from
Jun 17, 2025
Merged

[stable30] fix: refactor request token handling and do not update with invalid result #53521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b423283
refactor(OC): migrate request token handling to Typescript
susnux Jun 4, 2025
d332a22
fix(OC): validate request token and move logic to one place
susnux Jun 4, 2025
86aaffd
refactor(OC): migrate session heart beat to Typescript
susnux Jun 4, 2025
05405b3
refactor(OC): restructure session heartbeat code - use types and huma…
susnux Jun 4, 2025
fdfc346
test(core): migrate session heartbeat tests
susnux Jun 4, 2025
ed717d3
test: adjust karma global state mock
susnux Jun 10, 2025
edad5b2
fix: the core config is not loaded on error pages
susnux Jun 11, 2025
afc8bce
chore(core): fix typo in session heartbeat service
susnux Jun 16, 2025
50fd441
fix: adjust code
susnux Jun 16, 2025
be3260a
chore(assets): Recompile assets
nextcloud-command Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: the core config is not loaded on error pages 
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux
susnux committed Jun 16, 2025
commit edad5b2229853ae5c052dd4c97fc921e51e3d144
5 changes: 3 additions & 2 deletions core/src/session-heartbeat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ interface OcJsConfig {
session_lifetime: number
}

// This is always set, exception would be e.g. error pages where this is undefined
const {
auto_logout: autoLogout,
session_keepalive: keepSessionAlive,
session_lifetime: seesionLifetime,
} = loadState<OcJsConfig>('core', 'config')
} = loadState<Partial<OcJsConfig>>('core', 'config', {})

/**
* Calls the server periodically to ensure that session and CSRF
Expand Down Expand Up @@ -145,7 +146,7 @@ function registerAutoLogout() {

let intervalId = 0
const logoutCheck = () => {
const timeout = Date.now() - seesionLifetime * 1000
const timeout = Date.now() - (seesionLifetime ?? 86400) * 1000
if (lastActive < timeout) {
clearTimeout(intervalId)
logger.info('Inactivity timout reached, logging out')
Expand Down
8 changes: 4 additions & 4 deletions core/src/tests/OC/session-heartbeat.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('Session heartbeat', () => {
initSessionHeartBeat()

// initial state loaded
expect(initialState.loadState).toBeCalledWith('core', 'config')
expect(initialState.loadState).toBeCalledWith('core', 'config', {})

// less than half, still nothing
await vi.advanceTimersByTimeAsync(100 * 1000)
Expand Down Expand Up @@ -64,7 +64,7 @@ describe('Session heartbeat', () => {
initSessionHeartBeat()

// initial state loaded
expect(initialState.loadState).toBeCalledWith('core', 'config')
expect(initialState.loadState).toBeCalledWith('core', 'config', {})

// less than half, still nothing
await vi.advanceTimersByTimeAsync(100 * 1000)
Expand All @@ -85,7 +85,7 @@ describe('Session heartbeat', () => {
initSessionHeartBeat()

// initial state loaded
expect(initialState.loadState).toBeCalledWith('core', 'config')
expect(initialState.loadState).toBeCalledWith('core', 'config', {})

// 30 / 55 seconds
await vi.advanceTimersByTimeAsync(30 * 1000)
Expand All @@ -110,7 +110,7 @@ describe('Session heartbeat', () => {
initSessionHeartBeat()

// initial state loaded
expect(initialState.loadState).toBeCalledWith('core', 'config')
expect(initialState.loadState).toBeCalledWith('core', 'config', {})

// 23 hours
await vi.advanceTimersByTimeAsync(23 * 60 * 60 * 1000)
Expand Down