Merge pull request #38 from LuongTienThinh/feat/verify-system

feat: add verify_system to work correctly on window and linux
cslant · Jan 25, 2024 · 349d959 · 349d959
2 parents 50951d2 + 78e1950
commit 349d959
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/config/tg-notifier.php b/config/tg-notifier.php
@@ -9,6 +9,8 @@
             'url'      => $_ENV['TGN_APP_URL'] ?? 'http://localhost:3000',
 
             'timezone' => $_ENV['TIMEZONE'] ?? 'Asia/Ho_Chi_Minh',
+
+            'request_verify' => $_ENV['TGN_REQUEST_VERIFY'] ?? false,
         ],
 
         'bot' => [

diff --git a/src/Structures/Notification.php b/src/Structures/Notification.php
@@ -90,9 +90,12 @@ public function sendNotify(string $message = null, array $options = []): bool
         $url = 'https://api.telegram.org/bot' . config('telegram-git-notifier.bot.token') . '/sendMessage';
 
         try {
-            $response = $this->client->request('POST', $url, [
+            $options = [
                 'form_params' => $queryParams,
-            ]);
+                'verify' => config('telegram-git-notifier.app.request_verify'),
+            ];
+
+            $response = $this->client->request('POST', $url, $options);
 
             if ($response->getStatusCode() === 200) {
                 return true;

diff --git a/src/Webhook.php b/src/Webhook.php
@@ -33,9 +33,12 @@ public function setUrl(string $url): void
     public function setWebhook(): string
     {
         $url = "https://api.telegram.org/bot{$this->token}/setWebhook?url={$this->url}";
+        $options = [
+            'verify' => config('telegram-git-notifier.app.request_verify'),
+        ];
 
         try {
-            $response = $this->client->request('GET', $url);
+            $response = $this->client->request('GET', $url, $options);
 
             return $response->getBody()->getContents();
         } catch (GuzzleException) {
@@ -46,9 +49,12 @@ public function setWebhook(): string
     public function deleteWebHook(): string
     {
         $url = "https://api.telegram.org/bot{$this->token}/deleteWebhook";
+        $options = [
+            'verify' => config('telegram-git-notifier.app.request_verify'),
+        ];
 
         try {
-            $response = $this->client->request('GET', $url);
+            $response = $this->client->request('GET', $url, $options);
 
             return $response->getBody()->getContents();
         } catch (GuzzleException) {
@@ -59,9 +65,12 @@ public function deleteWebHook(): string
     public function getWebHookInfo(): string
     {
         $url = "https://api.telegram.org/bot{$this->token}/getWebhookInfo";
+        $options = [
+            'verify' => config('telegram-git-notifier.app.request_verify'),
+        ];
 
         try {
-            $response = $this->client->request('GET', $url);
+            $response = $this->client->request('GET', $url, $options);
 
             return $response->getBody()->getContents();
         } catch (GuzzleException) {
@@ -72,9 +81,12 @@ public function getWebHookInfo(): string
     public function getUpdates(): string
     {
         $url = "https://api.telegram.org/bot{$this->token}/getUpdates";
+        $options = [
+            'verify' => config('telegram-git-notifier.app.request_verify'),
+        ];
 
         try {
-            $response = $this->client->request('GET', $url);
+            $response = $this->client->request('GET', $url, $options);
 
             return $response->getBody()->getContents();
         } catch (GuzzleException) {