Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix error transfer received sms + finish octopush shortcode adapter

This commit is contained in:
osaajani 2020-04-03 03:38:35 +02:00
parent 6ad299f21e
commit 49f3a4b28c
8 changed files with 139 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
adapters/OctopushShortcodeAdapter.php
View File

@ -17,6 +17,9 @@ namespace adapters;
class OctopushShortcodeAdapter implements AdapterInterface
{
const ERROR_CODE_OK = '000';
const SMS_TYPE_LOWCOST = 'XXX';
const SMS_TYPE_PREMIUM = 'FR';
const SMS_TYPE_INTERNATIONAL = 'WWW';
/**
* Datas used to configure interaction with the implemented service. (e.g : Api credentials, ports numbers, etc.).
@ -168,7 +171,11 @@ class OctopushShortcodeAdapter implements AdapterInterface
* @param string $text : Text of the SMS to send
* @param bool $flash : Is the SMS a Flash SMS
*
* @return mixed Uid of the sended message if send, False else
* @return array : [
* bool 'error' => false if no error, true else
* ?string 'error_message' => null if no error, else error message
* array 'uid' => Uid of the sms created on success
* ]
*/
public function send(string $destination, string $text, bool $flash = false)
{
@ -186,6 +193,7 @@ class OctopushShortcodeAdapter implements AdapterInterface
'sms_text' => $text,
'sms_recipients' => str_replace('+', '00', $destination), //Must use 00 instead of + notation
'sms_sender' => '12345',
'sms_type' => self::SMS_TYPE_LOWCOST,
];
if ($this->sender !== null)
@ -204,7 +212,38 @@ class OctopushShortcodeAdapter implements AdapterInterface
$response = curl_exec($curl);
curl_close($curl);
var_dump($response);
if ($response === false)
{
$response['error'] = true;
$response['error_message'] = 'HTTP query failed.';
return $response;
}
$response_decode = json_decode($response, true);
if ($response_decode === null)
{
$response['error'] = true;
$response['error_message'] = 'Invalid JSON for response.';
return $response;
}
if ($response_decode['error_code'] != self::ERROR_CODE_OK)
{
$response['error'] = true;
$response['error_message'] = 'Response indicate error code : ' . $response_decode['error_code'];
return $response;
}
$uid = $response_decode['ticket'] ?? false;
if (!$uid)
{
$response['error'] = true;
$response['error_message'] = 'Cannot extract SMS uid';
return $response;
}
$response['uid'] = $uid;
return $response;
}
catch (\Throwable $t)
{
@ -292,8 +331,38 @@ class OctopushShortcodeAdapter implements AdapterInterface
*/
public static function status_change_callback()
{
var_dump($_REQUEST);
return false;
header('Connection: close');
header('Content-Encoding: none');
header('Content-Length: 0');
$uid = $_POST['message_id'] ?? false;
$status = $_POST['status'] ?? false;
if ($uid === false || $status === false)
{
return false;
}
switch ($status)
{
case 'DELIVERED':
$status = \models\Sended::STATUS_DELIVERED;
break;
case 'NOT_ALLOWED':
case 'INVALID_DESTINATION_ADDRESS':
case 'OUT_OF_DATE':
case 'EXPIRED':
case 'BLACKLISTED_NUMBER':
$status = \models\Sended::STATUS_FAILED;
break;
default :
$status = \models\Sended::STATUS_UNKNOWN;
break;
}
return ['uid' => $uid, 'status' => $status];
}
@ -313,6 +382,40 @@ class OctopushShortcodeAdapter implements AdapterInterface
*/
public static function reception_callback() : array
{
return [];
$response = [
'error' => false,
'error_message' => null,
'uid' => null,
];
header('Connection: close');
header('Content-Encoding: none');
header('Content-Length: 0');
$number = $_POST['number'] ?? false;
$text = $_POST['text'] ?? false;
$at = $_POST['reception_date'] ?? false;
if (!$number || !$text || !$at)
{
$response['error'] = true;
$response['error_message'] = 'One required data of the callback is missing.';
return $response;
}
$origin = \controllers\internals\Tool::parse_phone('+' . mb_substr($number, 2));
if (!$origin)
{
$response['error'] = true;
$response['error_message'] = 'Invalid origin number : ' . mb_substr($number, 2);
return $response;
}
$response['sms'] = [
'at' => $at,
'text' => $text,
'origin' => $origin,
];
return $response;
}
}

6
adapters/OvhSmsShortcodeAdapter.php
View File

@ -168,7 +168,11 @@ namespace adapters;
* @param string $text : Text of the SMS to send
* @param bool $flash : Is the SMS a Flash SMS
*
* @return mixed Uid of the sended message if send, False else
* @return array : [
* bool 'error' => false if no error, true else
* ?string 'error_message' => null if no error, else error message
* array 'uid' => Uid of the sms created on success
* ]
*/
public function send(string $destination, string $text, bool $flash = false)
{

6
adapters/OvhSmsVirtualNumberAdapter.php
View File

@ -174,7 +174,11 @@ namespace adapters;
* @param string $text : Text of the SMS to send
* @param bool $flash : Is the SMS a Flash SMS
*
* @return mixed Uid of the sended message if send, False else
* @return array : [
* bool 'error' => false if no error, true else
* ?string 'error_message' => null if no error, else error message
* array 'uid' => Uid of the sms created on success
* ]
*/
public function send(string $destination, string $text, bool $flash = false)
{

6
adapters/TestAdapter.php
View File

@ -130,7 +130,11 @@ namespace adapters;
* @param string $text : Text of the SMS to send
* @param bool $flash : Is the SMS a Flash SMS
*
* @return mixed Uid of the sended message if send, False else
* @return array : [
* bool 'error' => false if no error, true else
* ?string 'error_message' => null if no error, else error message
* array 'uid' => Uid of the sms created on success
* ]
*/
public function send(string $destination, string $text, bool $flash = false)
{

6
adapters/TwilioVirtualNumberAdapter.php
View File

@ -173,7 +173,11 @@ class TwilioVirtualNumberAdapter implements AdapterInterface
* @param string $text : Text of the SMS to send
* @param bool $flash : Is the SMS a Flash SMS
*
* @return mixed Uid of the sended message if send, False else
* @return array : [
* bool 'error' => false if no error, true else
* ?string 'error_message' => null if no error, else error message
* array 'uid' => Uid of the sms created on success
* ]
*/
public function send(string $destination, string $text, bool $flash = false)
{

2
controllers/internals/Tool.php
View File

@ -64,7 +64,7 @@ namespace controllers\internals;
}
catch (\Exception $e)
{
return $number;
return false;
}
}

8
controllers/internals/User.php
View File

@ -19,12 +19,14 @@ namespace controllers\internals;
private $model_user;
private $internal_event;
private $internal_setting;
private $internal_phone;
public function __construct(\PDO $bdd)
{
$this->model_user = new \models\User($bdd);
$this->internal_event = new \controllers\internals\Event($bdd);
$this->internal_setting = new \controllers\internals\Setting($bdd);
$this->internal_phone = new Phone($bdd);
}
/**
@ -267,8 +269,7 @@ namespace controllers\internals;
*/
public function transfer_received (int $id_user, array $received) : bool
{
$internal_setting = new Setting($this->bdd);
$settings = $internal_setting->gets_for_user($id_user);
$settings = $this->internal_setting->gets_for_user($id_user);
if (!$settings['transfer'] ?? false)
{
@ -281,8 +282,7 @@ namespace controllers\internals;
return false;
}
$internal_phone = new Phone($this->bdd);
$phone = $internal_phone->get_for_user($id_user, $destination);
$phone = $this->internal_phone->get_for_user($id_user, $destination);
if (!$phone)
{
return false;

8
controllers/publics/Callback.php
View File

@ -23,6 +23,7 @@ use Monolog\Logger;
private $user;
private $internal_user;
private $internal_sended;
private $internal_received;
private $internal_adapter;
public function __construct()
@ -31,6 +32,7 @@ use Monolog\Logger;
$this->internal_user = new \controllers\internals\User($bdd);
$this->internal_sended = new \controllers\internals\Sended($bdd);
$this->internal_received = new \controllers\internals\Received($bdd);
$this->internal_adapter = new \controllers\internals\Adapter();
//Logger
@ -172,14 +174,16 @@ use Monolog\Logger;
return false;
}
$response = $internal_received->receive($this->user['id'], $id_phone, $response['sms']['text'], $response['sms']['origin'], $response['sms']['at']);
$sms = $response['sms'];
$response = $this->internal_received->receive($this->user['id'], $id_phone, $sms['text'], $sms['origin'], $sms['at']);
if ($response['error'])
{
$this->logger->error('Failed receive message : ' . json_encode($sms) . ' with error : ' . $response['error_message']);
return false;
}
$this->logger->info('Callback reception successfully received message ' . json_encode($response['sms']));
$this->logger->info('Callback reception successfully received message : ' . json_encode($sms));
return true;
}
}