Merge pull request #35 from ChristopherCarranza/feature/SeparateAccountSID

Updated config names to match TwilioService. Added ability to explici…

Author: fwartner

README.md

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

src/TwilioConfig.php

@@ -19,24 +19,34 @@ public function __construct(array $config)
         $this->config = $config;
     }
 
-    /**
-     * Get the account sid.
-     *
-     * @return string
-     */
-    public function getAccountSid()
+	/**
+	 * Get the username.
+	 *
+	 * @return string
+	 */
+	public function getUsername()
     {
-        return $this->config['account_sid'];
+    	return $this->config['username'];
+    }
+
+	/**
+	 * Get the password.
+	 *
+	 * @return string
+	 */
+	public function getPassword()
+    {
+    	return $this->config['password'];
     }
 
     /**
-     * Get the auth token.
+     * Get the account sid.
      *
      * @return string
      */
-    public function getAuthToken()
+    public function getAccountSid()
     {
-        return $this->config['auth_token'];
+        return $this->config['account_sid'];
     }
 
     /**

src/TwilioProvider.php

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