added return not_found status

nextcloud · Jul 21, 2023 · cd0cdf8 · cd0cdf8
1 parent 125acee
commit cd0cdf8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/lib/Controller/AppConfigController.php b/lib/Controller/AppConfigController.php
@@ -100,7 +100,7 @@ public function setAppConfigValue(string $configKey, mixed $configValue, string
 	public function getAppConfigValues(array $configKeys, string $format = 'json'): Response {
 		$appId = $this->request->getHeader('EX-APP-ID');
 		$result = $this->exAppConfigService->getAppConfigValues($appId, $configKeys);
-		return $this->buildResponse(new DataResponse($result, Http::STATUS_OK), $format);
+		return $this->buildResponse(new DataResponse($result, !empty($result) ? Http::STATUS_OK : Http::STATUS_NOT_FOUND), $format);
 	}
 
 	/**
@@ -119,9 +119,9 @@ public function getAppConfigValues(array $configKeys, string $format = 'json'):
 	public function deleteAppConfigValues(array $configKeys, string $format = 'json'): Response {
 		$appId = $this->request->getHeader('EX-APP-ID');
 		$result = $this->exAppConfigService->deleteAppConfigValues($configKeys, $appId);
-		if ($result !== -1) {
-			return $this->buildResponse(new DataResponse($result, Http::STATUS_OK), $format);
+		if ($result === -1) {
+			throw new OCSBadRequestException('Error deleting app config values');
 		}
-		throw new OCSBadRequestException('Error deleting app config values');
+		return $this->buildResponse(new DataResponse($result, $result !== 0 ? Http::STATUS_OK : Http::STATUS_NOT_FOUND), $format);
 	}
 }
diff --git a/lib/Controller/OCSApiController.php b/lib/Controller/OCSApiController.php
@@ -223,6 +223,11 @@ public function registerFileActionMenu(array $fileActionMenuParams, string $form
 	public function unregisterFileActionMenu(string $fileActionMenuName, string $format = 'json'): Response {
 		$appId = $this->request->getHeader('EX-APP-ID');
 		$unregisteredFileActionMenu = $this->exFilesActionsMenuService->unregisterFileActionMenu($appId, $fileActionMenuName);
+		if ($unregisteredFileActionMenu === null) {
+			return $this->buildResponse(new DataResponse([
+				'error' => $this->l->t('FileActionMenu not found.'),
+			], Http::STATUS_NOT_FOUND), $format);
+		}
 		return $this->buildResponse(new DataResponse([
 			'success' => $unregisteredFileActionMenu !== null,
 			'unregisteredFileActionMenu' => $unregisteredFileActionMenu,

diff --git a/lib/Controller/PreferencesController.php b/lib/Controller/PreferencesController.php
@@ -106,7 +106,7 @@ public function getUserConfigValues(array $configKeys, string $format = 'json'):
 		$userId = $this->userSession->getUser()->getUID();
 		$appId = $this->request->getHeader('EX-APP-ID');
 		$result = $this->exAppPreferenceService->getUserConfigValues($userId, $appId, $configKeys);
-		return $this->buildResponse(new DataResponse($result, Http::STATUS_OK), $format);
+		return $this->buildResponse(new DataResponse($result, !empty($result) ? Http::STATUS_OK : Http::STATUS_NOT_FOUND), $format);
 	}
 
 	/**
@@ -126,9 +126,9 @@ public function deleteUserConfigValues(array $configKeys, string $format = 'json
 		$userId = $this->userSession->getUser()->getUID();
 		$appId = $this->request->getHeader('EX-APP-ID');
 		$result = $this->exAppPreferenceService->deleteUserConfigValues($configKeys, $userId, $appId);
-		if ($result !== -1) {
-			return $this->buildResponse(new DataResponse($result, Http::STATUS_OK), $format);
+		if ($result === -1) {
+			throw new OCSBadRequestException('Failed to delete user config values');
 		}
-		throw new OCSBadRequestException('Failed to delete user config values');
+		return $this->buildResponse(new DataResponse($result, $result !== 0 ? Http::STATUS_OK : Http::STATUS_NOT_FOUND), $format);
 	}
 }
diff --git a/lib/Service/ExAppConfigService.php b/lib/Service/ExAppConfigService.php
@@ -76,7 +76,7 @@ public function getAppConfigValues(string $appId, array $configKeys): ?array {
 	}
 
 	/**
-	 * Set app_config_ex value
+	 * Set appconfig_ex value
 	 *
 	 * @param string $appId
 	 * @param string $configKey
@@ -95,15 +95,15 @@ public function setAppConfigValue(string $appId, string $configKey, mixed $confi
 					'configvalue' => $configValue ?? '',
 					'sensitive' => $sensitive,
 				]));
-			} catch (\Exception $e) {
-				$this->logger->error('Error while inserting app_config_ex value: ' . $e->getMessage(), ['exception' => $e]);
+			} catch (Exception $e) {
+				$this->logger->error(sprintf('Failed to insert appconfig_ex value. Error: %s', $e->getMessage()), ['exception' => $e]);
 				return null;
 			}
 		} else {
 			$appConfigEx->setConfigvalue($configValue);
 			$appConfigEx->setSensitive($sensitive);
 			if ($this->updateAppConfigValue($appConfigEx) !== 1) {
-				$this->logger->error('Error while updating app_config_ex value');
+				$this->logger->error(sprintf('Error while updating appconfig_ex %s value.', $configKey));
 				return null;
 			}
 		}