fix: small adjustments

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

Author: andrey18106

lib/Migration/Version032002Date20250527174907.php

@@ -62,7 +62,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 		$qbSelect = $this->connection->getQueryBuilder();
 		$qbSelect->select(['id', 'configvalue'])
 			->from('appconfig_ex')
-			->where($qbSelect->expr()->eq('sensitive', $qbSelect->createNamedParameter(1)));
+			->where($qbSelect->expr()->eq('sensitive', $qbSelect->createNamedParameter(1, Types::SMALLINT)));
 		$req = $qbSelect->executeQuery();
 
 		while ($row = $req->fetch()) {
@@ -74,7 +74,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 					$qbUpdate->update('appconfig_ex')
 						->set('configvalue', $qbUpdate->createNamedParameter($encryptedValue))
 						->where(
-							$qbUpdate->expr()->eq('id', $qbUpdate->createNamedParameter($row['id']))
+							$qbUpdate->expr()->eq('id', $qbUpdate->createNamedParameter($row['id'], Types::INTEGER))
 						);
 					$qbUpdate->executeStatement();
 				} catch (\Exception $e) {

lib/Service/ExAppConfigService.php

@@ -54,20 +54,22 @@ public function getAppConfigValues(string $appId, array $configKeys): ?array {
 
 	public function setAppConfigValue(string $appId, string $configKey, mixed $configValue, ?int $sensitive = null): ?ExAppConfig {
 		$appConfigEx = $this->getAppConfig($appId, $configKey);
-		if ($sensitive) {
+		if ($configValue !== '' && $sensitive) {
 			try {
 				$encryptedValue = $this->crypto->encrypt($configValue);
 			} catch (\Exception $e) {
 				$this->logger->error(sprintf('Failed to encrypt sensitive value for app %s, config key %s. Error: %s', $appId, $configKey, $e->getMessage()), ['exception' => $e]);
 				return null;
 			}
+		} else {
+			$encryptedValue = '';
 		}
 		if ($appConfigEx === null) {
 			try {
 				$appConfigEx = $this->mapper->insert(new ExAppConfig([
 					'appid' => $appId,
 					'configkey' => $configKey,
-					'configvalue' => $sensitive ? $encryptedValue ?? '' : $configValue ?? '',
+					'configvalue' => $sensitive ? $encryptedValue : $configValue ?? '',
 					'sensitive' => $sensitive ?? 0,
 				]));
 			} catch (Exception $e) {
@@ -85,6 +87,7 @@ public function setAppConfigValue(string $appId, string $configKey, mixed $confi
 			}
 		}
 		if ($sensitive) {
+			// setting original unencrypted value for API
 			$appConfigEx->setConfigvalue($configValue);
 		}
 		return $appConfigEx;

lib/Service/ExAppPreferenceService.php

@@ -36,21 +36,23 @@ public function setUserConfigValue(string $userId, string $appId, string $config
 		} catch (DoesNotExistException|MultipleObjectsReturnedException|Exception) {
 			$exAppPreference = null;
 		}
-		if ($sensitive) {
+		if ($configValue !== '' && $sensitive) {
 			try {
 				$encryptedValue = $this->crypto->encrypt($configValue);
 			} catch (\Exception $e) {
 				$this->logger->error('Failed to encrypt sensitive value: ' . $e->getMessage(), ['exception' => $e]);
 				return null;
 			}
+		} else {
+			$encryptedValue = '';
 		}
 		if ($exAppPreference === null) {
 			try {
 				return $this->mapper->insert(new ExAppPreference([
 					'userid' => $userId,
 					'appid' => $appId,
 					'configkey' => $configKey,
-					'configvalue' => $sensitive ? $encryptedValue ?? '' : $configValue ?? '',
+					'configvalue' => $sensitive ? $encryptedValue : $configValue ?? '',
 					'sensitive' => $sensitive ?? 0,
 				]));
 			} catch (Exception $e) {
@@ -73,6 +75,7 @@ public function setUserConfigValue(string $userId, string $appId, string $config
 			}
 		}
 		if ($sensitive) {
+			// setting original unencrypted value for API
 			$exAppPreference->setConfigvalue($configValue);
 		}
 		return $exAppPreference;