fix(versionCheck): use version_compare and IConfig::getSystemValueString('version', '0.0.0') to check the server version

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

lib/Controller/Id4meController.php

@@ -58,7 +58,7 @@ public function __construct(
 		IRequest $request,
 		private ISecureRandom $random,
 		private ISession $session,
-		IConfig $config,
+		private IConfig $config,
 		private IL10N $l10n,
 		private ITimeFactory $timeFactory,
 		private IClientService $clientService,
@@ -322,7 +322,8 @@ public function code(string $state = '', string $code = '', string $scope = '')
 		// Set last password confirm to the future as we don't have passwords to confirm against with SSO
 		$this->session->set('last-password-confirm', $this->timeFactory->getTime() + 4 * 365 * 24 * 3600);
 
-		/** @psalm-suppress UndefinedVariable Replace with ServerVersion once we depends on NC 31 */
-		return new RedirectResponse($OC_Version[0] >= 32 ? $this->urlGenerator->linkToDefaultPageUrl() : \OC_Util::getDefaultPageUrl());
+		/** Replace with ServerVersion once we depends on NC 31 */
+		$is32OrGreater = version_compare($this->config->getSystemValueString('version', '0.0.0'), '32.0.0', '>=');
+		return new RedirectResponse($is32OrGreater ? $this->urlGenerator->linkToDefaultPageUrl() : \OC_Util::getDefaultPageUrl());
 	}
 }

lib/Controller/LoginController.php

@@ -746,8 +746,9 @@ public function code(string $state = '', string $code = '', string $scope = '',
 			return $this->getRedirectResponse($redirectUrl);
 		}
 
-		/** @psalm-suppress UndefinedVariable Replace with ServerVersion once we depends on NC 31 */
-		return new RedirectResponse($OC_Version[0] >= 32 ? $this->urlGenerator->linkToDefaultPageUrl() : \OC_Util::getDefaultPageUrl());
+		/** Replace with ServerVersion once we depends on NC 31 */
+		$is32OrGreater = version_compare($this->config->getSystemValueString('version', '0.0.0'), '32.0.0', '>=');
+		return new RedirectResponse($is32OrGreater ? $this->urlGenerator->linkToDefaultPageUrl() : \OC_Util::getDefaultPageUrl());
 	}
 
 	/**

lib/User/Backend.php

@@ -454,8 +454,8 @@ private function checkFirstLogin(string $userId): bool {
 
 		$firstLogin = $user->getLastLogin() === 0;
 		if ($firstLogin) {
-			/** @psalm-suppress UndefinedVariable Replace with ServerVersion once we depend on NC 31 */
-			if ($OC_Version[0] >= 34) {
+			/** Replace with ServerVersion once we depend on NC 31 */
+			if (version_compare($this->config->getSystemValueString('version', '0.0.0'), '34.0.0', '>=')) {
 				Server::get(ISetupManager::class)->setupForUser($user);
 			} else {
 				\OC_Util::setupFS($userId);