Merge pull request #855 from jacklul/token_exception

Throw unique exception on invalid token and log raw response

Author: akalongman

src/Exception/InvalidBotTokenException.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * This file is part of the TelegramBot package.
+ *
+ * (c) Avtandil Kikabidze aka LONGMAN <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Longman\TelegramBot\Exception;
+
+/**
+ * Thrown when bot token is invalid
+ */
+class InvalidBotTokenException extends TelegramException
+{
+    /**
+     * InvalidBotTokenException constructor
+     */
+    public function __construct()
+    {
+        parent::__construct("Invalid bot token!");
+    }
+}

src/Request.php

@@ -14,6 +14,7 @@
 use GuzzleHttp\Exception\RequestException;
 use Longman\TelegramBot\Entities\File;
 use Longman\TelegramBot\Entities\ServerResponse;
+use Longman\TelegramBot\Exception\InvalidBotTokenException;
 use Longman\TelegramBot\Exception\TelegramException;
 
 /**
@@ -457,13 +458,21 @@ public static function send($action, array $data = [])
 
         self::limitTelegramRequests($action, $data);
 
-        $response = json_decode(self::execute($action, $data), true);
+        $raw_response = self::execute($action, $data);
+        $response = json_decode($raw_response, true);
 
         if (null === $response) {
-            throw new TelegramException('Telegram returned an invalid response! Please review your bot name and API key.');
+            TelegramLog::debug($raw_response);
+            throw new TelegramException('Telegram returned an invalid response!');
         }
 
-        return new ServerResponse($response, $bot_username);
+        $response = new ServerResponse($response, $bot_username);
+
+        if (!$response->isOk() && $response->getErrorCode() === 401 && $response->getDescription() === 'Unauthorized') {
+            throw new InvalidBotTokenException();
+        }
+
+        return $response;
     }
 
     /**