Skip to content

Fix Bearer token authentication for non-OCS endpoints #1221

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

Open
cbcoutinho wants to merge 5 commits into
base: main
Choose a base branch
from
+4 −0
Open

Fix Bearer token authentication for non-OCS endpoints #1221

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04ea9b8
Fix Bearer token authentication causing session logout
cbcoutinho Oct 21, 2025
7b3ecfa
Merge remote-tracking branch 'upstream/main' into fix/bearer-auth-cor…
cbcoutinho Oct 28, 2025
a0fed3d
Merge branch 'main' into fix/bearer-auth-cors-session-logout
cbcoutinho Nov 3, 2025
b81919b
Merge branch 'main' into fix/bearer-auth-cors-session-logout
cbcoutinho Nov 14, 2025
6b82592
Merge branch 'main' into fix/bearer-auth-cors-session-logout
cbcoutinho Dec 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
4 changes: 4 additions & 0 deletions lib/User/Backend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ public function getCurrentUserId(): string {
$this->eventDispatcher->dispatchTyped($validationEvent);
$oidcProviderUserId = $validationEvent->getUserId();
if ($oidcProviderUserId !== null) {
$this->session->set('app_api', true);
return $oidcProviderUserId;
} else {
$this->logger->debug('[NextcloudOidcProviderValidator] The bearer token validation has failed');
Expand Down Expand Up @@ -306,10 +307,12 @@ public function getCurrentUserId(): string {
}

$this->session->set('last-password-confirm', strtotime('+4 year', time()));
$this->session->set('app_api', true);
return $userId;
} elseif ($this->userExists($tokenUserId)) {
$this->checkFirstLogin($tokenUserId);
$this->session->set('last-password-confirm', strtotime('+4 year', time()));
$this->session->set('app_api', true);
return $tokenUserId;
} else {
// check if the user exists locally
Expand All @@ -331,6 +334,7 @@ public function getCurrentUserId(): string {
}
$this->checkFirstLogin($tokenUserId);
$this->session->set('last-password-confirm', strtotime('+4 year', time()));
$this->session->set('app_api', true);
return $tokenUserId;
}
}
Expand Down