From d5213e5466d8f7a49b7bf656085a29d6cf02cf03 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Mon, 26 Oct 2020 14:43:18 +0000 Subject: [PATCH] update skeema file, removing skeema warnings --- mithril_client | 2 +- skeema/gradido_community/roles.sql | 5 ++--- skeema/gradido_community/state_user_roles.sql | 2 +- .../JsonRequestHandlerController.php | 18 ++++++++++++++++++ src/protobuf | 2 +- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/mithril_client b/mithril_client index a04d47699..21d4a0a5e 160000 --- a/mithril_client +++ b/mithril_client @@ -1 +1 @@ -Subproject commit a04d4769974b9d93ba72e490ed7dca3fbaed768c +Subproject commit 21d4a0a5e9a19f251e26c0ae07ce74be2fa99bbf diff --git a/skeema/gradido_community/roles.sql b/skeema/gradido_community/roles.sql index 5444cff76..9fe9de710 100644 --- a/skeema/gradido_community/roles.sql +++ b/skeema/gradido_community/roles.sql @@ -1,6 +1,5 @@ CREATE TABLE `roles` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` int UNSIGNED NOT NULL AUTO_INCREMENT, `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `roles_id_IDX` (`id`) + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/skeema/gradido_community/state_user_roles.sql b/skeema/gradido_community/state_user_roles.sql index 5cbc2baac..207c2de63 100644 --- a/skeema/gradido_community/state_user_roles.sql +++ b/skeema/gradido_community/state_user_roles.sql @@ -1,5 +1,5 @@ CREATE TABLE `state_user_roles` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` int UNSIGNED NOT NULL AUTO_INCREMENT, `state_user_id` int(11) NOT NULL, `role_id` int(11) NOT NULL, PRIMARY KEY (`id`) diff --git a/src/Controller/JsonRequestHandlerController.php b/src/Controller/JsonRequestHandlerController.php index 89d07a93f..f72d5d947 100644 --- a/src/Controller/JsonRequestHandlerController.php +++ b/src/Controller/JsonRequestHandlerController.php @@ -58,11 +58,29 @@ class JsonRequestHandlerController extends AppController { case 'checkUser': return $this->checkUser($jsonData->email, $jsonData->last_name); case 'getUsers' : return $this->getUsers($jsonData->page, $jsonData->limit); case 'getUserBalance': return $this->getUserBalance($jsonData->email, $jsonData->last_name); + case 'errorInTransaction': return $this->errorInTransaction($jsonData->created, $jsonData->transactionGenericHash, $jsonData->error, $jsonData->errorMessage); } return $this->returnJson(['state' => 'error', 'msg' => 'unknown method for post', 'details' => $method]); } return $this->returnJson(['state' => 'error', 'msg' => 'no post or get']); } + + //! \param $transactionCreated creation of transaction in timestamp in seconds + //! -1 if transaction couldn't decode + //! \param $transactionBodyBase64Sha256 generic hash from transaction body serialized and converted to base64 + //! using sodium_crypto_generichash to calculate + // hash also in base64 format + //! \param $error short error name in user language + //! \param $errorDetails more detailed error message in user language + private function errorInTransaction($transactionCreated, $transactionBodyBase64GenericHash, $error, $errorDetails) { + /* + * payload.set("created", created); + * payload.set("id", task_model->getID()); + * payload.set("public_key", user_model->getPublicKeyHex()); + * payload.set("error", error); + * payload.set("errorMessage", errorDetails); + */ + } private function putTransaction($transactionBase64) { $transaction = new Transaction($transactionBase64); diff --git a/src/protobuf b/src/protobuf index 9004e6978..81a461566 160000 --- a/src/protobuf +++ b/src/protobuf @@ -1 +1 @@ -Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca +Subproject commit 81a461566e46d71533dc3e284fa075d7d68fd020