Merge pull request #624 from nextcloud/automated/noid/master-update-n…

…extcloud-ocp
nextcloud · Mar 13, 2024 · 06fe58d · 06fe58d
2 parents 8d052e8 + 7cb1548
commit 06fe58d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -63,7 +63,7 @@ public function registerSites(
 
 		foreach ($sites as $site) {
 			if ($site['type'] === SitesManager::TYPE_QUOTA) {
-				$settingsManager->registerSetting(IManager::KEY_PERSONAL_SETTINGS, Personal::class);
+				$settingsManager->registerSetting(IManager::SETTINGS_PERSONAL, Personal::class);
 				continue;
 			}
 

diff --git a/lib/JWTManager.php b/lib/JWTManager.php
@@ -27,15 +27,15 @@
 use OCA\External\AppInfo\Application;
 use OCA\External\Vendor\Firebase\JWT\JWT;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\IConfig;
+use OCP\IAppConfig;
 use OCP\IURLGenerator;
 
 class JWTManager {
-	protected IConfig $config;
+	protected IAppConfig $config;
 	protected ITimeFactory $timeFactory;
 	protected IURLGenerator $urlGenerator;
 
-	public function __construct(IConfig $config,
+	public function __construct(IAppConfig $config,
 		ITimeFactory $timeFactory,
 		IURLGenerator $urlGenerator) {
 		$this->config = $config;
@@ -70,7 +70,7 @@ public function getTokenPublicKey(?string $alg = null): string {
 		}
 		$this->ensureTokenKeys($alg);
 
-		return $this->config->getAppValue(Application::APP_ID, 'jwt_token_pubkey_' . strtolower($alg));
+		return $this->config->getValueString(Application::APP_ID, 'jwt_token_pubkey_' . strtolower($alg));
 	}
 
 	protected function getTokenPrivateKey(?string $alg = null): string {
@@ -79,11 +79,11 @@ protected function getTokenPrivateKey(?string $alg = null): string {
 		}
 		$this->ensureTokenKeys($alg);
 
-		return $this->config->getAppValue(Application::APP_ID, 'jwt_token_privkey_' . strtolower($alg));
+		return $this->config->getValueString(Application::APP_ID, 'jwt_token_privkey_' . strtolower($alg));
 	}
 
 	protected function ensureTokenKeys(string $alg): void {
-		$secret = $this->config->getAppValue(Application::APP_ID, 'jwt_token_privkey_' . strtolower($alg));
+		$secret = $this->config->getValueString(Application::APP_ID, 'jwt_token_privkey_' . strtolower($alg));
 		if ($secret) {
 			return;
 		}
@@ -117,11 +117,11 @@ protected function ensureTokenKeys(string $alg): void {
 			throw new \Exception('Unsupported algorithm ' . $alg);
 		}
 
-		$this->config->setAppValue(Application::APP_ID, 'jwt_token_privkey_' . strtolower($alg), $secret);
-		$this->config->setAppValue(Application::APP_ID, 'jwt_token_pubkey_' . strtolower($alg), $public);
+		$this->config->setValueString(Application::APP_ID, 'jwt_token_privkey_' . strtolower($alg), $secret);
+		$this->config->setValueString(Application::APP_ID, 'jwt_token_pubkey_' . strtolower($alg), $public);
 	}
 
 	protected function getTokenAlgorithm(): string {
-		return $this->config->getAppValue(Application::APP_ID, 'jwt_token_alg', 'ES256');
+		return $this->config->getValueString(Application::APP_ID, 'jwt_token_alg', 'ES256');
 	}
 }
diff --git a/lib/SitesManager.php b/lib/SitesManager.php
@@ -33,7 +33,7 @@
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
-use OCP\IConfig;
+use OCP\IAppConfig;
 use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\IUser;
@@ -55,7 +55,7 @@ class SitesManager {
 	/** @var IRequest */
 	protected $request;
 
-	/** @var IConfig */
+	/** @var IAppConfig */
 	protected $config;
 
 	/** @var IFactory */
@@ -78,7 +78,7 @@ class SitesManager {
 
 
 	public function __construct(IRequest $request,
-		IConfig $config,
+		IAppConfig $config,
 		IAppManager $appManager,
 		IGroupManager $groupManager,
 		IUserSession $userSession,
@@ -166,7 +166,7 @@ public function getSitesToDisplay() {
 	 * @return array[]
 	 */
 	public function getSites() {
-		$jsonEncodedList = $this->config->getAppValue('external', 'sites', '');
+		$jsonEncodedList = $this->config->getValueString('external', 'sites', '');
 		$sites = json_decode($jsonEncodedList, true);
 
 		if (!is_array($sites) || empty($sites)) {
@@ -217,7 +217,7 @@ protected function fillSiteArray(array $site): array {
 	 * @throws IconNotFoundException
 	 */
 	public function addSite($name, $url, $lang, $type, $device, $icon, array $groups, $redirect) {
-		$id = 1 + (int) $this->config->getAppValue('external', 'max_site', '0');
+		$id = 1 + $this->config->getValueInt('external', 'max_site');
 
 		if ($name === '') {
 			throw new InvalidNameException();
@@ -282,8 +282,8 @@ public function addSite($name, $url, $lang, $type, $device, $icon, array $groups
 			'groups' => $groups,
 			'redirect' => $redirect,
 		];
-		$this->config->setAppValue('external', 'sites', json_encode($sites));
-		$this->config->setAppValue('external', 'max_site', (string)$id);
+		$this->config->setValueString('external', 'sites', json_encode($sites));
+		$this->config->setValueInt('external', 'max_site', $id);
 
 		return $sites[$id];
 	}
@@ -376,7 +376,7 @@ public function updateSite($id, $name, $url, $lang, $type, $device, $icon, array
 			'groups' => $groups,
 			'redirect' => $redirect,
 		];
-		$this->config->setAppValue('external', 'sites', json_encode($sites));
+		$this->config->setValueString('external', 'sites', json_encode($sites));
 
 		return $sites[$id];
 	}
@@ -388,7 +388,7 @@ public function deleteSite(int $id): void {
 		}
 
 		unset($sites[$id]);
-		$this->config->setAppValue('external', 'sites', json_encode($sites));
+		$this->config->setValueString('external', 'sites', json_encode($sites));
 	}
 
 	/**
@@ -407,8 +407,8 @@ protected function getSitesFromOldConfig(array $sites): array {
 			]);
 		}
 
-		$this->config->setAppValue('external', 'sites', json_encode($fixedSites));
-		$this->config->setAppValue('external', 'max_site', (string)max(array_keys($fixedSites)));
+		$this->config->setValueString('external', 'sites', json_encode($fixedSites));
+		$this->config->setValueInt('external', 'max_site', max(array_keys($fixedSites)));
 		return $fixedSites;
 	}