diff --git a/community_server/src/Controller/TransactionCreationsController.php b/community_server/src/Controller/TransactionCreationsController.php index af7b9a018..3530e3306 100644 --- a/community_server/src/Controller/TransactionCreationsController.php +++ b/community_server/src/Controller/TransactionCreationsController.php @@ -369,7 +369,20 @@ class TransactionCreationsController extends AppController $pendings[$id] = $localAmountCent; } $pubKeyHex = bin2hex(stream_get_contents($receiverUser->public_key)); - $identHash = TransactionCreation::DRMakeStringHash($receiverUser->email); + $requestAnswear = $this->JsonRequestClient->sendRequest(json_encode([ + 'session_id' => $session->read('session_id'), + 'email' => $receiverUser->email, + 'ask' => ['user.identHash'] + ]), '/getUserInfos'); + + $identHash = 0; + if('success' == $requestAnswear['state'] && 'success' == $requestAnswear['data']['state']) { + $identHash = $requestAnswear['data']['userData']['identHash']; + } else { + $this->Flash->error(__('Error by requesting LoginServer, please try again')); + } + + //$identHash = TransactionCreation::DRMakeStringHash($receiverUser->email); $localTargetDateFrozen = FrozenDate::now(); $localTargetDateFrozen = $localTargetDateFrozen ->year($localTargetDate['year']) diff --git a/community_server/src/Model/Transactions/TransactionCreation.php b/community_server/src/Model/Transactions/TransactionCreation.php index e8c6133cb..4939c5400 100644 --- a/community_server/src/Model/Transactions/TransactionCreation.php +++ b/community_server/src/Model/Transactions/TransactionCreation.php @@ -63,24 +63,6 @@ class TransactionCreation extends TransactionBase { return ['state' => 'success', 'transactionBody' => $transactionBody]; } - static protected function DRHashRotateLeft( $hash, $rotateBy ) - { - return ($hash<<$rotateBy)|($hash>>(32-$rotateBy)); - } - - static public function DRMakeStringHash($str) - { - $ret = 0; - - if( $str ) - { - for ($i=0; $i < strlen($str); $i++) - { - $ret = TransactionCreation::DRHashRotateLeft($ret, 7) + ord($str{$i}); - } - } - return $ret; - } public function getAmount() { return $this->protoTransactionCreation->getReceiverAmount()->getAmount();