IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add setSessionId json endpoint for login-server

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-12-11 13:03:22 +00:00 committed by Ulf Gebhardt
parent 730f44c61b
commit efdf86a191
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controller/AppController.php
View File

@ -147,6 +147,10 @@ class AppController extends Controller
//$this->Cookie->configKey('User', 'encryption', false);
if(!$session_id) {
$session_id = intval($this->request->getCookie('GRADIDO_LOGIN', ''));
// TODO: This is unclear if correct
if($session_id == 0 && $session->check('session_id')) {
$session_id = intval($session->read('session_id'));
}
}
$ip = $this->request->clientIp();
if (!$session->check('client_ip')) {

28
src/Controller/JsonRequestHandlerController.php
View File

@ -62,12 +62,25 @@ class JsonRequestHandlerController extends AppController {
case 'getUserBalance': return $this->getUserBalance($jsonData->email, $jsonData->last_name);
case 'errorInTransaction': return $this->errorInTransaction($jsonData);
case 'updateReadNode': return $this->updateReadNode();
case 'setSessionId': return $this->setSessionId($jsonData->session_id);
}
return $this->returnJson(['state' => 'error', 'msg' => 'unknown method for post', 'details' => $method]);
}
return $this->returnJson(['state' => 'error', 'msg' => 'no post or get']);
}
//! for login via ajax call from login server
//! \param session_id from login server
private function setSessionId($session_id)
{
$session = $this->getRequest()->getSession();
if($session_id == '' || !preg_match('/^[0-9]*$/', $session_id)) {
return $this->returnJson(['state' => 'error', 'msg' => 'session id invalid']);
}
$session->write('session_id', $session_id);
return $this->returnJson(['state' => 'success']);
}
// Called from login server like a cron job every 10 minutes or after sending transaction to hedera
private function updateReadNode()
{
@ -80,18 +93,12 @@ class JsonRequestHandlerController extends AppController {
if(!$last_transaction_query->isEmpty()) {
$last_transaction_id = $last_transaction_query->first()->id;
}
if($last_transaction_query->count() < $last_transaction_id) {
$last_transaction_id = $last_transaction_query->count();
}
$group_alias = Configure::read('GroupAlias');
$result = $this->JsonRpcRequestClient->request('getTransactions', ['groupAlias' => $group_alias, 'lastKnownSequenceNumber' => $last_transaction_id]);
$result = (array)$this->JsonRpcRequestClient->request('getTransactions', ['groupAlias' => $group_alias, 'lastKnownSequenceNumber' => $last_transaction_id]);
if(isset($result['state']) && $result['state'] == 'error') {
return $this->returnJson(['state' => 'error', 'msg' => 'jsonrpc error', 'details' => $result]);
}
if(!isset($result['transaction_count']) || $result['transaction_count'] == 0) {
return $this->returnJson(['state' => 'success']);
}
/* example
$result = json_decode("[
{
@ -228,12 +235,7 @@ class JsonRequestHandlerController extends AppController {
$part_count = -1;
$temp_record = new Record;
$errors = [];
foreach($result['blocks'] as $_record) {
if(is_string($_record)) {
// if it is a string, it is block validation hash in hex
continue;
}
foreach($result as $_record) {
$parse_result = $temp_record->parseRecord($_record);
if($parse_result == true) {
$sequenceNumber = $temp_record->getSequenceNumber();

2
src/protobuf

@ -1 +1 @@
Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca
Subproject commit 81a461566e46d71533dc3e284fa075d7d68fd020