Skip to content
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

Refactor OC\Server::getCsrfTokenManager #40120

Merged
merged 4 commits into from
May 31, 2024
Merged

Refactor OC\Server::getCsrfTokenManager #40120

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1470a72
Refactor `OC\Server::getCsrfTokenManager`
summersab Aug 29, 2023
cc7e6e5
Merge branch 'master' into refactor/OC-Server-getCsrfTokenManager
skjnldsv May 30, 2024
84d40a7
Merge branch 'master' into refactor/OC-Server-getCsrfTokenManager
skjnldsv May 30, 2024
5c3619c
Merge branch 'master' into refactor/OC-Server-getCsrfTokenManager
skjnldsv May 30, 2024
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
3 changes: 2 additions & 1 deletion lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
use OC\Hooks\Emitter;
use OC\Hooks\PublicEmitter;
use OC\Security\CSRF\CsrfTokenManager;
use OC_User;
use OC_Util;
use OCA\DAV\Connector\Sabre\Auth;
Expand Down Expand Up @@ -531,7 +532,7 @@ protected function prepareUserLogin($firstTimeLogin, $refreshCsrfToken = true) {
if ($refreshCsrfToken) {
// TODO: mock/inject/use non-static
// Refresh the token
\OC::$server->getCsrfTokenManager()->refreshToken();
\OC::$server->get(CsrfTokenManager::class)->refreshToken();
}

if ($firstTimeLogin) {
Expand Down
3 changes: 2 additions & 1 deletion lib/public/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use bantu\IniGetWrapper\IniGetWrapper;
use OC\AppScriptDependency;
use OC\AppScriptSort;
use OC\Security\CSRF\CsrfTokenManager;
use OCP\Share\IManager;
use Psr\Container\ContainerExceptionInterface;
use Psr\Log\LoggerInterface;
Expand Down Expand Up @@ -392,7 +393,7 @@ public static function emitHook($signalclass, $signalname, $params = []) {
*/
public static function callRegister() {
if (self::$token === '') {
self::$token = \OC::$server->getCsrfTokenManager()->getToken()->getEncryptedValue();
self::$token = \OC::$server->get(CsrfTokenManager::class)->getToken()->getEncryptedValue();
}
return self::$token;
}
Expand Down
Loading