Nosial/socialbox-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Made message signing in Cryptography use SHA512 as the message content for... #1

Closed
netkas wants to merge 421 commits from master into dev
pull from: master
merge into: Nosial:dev
Conversation 3 Commits 421 Files changed 226 +6 -4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 06b55a65b6 - Show all commits

10
src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
View file

@ -7,6 +7,8 @@
use Socialbox\Enums\StandardError; use Socialbox\Enums\StandardError;
use Socialbox\Enums\Types\ContactRelationshipType; use Socialbox\Enums\Types\ContactRelationshipType;
use Socialbox\Exceptions\DatabaseOperationException; use Socialbox\Exceptions\DatabaseOperationException;
use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
use Socialbox\Exceptions\Standard\StandardException; use Socialbox\Exceptions\Standard\StandardException;
use Socialbox\Interfaces\SerializableInterface; use Socialbox\Interfaces\SerializableInterface;
use Socialbox\Managers\ContactManager; use Socialbox\Managers\ContactManager;
@ -18,7 +20,7 @@
class AddressBookAddContact extends Method class AddressBookAddContact extends Method
{ {
/** /**
* Adds a contact to the authenticated peer's address book * Adds a contact to the authenticated peer's address book
* *
* @inheritDoc * @inheritDoc
*/ */
@ -26,7 +28,7 @@
{ {
if(!$rpcRequest->containsParameter('peer')) if(!$rpcRequest->containsParameter('peer'))
{ {
return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Missing required peer parameter'); throw new MissingRpcArgumentException('peer');
} }
try try
@ -35,7 +37,7 @@
} }
catch(InvalidArgumentException $e) catch(InvalidArgumentException $e)
{ {
throw new StandardException('Invalid peer address', StandardError::RPC_INVALID_ARGUMENTS, $e); throw new InvalidRpcArgumentException('peer', $e->getMessage());
} }
if($rpcRequest->containsParameter('relationship')) if($rpcRequest->containsParameter('relationship'))
@ -43,7 +45,7 @@
$relationship = ContactRelationshipType::tryFrom(strtoupper($rpcRequest->getParameter('relationship'))); $relationship = ContactRelationshipType::tryFrom(strtoupper($rpcRequest->getParameter('relationship')));
if($relationship === null) if($relationship === null)
{ {
throw new StandardException('Invalid relationship type', StandardError::RPC_INVALID_ARGUMENTS); throw new InvalidRpcArgumentException('peer', 'Invalid relationship type');
} }
} }
else else