Merge pull request #1 from vrajroham/colbyalbo/master

Author: colbyalbo

README.md

@@ -43,19 +43,16 @@ php artisan vendor:publish --provider="Vrajroham\LaravelBitpay\LaravelBitpayServ
 #### Add configuration values
 Add following keys to `.env` file and updated the details ([view more about configuration](https://support.bitpay.com/hc/en-us/articles/115003001063-How-do-I-configure-the-PHP-BitPay-Client-Library-)):
 
-note: BITPAY_TOKEN_LABEL can be any name, but can not have spaces
-
 ```dotenv
 BITPAY_PRIVATE_KEY_PATH=/tmp/bitpay.pri
 BITPAY_PUBLIC_KEY_PATH=/tmp/bitpay.pub
 BITPAY_NETWORK=testnet
 BITPAY_KEY_STORAGE_PASSWORD=SomeRandomePasswordForKeypairEncryption
 BITPAY_TOKEN=
-BITPAY_TOKEN_LABEL=projectname
 ``` 
 
 #### Add webhook event listener
-By default package is capable of handling of webhook requests. Bitpay payment status updates are completely based on webhooks. Whenever webhook is received from server, `BitpayWebhookReceived` event is dispatched. You just need to provide a listener for this event.
+By default, package is capable of handling of webhook requests. Bitpay payment status updates are completely based on webhooks. Whenever webhook is received from server, `BitpayWebhookReceived` event is dispatched. You just need to provide a listener for this event.
 
 You can add your listener as below,
 ```php
@@ -129,7 +126,7 @@ class EventServiceProvider extends ServiceProvider{
     + SIN (Service Identification Number) for your client will be created to uniquely identify requests from your server. 
     + By using SIN **new Token and Pairing Code** will be created for your client on bitpay server and will be shown on your console output.
     + Token will be used for all future request to bitpay and will automatically be copied to your `.env` file.
-    + Based on environment you set **TEST/LIVE**, command will provide URL to approve your client and you need to copy and search Pairing Code on bitpay server & approve it.
+    + Based on environment you set **TEST/LIVE**, command will provide URL to approve your client, and then you need to copy and search Pairing Code on bitpay server & approve it.
 
 - You are all set. :golf:
 

config/laravel-bitpay.php

@@ -5,28 +5,28 @@
      * This is the full path and name for the private key.
      * The default value is /tmp/laravel-bitpay.pri
      */
-    'private_key' => env('BITPAY_PRIVATE_KEY_PATH', '/tmp/laravel-bitpay.pri'),
+    'private_key'          => env('BITPAY_PRIVATE_KEY_PATH', '/tmp/laravel-bitpay.pri'),
 
     /*
      * This is the full path and name for the public key.
      * The default value is /tmp/laravel-bitpay.pub
      */
-    'public_key' => env('BITPAY_PUBLIC_KEY_PATH', '/tmp/laravel-bitpay.pub'),
+    'public_key'           => env('BITPAY_PUBLIC_KEY_PATH', '/tmp/laravel-bitpay.pub'),
 
     /*
      * Specifies using the Live Bitcoin network or
      * Test Bitcoin network: livenet or testnet.
      *
      * The default is livenet
      */
-    'network' => env('BITPAY_NETWORK', 'livenet'),
+    'network'              => env('BITPAY_NETWORK', 'livenet'),
 
     /*
      * The key_storage option allows you to specify a class for persisting and retrieving keys.
      *
      * By default this uses the Bitpay\Storage\EncryptedFilesystemStorage class.
      */
-    'key_storage' => \BitPayKeyUtils\Storage\EncryptedFilesystemStorage::class,
+    'key_storage'          => \BitPayKeyUtils\Storage\EncryptedFilesystemStorage::class,
 
     /*
      * This is the password used to encrypt and decrypt keys on the filesystem.
@@ -36,10 +36,5 @@
     /*
      * BitPay Token
      */
-    'token' => env('BITPAY_TOKEN', ''),
-
-    /*
-     * BitPay Token label
-     */
-    'label' => env('BITPAY_TOKEN_LABEL', 'projectlabel'),
+    'token'                => env('BITPAY_TOKEN', ''),
 ];

src/Commands/CreateKeypair.php

@@ -71,16 +71,16 @@ public function handle()
 
         $this->line('');
 
-        $this->line('<options=bold,underscore>Token</> - <options=bold;fg=green>'.$this->token.'</> //(Token copied to .env for you)');
-        $this->line('<options=bold,underscore>Pairing code</> - <options=bold;fg=green>'.$this->pairingCode.'</>');
+        $this->line('<options=bold,underscore>Token</> - <options=bold;fg=green>' . $this->token . '</> //(Token copied to .env for you)');
+        $this->line('<options=bold,underscore>Pairing code</> - <options=bold;fg=green>' . $this->pairingCode . '</>');
 
         $this->line('');
 
         $this->line('Please, copy the above pairing code and approve on your BitPay Account at the following link:');
 
         $this->line('');
 
-        $this->line('Open -> <href='.$this->network.'/dashboard/merchant/api-tokens>'.$this->network.'/dashboard/merchant/api-tokens</>');
+        $this->line('Open -> <href=' . $this->network . '/dashboard/merchant/api-tokens>' . $this->network . '/dashboard/merchant/api-tokens</>');
 
         $this->line('');
 
@@ -110,7 +110,7 @@ public function createAndPersistKeypair()
         }
 
         $this->bar->advance();
-        $this->info(' - Using <options=bold;fg=red>'.get_class($this->storageEngine).'</> for secure storage.');
+        $this->info(' - Using <options=bold;fg=red>' . get_class($this->storageEngine) . '</> for secure storage.');
 
         $this->storageEngine->persist($this->privateKey);
 
@@ -144,17 +144,17 @@ public function pairWithServerAndCreateToken()
         $this->info(' - Connecting Bitpay server 🖥️  and generating token & pairing code.');
 
         try {
-            $this->pairingCodeLabel = config('laravel-bitpay.label').'_BitPay_Client';
+            $this->pairingCodeLabel = ucwords(str_replace(" ", "_", config('app.name'))) . '_BitPay_Client';
             $postData = [
-                'id'     => (string) $this->sin,
+                'id'     => (string)$this->sin,
                 'label'  => $this->pairingCodeLabel,
                 'facade' => 'merchant',
             ];
             $response = $bitpayClient->post('/tokens', [
                 'json'    => $postData,
                 'headers' => [
                     'x-accept-version' => '2.0.0',
-                    'Content-Type' => 'application/json',
+                    'Content-Type'     => 'application/json',
                     // Todo: If added below headers, bitpay responds with error, "This endpoint does not support the `user` facade"
                     // 'x-identity' => $this->publicKey->__toString(),
                     // 'x-signature' => $this->privateKey->sign($this->network.'/tokens'.json_encode($postData)),