Skip to content
This repository was archived by the owner on Jun 9, 2023. It is now read-only.

Update mobileAuthenticate validation and parameters #2

Open
jaaksarv wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update mobileAuthenticate validation and parameters #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1d63a6
Update mobileAuthenticate validation and parameters
Jan 12, 2016
8568ffd
Merge remote-tracking branch 'upstream/master'
Mar 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Authentication/Exception/ValidationException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

class ValidationException extends AuthenticationException
{
public static function missingPersonalCodeAndPhoneNumber()
{
return new static('Please enter personal code or phone number.');
}

public static function invalidPersonalCode($personalCode, $chars = 11)
{
return new static(
Expand Down
40 changes: 29 additions & 11 deletions src/Authentication/MobileID/AuthenticationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,33 +31,36 @@ class AuthenticationService extends AbstractService
* @param string $language
* @param string $serviceName
* @param string $displayMessage
* @param boolean $returnCertData
* @param boolean $returnRevocationData
* @return AuthenticateResponse on successful query.
* @throws AuthenticationException
* @throws ServiceException
* @throws ValidationException
*/
public function mobileAuthenticate($personalCode, $phoneNumber, $language, $serviceName, $displayMessage)
public function mobileAuthenticate($personalCode, $phoneNumber, $language, $serviceName, $displayMessage, $returnCertData = false, $returnRevocationData = false)
{
$this->throwIfSoapNotInitialized();

$this->log(Logger::INFO, '')->log(Logger::INFO, 'SOAP::MobileAuthenticate start validation');
$this->validatePersonalCode($personalCode);
$this->validatePhoneNumber($phoneNumber);
$this->validatePersonalCodeAndPhoneNumber($personalCode, $phoneNumber);
$this->validateLanguage($language);
$this->validateServiceName($serviceName);
$this->validateDisplayMessage($displayMessage);
$this->log(Logger::INFO, 'SOAP::MobileAuthenticate input validation finished');

try {
$data = [
'IDCode' => $personalCode,
'CountryCode' => self::COUNTRY_CODE_ESTONIA,
'PhoneNo' => $phoneNumber,
'Language' => $language,
'ServiceName' => $serviceName,
'MessageToDisplay' => $displayMessage,
'SPChallenge' => $this->generateRandomNumbers(20),
'MessagingMode' => 'asynchClientServer'
'IDCode' => $personalCode,
'CountryCode' => self::COUNTRY_CODE_ESTONIA,
'PhoneNo' => $phoneNumber,
'Language' => $language,
'ServiceName' => $serviceName,
'MessageToDisplay' => $displayMessage,
'SPChallenge' => $this->generateRandomNumbers(20),
'MessagingMode' => 'asynchClientServer',
'ReturnCertData' => ($returnCertData == true),
'ReturnRevocationData' => ($returnRevocationData == true)
];

$this->log(Logger::INFO, $this->wsdl . ' SOAP::MobileAuthenticate request: ' . serialize($data));
Expand Down Expand Up @@ -126,6 +129,21 @@ protected function getHydrator()
return (new ClassMethods())->setUnderscoreSeparatedKeys(false);
}

// Validate that either personalCode or phoneNumber is present
protected function validatePersonalCodeAndPhoneNumber($personalCode, $phoneNumber) {
if (!isset($personalCode) && !isset($phoneNumber)) {
throw ValidationException::missingPersonalCodeAndPhoneNumber();
}

if (isset($personalCode)) {
$this->validatePersonalCode($personalCode);
}

if (isset($phoneNumber)) {
$this->validatePhoneNumber($phoneNumber);
}
}

protected function validatePersonalCode($personalCode)
{
if (strlen($personalCode) !== 11 || !is_numeric($personalCode)) {
Expand Down