refactor: change getAlgorithmById from static to instance to make it …

…testable Signed-off-by: ernolf <raphael.gradenwitz@googlemail.com>
nextcloud · Aug 8, 2024 · ed19c43 · ed19c43
1 parent bd1990d
commit ed19c43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/Service/ITotp.php b/lib/Service/ITotp.php
@@ -43,7 +43,7 @@ interface ITotp {
 	public const DEFAULT_PERIOD = 30; // Period in seconds
 
 
-	public static function getAlgorithmById(int $id): string;
+	public function getAlgorithmById(int $id): string;
 
 	public function hasSecret(IUser $user): bool;
 

diff --git a/lib/Service/Totp.php b/lib/Service/Totp.php
@@ -106,7 +106,7 @@ public function getDefaultDigits(): int {
 		return ($length >= ITotp::DEFAULT_DIGITS && $length <= self::MAX_DIGITS) ? $length : ITotp::DEFAULT_DIGITS;
 	}
 
-	public static function getAlgorithmById(int $id): string {
+	public function getAlgorithmById(int $id): string {
 		switch ($id) {
 			case ITotp::HASH_SHA1:
 				return \EasyTOTP\TOTPInterface::HASH_SHA1;
@@ -275,7 +275,7 @@ public function validateSecret(IUser $user, string $key): bool {
 		}
 
 		$secret = $this->crypto->decrypt($dbSecret->getSecret());
-		$algorithm = self::getAlgorithmById($this->getAlgorithmId($user));
+		$algorithm = $this->getAlgorithmById($this->getAlgorithmId($user));
 		$digits = $this->getDigits($user);
 		$period = $this->getPeriod($user);
 		$otp = Factory::getTOTP(Base32::decode($secret), $period, $digits, 0, $algorithm);

diff --git a/tests/Unit/Controller/SettingsControllerTest.php b/tests/Unit/Controller/SettingsControllerTest.php
@@ -122,6 +122,12 @@ public function testCreateSecret() {
 			->method('getDefaultDigits')
 			->willReturn(6);
 
+		// Mock the getAlgorithmById method
+		$this->totp->expects($this->once())
+			->method('getAlgorithmById')
+			->with(1)  // Example value for algorithm
+			->willReturn('SHA1');
+
 		$issuer = rawurlencode($this->defaults->getName());
 		$qrUrl = "otpauth://totp/{$issuer}:user%40instance.com?secret=newsecret&issuer=$issuer&algorithm=SHA1&digits=6&period=30&image=";