Browse Source
Merge pull request #40120 from summersab/refactor/OC-Server-getCsrfTokenManager
pull/45592/head
John Molakvoæ
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
4 additions and
2 deletions
-
lib/private/User/Session.php
-
lib/public/Util.php
|
|
|
@ -15,6 +15,7 @@ use OC\Authentication\Token\PublicKeyToken; |
|
|
|
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; |
|
|
|
@ -531,7 +532,7 @@ class Session implements IUserSession, Emitter { |
|
|
|
if ($refreshCsrfToken) { |
|
|
|
// TODO: mock/inject/use non-static
|
|
|
|
// Refresh the token
|
|
|
|
\OC::$server->getCsrfTokenManager()->refreshToken(); |
|
|
|
\OC::$server->get(CsrfTokenManager::class)->refreshToken(); |
|
|
|
} |
|
|
|
|
|
|
|
if ($firstTimeLogin) { |
|
|
|
|
|
|
|
@ -13,6 +13,7 @@ namespace OCP; |
|
|
|
use bantu\IniGetWrapper\IniGetWrapper; |
|
|
|
use OC\AppScriptDependency; |
|
|
|
use OC\AppScriptSort; |
|
|
|
use OC\Security\CSRF\CsrfTokenManager; |
|
|
|
use OCP\L10N\IFactory; |
|
|
|
use OCP\Mail\IMailer; |
|
|
|
use OCP\Share\IManager; |
|
|
|
@ -394,7 +395,7 @@ class Util { |
|
|
|
*/ |
|
|
|
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; |
|
|
|
} |
|
|
|
|
