Revert some changes and make config compatible with auth token or username/passward

Author: gregoriohc

README.md

@@ -49,9 +49,10 @@ Add your Twilio Account SID, Auth Token, and From Number (optional) to your `con
 // config/services.php
 ...
 'twilio' => [
-    'username' => env('TWILIO_USERNAME'),
-    'password' => env('TWILIO_PASSWORD'),
-    'account_sid' => env('TWILIO_ACCOUNT_SID'), //optional
+    'username' => env('TWILIO_USERNAME'), // optional when using auth token
+    'password' => env('TWILIO_PASSWORD'), // optional when using auth token
+    'auth_token' => env('TWILIO_AUTH_TOKEN'), // optional when using username and password
+    'account_sid' => env('TWILIO_ACCOUNT_SID'),
     'from' => env('TWILIO_FROM'), // optional
 ],
 ...

src/Twilio.php

@@ -61,6 +61,7 @@ public function sendMessage(TwilioMessage $message, $to, $useAlphanumericSender
      * @param TwilioSmsMessage $message
      * @param string           $to
      * @return \Twilio\Rest\Api\V2010\Account\MessageInstance
+     * @throws CouldNotSendNotification
      */
     protected function sendSmsMessage(TwilioSmsMessage $message, $to)
     {
@@ -82,6 +83,7 @@ protected function sendSmsMessage(TwilioSmsMessage $message, $to)
      * @param TwilioCallMessage $message
      * @param string            $to
      * @return \Twilio\Rest\Api\V2010\Account\CallInstance
+     * @throws CouldNotSendNotification
      */
     protected function makeCall(TwilioCallMessage $message, $to)
     {
@@ -118,5 +120,7 @@ protected function getAlphanumericSender()
         if ($sender = $this->config->getAlphanumericSender()) {
             return $sender;
         }
+
+        return null;
     }
 }

src/TwilioConfig.php

@@ -19,6 +19,16 @@ public function __construct(array $config)
         $this->config = $config;
     }
 
+    /**
+     * Get the auth token.
+     *
+     * @return string
+     */
+    public function getAuthToken()
+    {
+        return $this->config['auth_token'];
+    }
+
 	/**
 	 * Get the username.
 	 *

src/TwilioProvider.php

@@ -23,7 +23,15 @@ public function boot()
 
         $this->app->bind(TwilioService::class, function () {
             $config = $this->app['config']['services.twilio'];
-            return new TwilioService($config['username'], $config['password'], $config['account_sid']);
+            $account_sid = array_get($config, 'account_sid');
+            $username = array_get($config, 'username');
+            if (!empty($username)) {
+                $password = array_get($config, 'password');
+                return new TwilioService($username, $password, $account_sid);
+            } else {
+                $auth_token = array_get($config, 'auth_token');
+                return new TwilioService($account_sid, $auth_token);
+            }
         });
     }
 

tests/TwilioProviderTest.php

@@ -61,6 +61,41 @@ public function it_gives_an_instantiated_twilio_object_when_the_channel_asks_for
 
         $this->provider->boot();
     }
+
+    /** @test */
+    public function it_gives_an_instantiated_twilio_object_when_the_channel_asks_for_it_with_new_config()
+    {
+        $configArray = [
+            'username' => 'username',
+            'password' => 'password',
+            'account_sid' => 'sid',
+            'from' => 'from',
+        ];
+
+        $this->app->shouldReceive('offsetGet')
+            ->with('config')
+            ->andReturn([
+                'services.twilio' => $configArray,
+            ]);
+
+        $twilio = Mockery::mock(TwilioService::class);
+        $config = Mockery::mock(TwilioConfig::class, $configArray);
+
+        $this->app->shouldReceive('make')->with(TwilioConfig::class)->andReturn($config);
+        $this->app->shouldReceive('make')->with(TwilioService::class)->andReturn($twilio);
+
+        $this->app->shouldReceive('when')->with(TwilioChannel::class)->once()->andReturn($this->app);
+        $this->app->shouldReceive('needs')->with(Twilio::class)->once()->andReturn($this->app);
+        $this->app->shouldReceive('give')->with(Mockery::on(function ($twilio) {
+            return $twilio() instanceof Twilio;
+        }))->once();
+
+        $this->app->shouldReceive('bind')->with(TwilioService::class, Mockery::on(function ($twilio) {
+            return  $twilio() instanceof TwilioService;
+        }))->once()->andReturn($this->app);
+
+        $this->provider->boot();
+    }
 }
 
 interface App extends Application, ArrayAccess