From f6c7fdb8ed00e5706a8cb69f0f116277fb65bcbd Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 28 Jun 2022 15:32:59 +0200 Subject: [PATCH 1/4] feat: fix messaging worker --- app/workers/messaging.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/workers/messaging.php b/app/workers/messaging.php index 45513db4f8..f588ffc8f0 100644 --- a/app/workers/messaging.php +++ b/app/workers/messaging.php @@ -38,6 +38,8 @@ class MessagingV1 extends Worker 'telesign' => new Telesign($user, $secret), default => null }; + + $this->from = App::getEnv('_APP_PHONE_FROM'); } public function run(): void @@ -47,6 +49,11 @@ class MessagingV1 extends Worker return; } + if (!$this->from) { + Console::info('Skipped sms processing. No phone number has been set.'); + return; + } + $recipient = $this->args['recipient']; $message = $this->args['message']; From cb381bd3a3354001af50686e679dd9f504b70c40 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 28 Jun 2022 15:40:59 +0200 Subject: [PATCH 2/4] feat: fix messaging worker --- .env | 4 ++-- app/workers/messaging.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index f9ee06b57a..0b145421d9 100644 --- a/.env +++ b/.env @@ -56,8 +56,8 @@ _APP_SMTP_PORT=1025 _APP_SMTP_SECURE= _APP_SMTP_USERNAME= _APP_SMTP_PASSWORD= -_APP_PHONE_PROVIDER=phone://mock -_APP_PHONE_FROM= +_APP_PHONE_PROVIDER=phone://ACa8fbb190679c054b3e322b803d4840aa:bd8e0c8c6ebee4a1ccd93f8fd4ea7ac3@twilio +_APP_PHONE_FROM=+19705729656 _APP_STORAGE_LIMIT=30000000 _APP_STORAGE_PREVIEW_LIMIT=20000000 _APP_FUNCTIONS_SIZE_LIMIT=30000000 diff --git a/app/workers/messaging.php b/app/workers/messaging.php index f588ffc8f0..409304c595 100644 --- a/app/workers/messaging.php +++ b/app/workers/messaging.php @@ -49,7 +49,7 @@ class MessagingV1 extends Worker return; } - if (!$this->from) { + if (empty($this->from)) { Console::info('Skipped sms processing. No phone number has been set.'); return; } From 66718634c93fe118c2faa3f4242a3d7ba93b9256 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 28 Jun 2022 15:41:14 +0200 Subject: [PATCH 3/4] feat: fix messaging worker --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 0b145421d9..f9ee06b57a 100644 --- a/.env +++ b/.env @@ -56,8 +56,8 @@ _APP_SMTP_PORT=1025 _APP_SMTP_SECURE= _APP_SMTP_USERNAME= _APP_SMTP_PASSWORD= -_APP_PHONE_PROVIDER=phone://ACa8fbb190679c054b3e322b803d4840aa:bd8e0c8c6ebee4a1ccd93f8fd4ea7ac3@twilio -_APP_PHONE_FROM=+19705729656 +_APP_PHONE_PROVIDER=phone://mock +_APP_PHONE_FROM= _APP_STORAGE_LIMIT=30000000 _APP_STORAGE_PREVIEW_LIMIT=20000000 _APP_FUNCTIONS_SIZE_LIMIT=30000000 From bae6954b54c9d1f55b9a61662863cc40ad95667e Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 28 Jun 2022 15:43:36 +0200 Subject: [PATCH 4/4] feat: add dummy phone number for tests --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index f9ee06b57a..351447a8b4 100644 --- a/.env +++ b/.env @@ -57,7 +57,7 @@ _APP_SMTP_SECURE= _APP_SMTP_USERNAME= _APP_SMTP_PASSWORD= _APP_PHONE_PROVIDER=phone://mock -_APP_PHONE_FROM= +_APP_PHONE_FROM=+123456789 _APP_STORAGE_LIMIT=30000000 _APP_STORAGE_PREVIEW_LIMIT=20000000 _APP_FUNCTIONS_SIZE_LIMIT=30000000