Add checking for throw Short URL exception

Author: bryanadamloh97

composer.json

@@ -36,7 +36,17 @@
     },
     "autoload": {
         "psr-4": {
-            "CodeOfDigital\\LaravelUrlShortener\\": "src"
+            "CodeOfDigital\\LaravelUrlShortener\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "CodeOfDigital\\LaravelUrlShortener\\UrlShortenerServiceProvider"
+            ],
+            "aliases": {
+                "UrlShortener": "CodeOfDigital\\LaravelUrlShortener\\Facades\\UrlShortener"
+            }
         }
     }
 }

src/Contracts/AsyncShortener.php

@@ -9,7 +9,7 @@ interface AsyncShortener extends Shortener
     /**
      * Shorten the given URL asynchronously
      *
-     * @param string $url
+     * @param $url
      * @param array $options
      * @return PromiseInterface
      */

src/Drivers/BitLyDriverShortener.php

@@ -6,10 +6,12 @@
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidApiTokenException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidDataException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidResponseException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
 
 class BitLyDriverShortener extends DriverShortener
@@ -39,6 +41,9 @@ public function __construct(ClientInterface $client, $token, $domain)
      */
     public function shortenAsync($url, array $options = [])
     {
+        if (!Str::startsWith($url, ['http://', 'https://']))
+            throw new ShortUrlException('The given URL must begin with http:// or https://');
+
         $options = array_merge_recursive(Arr::add($this->object, 'json.long_url', $url), ['json' => $options]);
         $request = new Request('POST', '/v4/shorten');
 

src/Drivers/CuttLyDriverShortener.php

@@ -6,10 +6,12 @@
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidApiTokenException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidDataException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidResponseException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
 
 class CuttLyDriverShortener extends DriverShortener
@@ -34,6 +36,9 @@ public function __construct(ClientInterface $client, $token)
      */
     public function shortenAsync($url, array $options = [])
     {
+        if (!Str::startsWith($url, ['http://', 'https://']))
+            throw new ShortUrlException('The given URL must begin with http:// or https://');
+
         $options = array_merge_recursive(Arr::add($this->object, 'query.short', urlencode($url)), ['query' => $options]);
         $request = new Request('GET', '/api/api.php');
 

src/Drivers/DriverShortener.php

@@ -3,13 +3,18 @@
 namespace CodeOfDigital\LaravelUrlShortener\Drivers;
 
 use CodeOfDigital\LaravelUrlShortener\Contracts\AsyncShortener;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
+use Illuminate\Support\Str;
 
 abstract class DriverShortener implements AsyncShortener
 {
     abstract protected function getErrorMessage($code, $message = null);
 
     public function shorten($url, array $options = [])
     {
+        if (!Str::startsWith($url, ['http://', 'https://']))
+            throw new ShortUrlException('The given URL must begin with http:// or https://');
+
         return $this->shortenAsync($url, $options)->wait();
     }
 }

src/Drivers/IsGdDriverShortener.php

@@ -5,10 +5,12 @@
 use CodeOfDigital\LaravelUrlShortener\Exceptions\BadRequestException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidDataException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidResponseException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
 
 class IsGdDriverShortener extends DriverShortener
@@ -34,6 +36,9 @@ public function __construct(ClientInterface $client, $statistic)
      */
     public function shortenAsync($url, array $options = [])
     {
+        if (!Str::startsWith($url, ['http://', 'https://']))
+            throw new ShortUrlException('The given URL must begin with http:// or https://');
+
         $options = array_merge_recursive(Arr::add($this->object, 'query.url', $url), ['query' => $options]);
         $request = new Request('GET', '/create.php');
 

src/Drivers/ShorteStDriverShortener.php

@@ -5,10 +5,12 @@
 use CodeOfDigital\LaravelUrlShortener\Exceptions\BadRequestException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidApiTokenException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidResponseException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
 
 class ShorteStDriverShortener extends DriverShortener
@@ -37,6 +39,9 @@ public function __construct(ClientInterface $client, $token)
      */
     public function shortenAsync($url, array $options = [])
     {
+        if (!Str::startsWith($url, ['http://', 'https://']))
+            throw new ShortUrlException('The given URL must begin with http:// or https://');
+
         $options = array_merge_recursive(Arr::add($this->object, 'json.urlToShorten', $url), ['json' => $options]);
         $request = new Request('PUT', '/v1/data/url');
 

src/Drivers/TinyUrlDriverShortener.php

@@ -7,10 +7,12 @@
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidDataException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidResponseException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\MethodNotAllowedException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
 
 class TinyUrlDriverShortener extends DriverShortener
@@ -40,6 +42,9 @@ public function __construct(ClientInterface $client, $token, $domain)
      */
     public function shortenAsync($url, array $options = [])
     {
+        if (!Str::startsWith($url, ['http://', 'https://']))
+            throw new ShortUrlException('The given URL must begin with http:// or https://');
+
         $options = array_merge_recursive(Arr::add($this->object, 'json.url', $url), ['json' => $options]);
         $request = new Request('POST', '/create');
 

src/Exceptions/ShortUrlException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace CodeOfDigital\LaravelUrlShortener\Exceptions;
+
+use Exception;
+
+class ShortUrlException extends Exception
+{
+}