remove CSP listener

Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
nextcloud · Oct 9, 2023 · b93fe67 · b93fe67
1 parent ccc4c76
commit b93fe67
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 82 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -41,8 +41,8 @@
 		['name' => 'openProjectAPI#getOpenProjectOauthURLWithStateAndPKCE', 'url' => '/op-oauth-url', 'verb' => 'GET'],
 		['name' => 'openProjectAPI#getProjectFolderSetupStatus', 'url' => '/project-folder-status', 'verb' => 'GET'],
 		['name' => 'openProjectAPI#getAvailableOpenProjectProjects', 'url' => '/projects','verb' => 'GET'],
-		['name' => 'openProjectAPI#getOpenProjectWorkPackageForm', 'url' => '/projects/{id}/work-packages/form','verb' => 'POST'],
-		['name' => 'openProjectAPI#getAvailableAssignees', 'url' => '/projects/{id}/available-assignees','verb' => 'GET'],
+		['name' => 'openProjectAPI#getOpenProjectWorkPackageForm', 'url' => '/projects/{projectId}/work-packages/form','verb' => 'POST'],
+		['name' => 'openProjectAPI#getAvailableAssigneesOfAProject', 'url' => '/projects/{projectId}/available-assignees','verb' => 'GET'],
 		['name' => 'openProjectAPI#createWorkPackages', 'url' => '/create/work-packages','verb' => 'POST'],
 	],
 	'ocs' => [

diff --git a/lib/Controller/OpenProjectAPIController.php b/lib/Controller/OpenProjectAPIController.php
@@ -382,18 +382,18 @@ public function getAvailableOpenProjectProjects(): DataResponse {
 	/**
 	 * @NoAdminRequired
 	 *
-	 * @param string $id
+	 * @param string $projectId
 	 * @param array<mixed> $body body is same in the format that openproject api expects the body to be
 	 * @return DataResponse
 	 */
-	public function getOpenProjectWorkPackageForm(string $id, array $body): DataResponse {
+	public function getOpenProjectWorkPackageForm(string $projectId, array $body): DataResponse {
 		if ($this->accessToken === '') {
 			return new DataResponse('', Http::STATUS_UNAUTHORIZED);
 		} elseif (!OpenProjectAPIService::validateURL($this->openprojectUrl)) {
 			return new DataResponse('', Http::STATUS_BAD_REQUEST);
 		}
 		try {
-			$result = $this->openprojectAPIService->getOpenProjectWorkPackageForm($this->userId, $id, $body);
+			$result = $this->openprojectAPIService->getOpenProjectWorkPackageForm($this->userId, $projectId, $body);
 		} catch (OpenprojectErrorException $e) {
 			return new DataResponse($e->getMessage(), $e->getcode());
 		} catch (\Exception $e) {
@@ -403,19 +403,20 @@ public function getOpenProjectWorkPackageForm(string $id, array $body): DataResp
 	}
 
 	/**
+	 * @NoCSRFRequired
 	 * @NoAdminRequired
 	 *
-	 * @param string $id
+	 * @param string $projectId
 	 * @return DataResponse
 	 */
-	public function getAvailableAssignees(string $id): DataResponse {
+	public function getAvailableAssigneesOfAProject(string $projectId): DataResponse {
 		if ($this->accessToken === '') {
 			return new DataResponse('', Http::STATUS_UNAUTHORIZED);
 		} elseif (!OpenProjectAPIService::validateURL($this->openprojectUrl)) {
 			return new DataResponse('', Http::STATUS_BAD_REQUEST);
 		}
 		try {
-			$result = $this->openprojectAPIService->getAvailableAssignees($this->userId, $id);
+			$result = $this->openprojectAPIService->getAvailableAssigneesOfAProject($this->userId, $projectId);
 		} catch (OpenprojectErrorException $e) {
 			return new DataResponse($e->getMessage(), $e->getcode());
 		} catch (\Exception $e) {

diff --git a/lib/Listener/AddContentSecurityPolicyListener.php b/lib/Listener/AddContentSecurityPolicyListener.php
diff --git a/lib/Service/OpenProjectAPIService.php b/lib/Service/OpenProjectAPIService.php
@@ -1342,7 +1342,7 @@ public function getOpenProjectWorkPackageForm(string $userId, string $projectId,
 	 * @return array<mixed>
 	 * @throws OpenprojectResponseException|PreConditionNotMetException|OpenprojectErrorException
 	 */
-	public function getAvailableAssignees(string $userId, string $projectId): array {
+	public function getAvailableAssigneesOfAProject(string $userId, string $projectId): array {
 		$result = $this->request($userId, 'projects/'.$projectId.'/available_assignees');
 		if (isset($result['error'])) {
 			throw new OpenprojectErrorException($result['error'], $result['statusCode']);

diff --git a/tests/lib/Controller/OpenProjectAPIControllerTest.php b/tests/lib/Controller/OpenProjectAPIControllerTest.php
@@ -1479,4 +1479,116 @@ public function testGetOpenProjectWorkPackageForm(): void {
 		$this->assertSame(Http::STATUS_OK, $response->getStatus());
 		$this->assertSame($result, $response->getData());
 	}
+
+	/**
+	 * @param \Exception $exception
+	 * @param int $expectedHttpStatusCode
+	 * @param string $expectedError
+	 * @dataProvider exceptionDataProvider
+	 *
+	 *@return void
+	 */
+	public function testGetOpenProjectWorkPackageFormException(Exception $exception, int $expectedHttpStatusCode, string $expectedError) {
+		$this->getUserValueMock();
+		$service = $this->getMockBuilder(OpenProjectAPIService::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$service
+			->method('getOpenProjectWorkPackageForm')
+			->willThrowException($exception);
+		$controller = new OpenProjectAPIController(
+			'integration_openproject',
+			$this->requestMock,
+			$this->configMock,
+			$service,
+			$this->urlGeneratorMock,
+			$this->loggerMock,
+			'test'
+		);
+		$response = $controller->getOpenProjectWorkPackageForm(6, ["_links" => [
+			"type" => [
+				"href" => "/api/v3/types/2",
+				"title" => "Milestone"
+			]]]);
+		$this->assertSame($expectedHttpStatusCode, $response->getStatus());
+		$this->assertSame($expectedError, $response->getData());
+	}
+
+	public function testGetAvailableAssigneesOfAProject() {
+		$this->getUserValueMock();
+		$result = [ 0 => [
+			"_type" => "User",
+			"id" => 10,
+			"name" => "openproject admin",
+			"_links" => [
+				"self" => [
+					"href" => "/api/v3/users/10",
+					"title" => "openproject admin"
+				]
+			]
+		],
+			1 => [
+				"_type" => "User",
+				"id" => 11,
+				"name" => "openproject member",
+				"_links" => [
+					"self" => [
+						"href" => "/api/v3/users/11",
+						"title" => "openproject member"
+					]
+				]
+			]
+		];
+		$service = $this->getMockBuilder(OpenProjectAPIService::class)
+			->disableOriginalConstructor()
+			->onlyMethods(['getAvailableAssigneesOfAProject'])
+			->getMock();
+		$service->expects($this->once())
+			->method('getAvailableAssigneesOfAProject')
+			->with('test', 6)
+			->willReturn($result);
+		$controller = new OpenProjectAPIController(
+			'integration_openproject',
+			$this->requestMock,
+			$this->configMock,
+			$service,
+			$this->urlGeneratorMock,
+			$this->loggerMock,
+			'test'
+		);
+		$response = $controller->getAvailableAssigneesOfAProject(6);
+		$this->assertSame(Http::STATUS_OK, $response->getStatus());
+		$this->assertSame(
+			$result, $response->getData());
+	}
+
+	/**
+	 * @param \Exception $exception
+	 * @param int $expectedHttpStatusCode
+	 * @param string $expectedError
+	 * @dataProvider exceptionDataProvider
+	 *
+	 *@return void
+	 */
+	public function testGetAvailableAssigneesOfAProjectException(Exception $exception, int $expectedHttpStatusCode, string $expectedError) {
+		$this->getUserValueMock();
+		$service = $this->getMockBuilder(OpenProjectAPIService::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$service
+			->method('getAvailableAssigneesOfAProject')
+			->willThrowException($exception);
+		$controller = new OpenProjectAPIController(
+			'integration_openproject',
+			$this->requestMock,
+			$this->configMock,
+			$service,
+			$this->urlGeneratorMock,
+			$this->loggerMock,
+			'test'
+		);
+		$response = $controller->getAvailableAssigneesOfAProject(6);
+		$this->assertSame($expectedHttpStatusCode, $response->getStatus());
+		$this->assertSame($expectedError, $response->getData());
+	}
 }