From 0d7f7e5495a56f776e8593e1b6ba80da9e8c0dbd Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 30 Aug 2019 18:00:32 +0200
Subject: [PATCH] kill old non-OCS Controller
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
apps/workflowengine/appinfo/routes.php | 4 -
.../composer/composer/autoload_classmap.php | 1 -
.../composer/composer/autoload_static.php | 1 -
.../lib/Controller/FlowOperations.php | 128 ------------------
4 files changed, 134 deletions(-)
delete mode 100644 apps/workflowengine/lib/Controller/FlowOperations.php
diff --git a/apps/workflowengine/appinfo/routes.php b/apps/workflowengine/appinfo/routes.php
index c650bee4cf2..3798c2a852c 100644
--- a/apps/workflowengine/appinfo/routes.php
+++ b/apps/workflowengine/appinfo/routes.php
@@ -21,10 +21,6 @@
return [
'routes' => [
- ['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
- ['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
- ['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
- ['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
],
'ocs-resources' => [
diff --git a/apps/workflowengine/composer/composer/autoload_classmap.php b/apps/workflowengine/composer/composer/autoload_classmap.php
index 637f1a8abff..d0331ea4d4e 100644
--- a/apps/workflowengine/composer/composer/autoload_classmap.php
+++ b/apps/workflowengine/composer/composer/autoload_classmap.php
@@ -19,7 +19,6 @@ return array(
'OCA\\WorkflowEngine\\Check\\UserGroupMembership' => $baseDir . '/../lib/Check/UserGroupMembership.php',
'OCA\\WorkflowEngine\\Command\\Index' => $baseDir . '/../lib/Command/Index.php',
'OCA\\WorkflowEngine\\Controller\\AWorkflowController' => $baseDir . '/../lib/Controller/AWorkflowController.php',
- 'OCA\\WorkflowEngine\\Controller\\FlowOperations' => $baseDir . '/../lib/Controller/FlowOperations.php',
'OCA\\WorkflowEngine\\Controller\\GlobalWorkflowsController' => $baseDir . '/../lib/Controller/GlobalWorkflowsController.php',
'OCA\\WorkflowEngine\\Controller\\RequestTime' => $baseDir . '/../lib/Controller/RequestTime.php',
'OCA\\WorkflowEngine\\Controller\\UserWorkflowsController' => $baseDir . '/../lib/Controller/UserWorkflowsController.php',
diff --git a/apps/workflowengine/composer/composer/autoload_static.php b/apps/workflowengine/composer/composer/autoload_static.php
index edf3f3b0518..156f49a69ac 100644
--- a/apps/workflowengine/composer/composer/autoload_static.php
+++ b/apps/workflowengine/composer/composer/autoload_static.php
@@ -34,7 +34,6 @@ class ComposerStaticInitWorkflowEngine
'OCA\\WorkflowEngine\\Check\\UserGroupMembership' => __DIR__ . '/..' . '/../lib/Check/UserGroupMembership.php',
'OCA\\WorkflowEngine\\Command\\Index' => __DIR__ . '/..' . '/../lib/Command/Index.php',
'OCA\\WorkflowEngine\\Controller\\AWorkflowController' => __DIR__ . '/..' . '/../lib/Controller/AWorkflowController.php',
- 'OCA\\WorkflowEngine\\Controller\\FlowOperations' => __DIR__ . '/..' . '/../lib/Controller/FlowOperations.php',
'OCA\\WorkflowEngine\\Controller\\GlobalWorkflowsController' => __DIR__ . '/..' . '/../lib/Controller/GlobalWorkflowsController.php',
'OCA\\WorkflowEngine\\Controller\\RequestTime' => __DIR__ . '/..' . '/../lib/Controller/RequestTime.php',
'OCA\\WorkflowEngine\\Controller\\UserWorkflowsController' => __DIR__ . '/..' . '/../lib/Controller/UserWorkflowsController.php',
diff --git a/apps/workflowengine/lib/Controller/FlowOperations.php b/apps/workflowengine/lib/Controller/FlowOperations.php
deleted file mode 100644
index 7ed2604ce06..00000000000
--- a/apps/workflowengine/lib/Controller/FlowOperations.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Morris Jobke <hey@morrisjobke.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\WorkflowEngine\Controller;
-
-use OCA\WorkflowEngine\Manager;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\IRequest;
-
-class FlowOperations extends Controller {
-
- /** @var Manager */
- protected $manager;
-
- /**
- * @param IRequest $request
- * @param Manager $manager
- */
- public function __construct(IRequest $request, Manager $manager) {
- parent::__construct('workflowengine', $request);
- $this->manager = $manager;
- }
-
- /**
- * @NoCSRFRequired
- *
- * @param string $class
- * @return JSONResponse
- */
- public function getOperations($class) {
- $operations = $this->manager->getOperations($class);
-
- foreach ($operations as &$operation) {
- $operation = $this->prepareOperation($operation);
- }
-
- return new JSONResponse($operations);
- }
-
- /**
- * @PasswordConfirmationRequired
- *
- * @param string $class
- * @param string $name
- * @param array[] $checks
- * @param string $operation
- * @return JSONResponse The added element
- */
- public function addOperation($class, $name, $checks, $operation) {
- try {
- $operation = $this->manager->addOperation($class, $name, $checks, $operation);
- $operation = $this->prepareOperation($operation);
- return new JSONResponse($operation);
- } catch (\UnexpectedValueException $e) {
- return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
- }
- }
-
- /**
- * @PasswordConfirmationRequired
- *
- * @param int $id
- * @param string $name
- * @param array[] $checks
- * @param string $operation
- * @return JSONResponse The updated element
- */
- public function updateOperation($id, $name, $checks, $operation) {
- try {
- $operation = $this->manager->updateOperation($id, $name, $checks, $operation);
- $operation = $this->prepareOperation($operation);
- return new JSONResponse($operation);
- } catch (\UnexpectedValueException $e) {
- return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
- }
- }
-
- /**
- * @PasswordConfirmationRequired
- *
- * @param int $id
- * @return JSONResponse
- */
- public function deleteOperation($id) {
- $deleted = $this->manager->deleteOperation((int) $id);
- return new JSONResponse($deleted);
- }
-
- /**
- * @param array $operation
- * @return array
- */
- protected function prepareOperation(array $operation) {
- $checkIds = json_decode($operation['checks'], true);
- $checks = $this->manager->getChecks($checkIds);
-
- $operation['checks'] = [];
- foreach ($checks as $check) {
- // Remove internal values
- unset($check['id']);
- unset($check['hash']);
-
- $operation['checks'][] = $check;
- }
-
- return $operation;
- }
-}
--
GitLab