mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
check in send coins if receiver was disabled
This commit is contained in:
Dario Rekowski on RockPI
parent
224714b16d
commit
59031cc19a
@ -1 +1 @@
|
||||
Subproject commit a04d4769974b9d93ba72e490ed7dca3fbaed768c
|
||||
Subproject commit 21d4a0a5e9a19f251e26c0ae07ce74be2fa99bbf
|
||||
@ -137,10 +137,10 @@ class TransactionSendCoinsController extends AppController
|
||||
$session = $this->getRequest()->getSession();
|
||||
$user = $session->read('StateUser');
|
||||
// var_dump($user);
|
||||
if (!$user) {
|
||||
if(!$user) {
|
||||
//return $this->redirect(Router::url('/', true) . 'account/', 303);
|
||||
$result = $this->requestLogin();
|
||||
if ($result !== true) {
|
||||
if($result !== true) {
|
||||
return $result;
|
||||
}
|
||||
$user = $session->read('StateUser');
|
||||
@ -155,43 +155,46 @@ class TransactionSendCoinsController extends AppController
|
||||
|
||||
$requestData = $this->request->getData();
|
||||
$mode = 'next';
|
||||
if (isset($requestData['add'])) {
|
||||
$mode = 'add';
|
||||
}
|
||||
if ($transferForm->validate($requestData)) {
|
||||
if(isset($requestData['add'])) {$mode = 'add'; }
|
||||
if($transferForm->validate($requestData)) {
|
||||
|
||||
$receiverPubKeyHex = '';
|
||||
$senderPubKeyHex = $user['public_hex'];
|
||||
$amountCent = $this->GradidoNumber->parseInputNumberToCentNumber($requestData['amount']);
|
||||
|
||||
if (!isset($user['balance']) || $amountCent > $user['balance']) {
|
||||
if(!isset($user['balance']) || $amountCent > $user['balance']) {
|
||||
$this->Flash->error(__('Du hast nicht genug Geld!'));
|
||||
return;
|
||||
}
|
||||
|
||||
$receiverEmail = $requestData['email'];
|
||||
if ($receiverEmail === $user['email']) {
|
||||
if($receiverEmail === $user['email']) {
|
||||
$this->Flash->error(__('Du kannst dir leider nicht selbst Geld schicken!'));
|
||||
return;
|
||||
}
|
||||
$receiverPubkeyHex ='';
|
||||
$response = $this->JsonRequestClient->sendRequest(json_encode([
|
||||
$requestAnswear = $this->JsonRequestClient->sendRequest(json_encode([
|
||||
'session_id' => $session->read('session_id'),
|
||||
'email' => $receiverEmail,
|
||||
'ask' => ['user.pubkeyhex']
|
||||
'ask' => ['user.pubkeyhex', 'user.disabled']
|
||||
]), '/getUserInfos');
|
||||
if ('success' == $response['state'] && 'success' == $response['data']['state']) {
|
||||
if('success' == $requestAnswear['state'] && 'success' == $requestAnswear['data']['state']) {
|
||||
// will be allways 64 byte long, even if it is empty
|
||||
$receiverPubKeyHex = $response['data']['userData']['pubkeyhex'];
|
||||
} elseif ('success' == $response['state'] && 'not found' == $response['data']['state']) {
|
||||
return $this->redirect($this->loginServerUrl . 'account', 303);
|
||||
$receiverPubKeyHex = $requestAnswear['data']['userData']['pubkeyhex'];
|
||||
} else {
|
||||
$this->addAdminError('TransactionSendCoins', 'create', $response, $user['id']);
|
||||
$this->addAdminError('TransactionSendCoins', 'create', $requestAnswear, $user['id']);
|
||||
$this->Flash->error(__('Der Empfänger wurde nicht auf dem Login-Server gefunden, hat er sein Konto schon angelegt?'));
|
||||
$this->set('timeUsed', microtime(true) - $startTime);
|
||||
return;
|
||||
}
|
||||
if($requestAnswear['data']['userData']['disabled']) {
|
||||
$this->Flash->error(__('Der Empfänger ist deaktiviert, daher können ihm zurzeit keine Gradidos gesendet werden.'));
|
||||
$this->set('timeUsed', microtime(true) - $startTime);
|
||||
return;
|
||||
}
|
||||
|
||||
if (0 == ord($receiverPubKeyHex)) {
|
||||
|
||||
if(0 == ord($receiverPubKeyHex)) {
|
||||
$stateUserTable = TableRegistry::getTableLocator()->get('StateUsers');
|
||||
$receiverUser = $stateUserTable
|
||||
->find('all')
|
||||
@ -200,19 +203,20 @@ class TransactionSendCoinsController extends AppController
|
||||
->where(['email' => $receiverEmail]);
|
||||
|
||||
|
||||
if (!$receiverUser) {
|
||||
if(!$receiverUser) {
|
||||
$this->Flash->error(__('Diese E-Mail ist mir nicht bekannt, hat dein Empfänger denn schon ein Gradido-Konto?'));
|
||||
$this->set('timeUsed', microtime(true) - $startTime);
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($receiverUser->public_key)) {
|
||||
if(isset($receiverUser->public_key)) {
|
||||
$receiverPubKeyHex = bin2hex(stream_get_contents($receiverUser->public_key));
|
||||
} else {
|
||||
$this->Flash->error(__('Das Konto mit der E-Mail: ' . $receiverEmail . ' wurde noch nicht aktiviert und kann noch keine GDD empfangen!'));
|
||||
$this->set('timeUsed', microtime(true) - $startTime);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
//var_dump($sessionStateUser);
|
||||
|
||||
@ -222,7 +226,8 @@ class TransactionSendCoinsController extends AppController
|
||||
$receiverPubKeyHex,
|
||||
$senderPubKeyHex
|
||||
);
|
||||
if ($builderResult['state'] === 'success') {
|
||||
if($builderResult['state'] === 'success') {
|
||||
|
||||
$http = new Client();
|
||||
try {
|
||||
$loginServer = Configure::read('LoginServer');
|
||||
@ -242,8 +247,8 @@ class TransactionSendCoinsController extends AppController
|
||||
'balance' => $user['balance']
|
||||
]), ['type' => 'json']);
|
||||
$json = $response->getJson();
|
||||
if ($json['state'] != 'success') {
|
||||
if ($json['msg'] == 'session not found') {
|
||||
if($json['state'] != 'success') {
|
||||
if($json['msg'] == 'session not found') {
|
||||
$session->destroy();
|
||||
return $this->redirect($this->loginServerUrl . 'account', 303);
|
||||
//$this->Flash->error(__('session not found, please login again'));
|
||||
@ -252,28 +257,30 @@ class TransactionSendCoinsController extends AppController
|
||||
}
|
||||
} else {
|
||||
$pendingTransactionCount = $session->read('Transactions.pending');
|
||||
if ($pendingTransactionCount == null) {
|
||||
if($pendingTransactionCount == null) {
|
||||
$pendingTransactionCount = 1;
|
||||
} else {
|
||||
$pendingTransactionCount++;
|
||||
}
|
||||
$session->write('Transactions.pending', $pendingTransactionCount);
|
||||
//echo "pending: " . $pendingTransactionCount;
|
||||
if ($mode === 'next') {
|
||||
if($mode === 'next') {
|
||||
return $this->redirect($this->loginServerUrl . 'account/checkTransactions', 303);
|
||||
} else {
|
||||
$this->Flash->success(__('Transaction submitted for review.'));
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
|
||||
} catch(\Exception $e) {
|
||||
$msg = $e->getMessage();
|
||||
$this->Flash->error(__('error http request: ') . $msg);
|
||||
}
|
||||
|
||||
} else {
|
||||
$this->Flash->error(__('No Valid Receiver Public given: ' . $receiverPubKeyHex));
|
||||
}
|
||||
|
||||
// */
|
||||
// */
|
||||
} else {
|
||||
$this->Flash->error(__('Something was invalid, please try again!'));
|
||||
}
|
||||
@ -292,7 +299,7 @@ class TransactionSendCoinsController extends AppController
|
||||
|
||||
if ($this->request->is('post')) {
|
||||
$requestData = $this->request->getData();
|
||||
if ($transferRawForm->validate($requestData)) {
|
||||
if($transferRawForm->validate($requestData)) {
|
||||
$amountCent = $this->GradidoNumber->parseInputNumberToCentNumber($requestData['amount']);
|
||||
$sender = ['priv' => $requestData['sender_privkey_hex'], 'pub' => $requestData['sender_pubkey_hex']];
|
||||
$reciver = ['pub' => $requestData['receiver_pubkey_hex']];
|
||||
@ -303,13 +310,13 @@ class TransactionSendCoinsController extends AppController
|
||||
$reciver['pub'],
|
||||
$sender['pub']
|
||||
);
|
||||
if ($builderResult['state'] === 'success') {
|
||||
if($builderResult['state'] === 'success') {
|
||||
$protoTransaction = Transaction::build($builderResult['transactionBody'], $sender);
|
||||
$transaction = new Transaction($protoTransaction);
|
||||
if (!$transaction->validate()) {
|
||||
if(!$transaction->validate()) {
|
||||
$this->Flash->error(__('Error validating transaction'));
|
||||
} else {
|
||||
if (!$transaction->save()) {
|
||||
if(!$transaction->save()) {
|
||||
$this->Flash->error(__('Error saving transaction'));
|
||||
} else {
|
||||
$this->Flash->success(__('Gradidos erfolgreich überwiesen!'));
|
||||
@ -318,10 +325,12 @@ class TransactionSendCoinsController extends AppController
|
||||
} else {
|
||||
$this->Flash->error(__('Error building transaction'));
|
||||
}
|
||||
|
||||
}
|
||||
//var_dump($requestData);
|
||||
//
|
||||
//var_dump($data);
|
||||
|
||||
}
|
||||
|
||||
$this->set('timeUsed', microtime(true) - $startTime);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user