Switch environment vars for constants (Vonage#19)

Author: lornajane

.env-example

@@ -1,7 +1,7 @@
 NEXMO_API_KEY=
 NEXMO_API_SECRET=
-APPLICATION_ID=635c2797-9295-4cdf-9232-d275f75ff096
-PRIVATE_KEY=private.key
+APPLICATION_ID=
+PRIVATE_KEY=
 FROM=
 TO_NUMBER=
 NEXMO_SECRET_ID=

secret-management/create-a-secret.php

@@ -2,12 +2,10 @@
 require_once __DIR__ . '/../config.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 
-$basic  = new \Nexmo\Client\Credentials\Basic($_ENV['NEXMO_API_KEY'], $_ENV['NEXMO_API_SECRET']);
+$basic  = new \Nexmo\Client\Credentials\Basic(NEXMO_API_KEY, NEXMO_API_SECRET);
 $client = new \Nexmo\Client($basic);
 
-// set an environment variable API_KEY to work with secrets for a secondary key
-$api_key = isset($_ENV['API_KEY']) ? $_ENV['API_KEY'] : $_ENV['NEXMO_API_KEY'];
 $secret = 'awes0meNewSekret!!;';
 
-$client->account()->createSecret($api_key, $secret);
+$client->account()->createSecret(NEXMO_API_KEY, $secret);
 

secret-management/delete-a-secret.php

@@ -2,14 +2,11 @@
 require_once __DIR__ . '/../config.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 
-$basic  = new \Nexmo\Client\Credentials\Basic($_ENV['NEXMO_API_KEY'], $_ENV['NEXMO_API_SECRET']);
+$basic  = new \Nexmo\Client\Credentials\Basic(NEXMO_API_KEY, NEXMO_API_SECRET);
 $client = new \Nexmo\Client($basic);
 
-// set an environment variable API_KEY to work with secrets for a secondary key
-$api_key = isset($_ENV['API_KEY']) ? $_ENV['API_KEY'] : $_ENV['NEXMO_API_KEY'];
-
 try {
-    $response = $client->account()->deleteSecret($api_key, $_ENV['NEXMO_SECRET_ID']);
+    $response = $client->account()->deleteSecret(NEXMO_API_KEY, NEXMO_SECRET_ID);
     echo "OK\n";
 } catch(\Nexmo\Client\Exception\Request $e) {
     echo $e->getMessage();

secret-management/fetch-secrets.php

@@ -2,13 +2,10 @@
 require_once __DIR__ . '/../config.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 
-$basic  = new \Nexmo\Client\Credentials\Basic($_ENV['NEXMO_API_KEY'], $_ENV['NEXMO_API_SECRET']);
+$basic  = new \Nexmo\Client\Credentials\Basic(NEXMO_API_KEY, NEXMO_API_SECRET);
 $client = new \Nexmo\Client($basic);
 
-// set an environment variable API_KEY to work with secrets for a secondary key
-$api_key = isset($_ENV['API_KEY']) ? $_ENV['API_KEY'] : $_ENV['NEXMO_API_KEY'];
-
-$response = $client->account()->listSecrets($api_key);
+$response = $client->account()->listSecrets(NEXMO_API_KEY);
 foreach($response['secrets'] as $secret) {
     echo "ID: " . $secret['id'] . " (created " . $secret['created_at'] .")\n";
 }

secret-management/get-a-secret.php

@@ -2,11 +2,12 @@
 require_once __DIR__ . '/../config.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 
-$basic  = new \Nexmo\Client\Credentials\Basic($_ENV['NEXMO_API_KEY'], $_ENV['NEXMO_API_SECRET']);
+$basic  = new \Nexmo\Client\Credentials\Basic(NEXMO_API_KEY, NEXMO_API_SECRET);
 $client = new \Nexmo\Client($basic);
 
-// set an environment variable API_KEY to work with secrets for a secondary key
-$api_key = isset($_ENV['API_KEY']) ? $_ENV['API_KEY'] : $_ENV['NEXMO_API_KEY'];
-
-$secret = $client->account()->getSecret($api_key, $_ENV['NEXMO_SECRET_ID']);
-echo "ID: " . $secret['id'] . " (created " . $secret['created_at'] .")\n";
+try {
+    $secret = $client->account()->getSecret(NEXMO_API_KEY, NEXMO_SECRET_ID);
+    echo "ID: " . $secret['id'] . " (created " . $secret['created_at'] .")\n";
+} catch (\Nexmo\Client\Exception\Request $e) {
+    echo $e->getMessage();
+}