fix: crypto type made not nullable and tests run using ICrypto

Signed-off-by: yemkareems <[email protected]>
nextcloud · Oct 28, 2024 · a74ef82 · a74ef82
1 parent 505dfd6
commit a74ef82
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/lib/private/Authentication/LoginCredentials/Store.php b/lib/private/Authentication/LoginCredentials/Store.php
@@ -30,13 +30,13 @@ class Store implements IStore {
 	/** @var IProvider|null */
 	private $tokenProvider;
 
-	/** @var Crypto|null */
+	/** @var Crypto */
 	private $crypto;
 
 	public function __construct(ISession $session,
 		LoggerInterface $logger,
-		?IProvider $tokenProvider = null,
-		?Crypto $crypto = null) {
+		Crypto $crypto,
+		?IProvider $tokenProvider = null) {
 		$this->session = $session;
 		$this->logger = $logger;
 		$this->tokenProvider = $tokenProvider;

diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -452,7 +452,7 @@ public function __construct($webRoot, \OC\Config $config) {
 			}
 			$logger = $c->get(LoggerInterface::class);
 			$crypto = $c->get(Crypto::class);
-			return new Store($session, $logger, $tokenProvider, $crypto);
+			return new Store($session, $logger, $crypto, $tokenProvider);
 		});
 		$this->registerAlias(IStore::class, Store::class);
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);

diff --git a/tests/lib/Authentication/LoginCredentials/StoreTest.php b/tests/lib/Authentication/LoginCredentials/StoreTest.php
@@ -13,7 +13,6 @@
 use OC\Authentication\LoginCredentials\Store;
 use OC\Authentication\Token\IProvider;
 use OC\Authentication\Token\IToken;
-use OC\Security\Crypto;
 use OCP\Authentication\Exceptions\CredentialsUnavailableException;
 use OCP\ISession;
 use OCP\Security\ICrypto;
@@ -43,9 +42,9 @@ protected function setUp(): void {
 		$this->session = $this->createMock(ISession::class);
 		$this->tokenProvider = $this->createMock(IProvider::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->crypto = $this->createMock(Crypto::class);
+		$this->crypto = $this->createMock(ICrypto::class);
 
-		$this->store = new Store($this->session, $this->logger, $this->tokenProvider, $this->crypto);
+		$this->store = new Store($this->session, $this->logger, $this->crypto, $this->tokenProvider);
 	}
 
 	public function testAuthenticate(): void {
@@ -60,7 +59,7 @@ public function testAuthenticate(): void {
 			->with($this->equalTo('login_credentials'), $this->equalTo(json_encode($params)));
 		$this->crypto->expects($this->once())
 			->method('encrypt')
-			->willReturn($params['password']);
+			->willReturn('123456');
 
 		$this->store->authenticate($params);
 	}
@@ -73,7 +72,7 @@ public function testSetSession(): void {
 	}
 
 	public function testGetLoginCredentialsNoTokenProvider(): void {
-		$this->store = new Store($this->session, $this->logger, null, $this->crypto);
+		$this->store = new Store($this->session, $this->logger, $this->crypto, null);
 
 		$this->expectException(CredentialsUnavailableException::class);