Refactor `OC\Server::getCsrfTokenManager`

Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 82887f8d02967cfba40895a5497242eaf4ee1613..250df5b414e4e2744bedcdc1bc7f0326d6cc028d 100644 (file)
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -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) {

diff --git a/lib/public/Util.php b/lib/public/Util.php
index bff8038b3dda521a9d8ca85bc1dd0f47a6f0d710..60935af2b16e8d7ff8871340acb50431db841320 100644 (file)
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -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;
        }