Merge branch 'master' into refactor/OC-Server-getCsrfTokenManager

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

diff --cc lib/private/User/Session.php
index 250df5b414e4e2744bedcdc1bc7f0326d6cc028d,9d77a90c5416b2dc5dd973c118d844050d641b4f..e5d2717251970bdb2712ab603f58c54ff5720b75
--- 1/lib/private/User/Session.php
--- 2/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@@ -45,9 -11,10 +11,11 @@@ use OC\Authentication\Exceptions\Passwo
  use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
  use OC\Authentication\Token\IProvider;
  use OC\Authentication\Token\IToken;
+ 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;

diff --cc lib/public/Util.php
index 60935af2b16e8d7ff8871340acb50431db841320,a8ac1e4ee7c377dd8a695a1a82fe2b483641d89b..97401cfa4cd52fb5d4ba7600f670809533aa307c
--- 1/lib/public/Util.php
--- 2/lib/public/Util.php
+++ b/lib/public/Util.php
@@@ -46,11 -10,12 +10,13 @@@
  
  namespace OCP;
  
+ use bantu\IniGetWrapper\IniGetWrapper;
  use OC\AppScriptDependency;
  use OC\AppScriptSort;
- use bantu\IniGetWrapper\IniGetWrapper;
 +use OC\Security\CSRF\CsrfTokenManager;
+ use OCP\Share\IManager;
  use Psr\Container\ContainerExceptionInterface;
+ use Psr\Log\LoggerInterface;
  
  /**
   * This class provides different helper functions to make the life of a developer easier