Refactor OC\Server::getCsrfTokenManager

Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
This commit is contained in:
Andrew Summers 2023-08-29 17:25:35 -05:00
parent 9d1547f59d
commit 1470a7294b
No known key found for this signature in database
GPG key ID: 1E0B639A223E3E2D
2 changed files with 4 additions and 2 deletions

View file

@ -47,6 +47,7 @@ use OC\Authentication\Token\IProvider;
use OC\Authentication\Token\IToken;
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;
@ -542,7 +543,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) {

View file

@ -48,6 +48,7 @@ namespace OCP;
use OC\AppScriptDependency;
use OC\AppScriptSort;
use OC\Security\CSRF\CsrfTokenManager;
use bantu\IniGetWrapper\IniGetWrapper;
use Psr\Container\ContainerExceptionInterface;
@ -416,7 +417,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;
}