diff options
author | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-01-17 15:24:32 +0100 |
---|---|---|
committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-01-17 15:24:32 +0100 |
commit | 5c42326d5c84160654042bf342c09385066313e4 (patch) | |
tree | 100efc4d7a4aad575a2097a9451954320e57d2ba | |
parent | 326120a7f7713c43084f1eed5f2a1ab1ffd29004 (diff) | |
download | nextcloud-server-fix/update-notification.tar.gz nextcloud-server-fix/update-notification.zip |
fix(updatenotification): Parse pre-release version of appsfix/update-notification
The notitication is correctly created, but the changelog is not show.
We need to make sure the version passed to the manager is in the allowed
format (major.minor.patch).
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
-rw-r--r-- | apps/updatenotification/lib/Controller/APIController.php | 10 | ||||
-rw-r--r-- | apps/updatenotification/tests/Controller/APIControllerTest.php | 176 |
2 files changed, 185 insertions, 1 deletions
diff --git a/apps/updatenotification/lib/Controller/APIController.php b/apps/updatenotification/lib/Controller/APIController.php index 6b4f559f650..00dabbdabfd 100644 --- a/apps/updatenotification/lib/Controller/APIController.php +++ b/apps/updatenotification/lib/Controller/APIController.php @@ -160,7 +160,15 @@ class APIController extends OCSController { */ public function getAppChangelogEntry(string $appId, ?string $version = null): DataResponse { $version = $version ?? $this->appManager->getAppVersion($appId); - $changes = $this->manager->getChangelog($appId, $version); + // handle pre-release versions + $matches = []; + $result = preg_match('/^(\d+\.\d+(\.\d+)?)/', $version, $matches); + if ($result === false || $result === 0) { + return new DataResponse([], Http::STATUS_BAD_REQUEST); + } + $shortVersion = $matches[0]; + + $changes = $this->manager->getChangelog($appId, $shortVersion); if ($changes === null) { return new DataResponse([], Http::STATUS_NOT_FOUND); diff --git a/apps/updatenotification/tests/Controller/APIControllerTest.php b/apps/updatenotification/tests/Controller/APIControllerTest.php new file mode 100644 index 00000000000..1dac7cbb36f --- /dev/null +++ b/apps/updatenotification/tests/Controller/APIControllerTest.php @@ -0,0 +1,176 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCA\UpdateNotification\Tests\Controller; + +use OC\App\AppStore\Fetcher\AppFetcher; +use OCA\UpdateNotification\AppInfo\Application; +use OCA\UpdateNotification\BackgroundJob\ResetToken; +use OCA\UpdateNotification\Controller\AdminController; +use OCA\UpdateNotification\Controller\APIController; +use OCA\UpdateNotification\Manager; +use OCP\App\IAppManager; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\BackgroundJob\IJobList; +use OCP\IAppConfig; +use OCP\IConfig; +use OCP\IL10N; +use OCP\IRequest; +use OCP\IUserSession; +use OCP\L10N\IFactory; +use OCP\Security\ISecureRandom; +use PHPUnit\Framework\Exception; +use PHPUnit\Framework\MockObject\MethodNameNotConfiguredException; +use PHPUnit\Framework\MockObject\MethodParametersAlreadyConfiguredException; +use PHPUnit\Framework\MockObject\IncompatibleReturnValueException; +use PHPUnit\Framework\ExpectationFailedException; +use PHPUnit\Framework\MockObject\MockObject; +use SebastianBergmann\RecursionContext\InvalidArgumentException; +use Test\TestCase; + +class APIControllerTest extends TestCase { + private IRequest&MockObject $request; + private IConfig&MockObject $config; + private IAppManager&MockObject $appManager; + private AppFetcher&MockObject $appFetcher; + private IFactory&MockObject $l10nFactory; + private IUserSession&MockObject $userSession; + private Manager&MockObject $manager; + + private APIController $apiController; + + protected function setUp(): void { + parent::setUp(); + + $this->request = $this->createMock(IRequest::class); + $this->config = $this->createMock(IConfig::class); + $this->appManager = $this->createMock(IAppManager::class); + $this->appFetcher = $this->createMock(AppFetcher::class); + $this->l10nFactory = $this->createMock(IFactory::class); + $this->userSession = $this->createMock(IUserSession::class); + $this->manager = $this->createMock(Manager::class); + + $this->apiController = new APIController( + Application::APP_NAME, + $this->request, + $this->config, + $this->appManager, + $this->appFetcher, + $this->l10nFactory, + $this->userSession, + $this->manager, + ); + } + + /** + * @dataProvider dataGetAppChangelog + */ + public function testGetAppChangelogEntry( + array $params, + bool $hasChanges, + array $appInfo, + array $expected, + ): void { + $this->appManager->method('getAppInfo') + ->with('the-app') + ->willReturn($appInfo); + $this->appManager->method('getAppVersion') + ->with('the-app') + ->willReturn($appInfo['version']); + $this->manager->method('getChangelog') + ->with('the-app', self::anything()) + ->willReturnCallback(fn ($app, $version) => $hasChanges ? "$app v$version" : null); + + $result = $this->apiController->getAppChangelogEntry(...$params); + $this->assertEquals($result->getStatus(), $expected['status']); + $this->assertEquals($result->getData(), $expected['data']); + } + + public static function dataGetAppChangelog(): array { + return [ + 'no changes found' => [ + ['the-app', null], + false, + [ + 'name' => 'Localized name', + 'version' => '1.0.0', + ], + [ + 'status' => Http::STATUS_NOT_FOUND, + 'data' => [], + ] + ], + 'changes with version parameter' => [ + ['the-app', '1.0.0'], + true, + [ + 'name' => 'Localized name', + 'version' => '1.2.0', // installed version + ], + [ + 'status' => Http::STATUS_OK, + 'data' => [ + 'appName' => 'Localized name', + 'content' => 'the-app v1.0.0', + 'version' => '1.0.0', + ], + ] + ], + 'changes without version parameter' => [ + ['the-app', null], + true, + [ + 'name' => 'Localized name', + 'version' => '1.2.0', + ], + [ + 'status' => Http::STATUS_OK, + 'data' => [ + 'appName' => 'Localized name', + 'content' => 'the-app v1.2.0', + 'version' => '1.2.0', + ], + ] + ], + 'changes of pre-release version' => [ + ['the-app', null], + true, + [ + 'name' => 'Localized name', + 'version' => '1.2.0-alpha.1', + ], + [ + 'status' => Http::STATUS_OK, + 'data' => [ + 'appName' => 'Localized name', + 'content' => 'the-app v1.2.0', + 'version' => '1.2.0-alpha.1', + ], + ] + ], + 'changes of pre-release version as parameter' => [ + ['the-app', '1.2.0-alpha.2'], + true, + [ + 'name' => 'Localized name', + 'version' => '1.2.0-beta.3', + ], + [ + 'status' => Http::STATUS_OK, + 'data' => [ + 'appName' => 'Localized name', + 'content' => 'the-app v1.2.0', + 'version' => '1.2.0-alpha.2', + ], + ] + ], + ]; + } +} |