fix: change variable names on VerifyV2 to match portal snippet (#91)

* Change variable names on VerifyV2 to match portal snippet * Match fallback workflow with snippet * Clean usings for fallback
Vonage · May 31, 2023 · f0957e1 · f0957e1
1 parent 85b33ac
commit f0957e1
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 66 deletions.
diff --git a/DotNetCliCodeSnippets/VerifyV2/CancelRequest.cs b/DotNetCliCodeSnippets/VerifyV2/CancelRequest.cs
@@ -9,12 +9,12 @@ public class CancelRequest : ICodeSnippet
 {
     public async Task Execute()
     {
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var requestId = Guid.Parse(Environment.GetEnvironmentVariable("REQUEST_ID") ?? "REQUEST_ID");
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var REQUEST_ID = Guid.Parse(Environment.GetEnvironmentVariable("REQUEST_ID") ?? "REQUEST_ID");
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
-        var request = Vonage.VerifyV2.Cancel.CancelRequest.Parse(requestId);
+        var request = Vonage.VerifyV2.Cancel.CancelRequest.Parse(REQUEST_ID);
         var response = await client.VerifyV2Client.CancelAsync(request);
         var message = response.Match(
             success => "Request has been cancelled",

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestEmail.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestEmail.cs
@@ -11,15 +11,15 @@ public class StartVerificationRequestEmail : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_EMAIL") ?? "TO_EMAIL";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_EMAIL = Environment.GetEnvironmentVariable("TO_EMAIL") ?? "TO_EMAIL";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(EmailWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(EmailWorkflow.Parse(TO_EMAIL))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestSilentAuth.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestSilentAuth.cs
@@ -11,15 +11,15 @@ public class StartVerificationRequestSilentAuth : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_NUMBER = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(SilentAuthWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(SilentAuthWorkflow.Parse(TO_NUMBER))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestSms.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestSms.cs
@@ -11,15 +11,15 @@ public class StartVerificationRequestSms : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_NUMBER = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(SmsWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(SmsWorkflow.Parse(TO_NUMBER))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestVoice.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestVoice.cs
@@ -11,15 +11,15 @@ public class StartVerificationRequestVoice : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_NUMBER = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(VoiceWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(VoiceWorkflow.Parse(TO_NUMBER))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestWhatsApp.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestWhatsApp.cs
@@ -11,15 +11,15 @@ public class StartVerificationRequestWhatsApp : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_NUMBER = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(WhatsAppWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(WhatsAppWorkflow.Parse(TO_NUMBER))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestWhatsAppInteractive.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestWhatsAppInteractive.cs
@@ -11,15 +11,15 @@ public class StartVerificationRequestWhatsAppInteractive : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_NUMBER = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(WhatsAppInteractiveWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(WhatsAppInteractiveWorkflow.Parse(TO_NUMBER))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestWithFallback.cs b/DotNetCliCodeSnippets/VerifyV2/StartVerificationRequestWithFallback.cs
@@ -3,27 +3,26 @@
 using Vonage;
 using Vonage.Request;
 using Vonage.VerifyV2.StartVerification;
+using Vonage.VerifyV2.StartVerification.Email;
 using Vonage.VerifyV2.StartVerification.SilentAuth;
-using Vonage.VerifyV2.StartVerification.Sms;
-using Vonage.VerifyV2.StartVerification.WhatsApp;
 
 namespace DotnetCliCodeSnippets.VerifyV2;
 
-public class StartVerificationRequestWithFallback: ICodeSnippet
+public class StartVerificationRequestWithFallback : ICodeSnippet
 {
     public async Task Execute()
     {
-        var to = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
-        var brandName = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var TO_NUMBER = Environment.GetEnvironmentVariable("TO_NUMBER") ?? "TO_NUMBER";
+        var TO_EMAIL = Environment.GetEnvironmentVariable("TO_EMAIL") ?? "TO_EMAIL";
+        var BRAND_NAME = Environment.GetEnvironmentVariable("VONAGE_BRAND_NAME") ?? "VONAGE_BRAND_NAME";
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = StartVerificationRequest.Build()
-            .WithBrand(brandName)
-            .WithWorkflow(SmsWorkflow.Parse(to))
-            .WithFallbackWorkflow(WhatsAppWorkflow.Parse(to))
-            .WithFallbackWorkflow(SilentAuthWorkflow.Parse(to))
+            .WithBrand(BRAND_NAME)
+            .WithWorkflow(SilentAuthWorkflow.Parse(TO_NUMBER))
+            .WithFallbackWorkflow(EmailWorkflow.Parse(TO_EMAIL))
             .Create();
         var response = await client.VerifyV2Client.StartVerificationAsync(request);
         var message = response.Match(

diff --git a/DotNetCliCodeSnippets/VerifyV2/VerifyCodeRequest.cs b/DotNetCliCodeSnippets/VerifyV2/VerifyCodeRequest.cs
@@ -9,15 +9,15 @@ public class VerifyCodeRequest : ICodeSnippet
 {
     public async Task Execute()
     {
-        var appId = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
-        var privateKeyPath = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
-        var requestId = Guid.Parse(Environment.GetEnvironmentVariable("REQUEST_ID") ?? "REQUEST_ID");
-        var verificationCode = Environment.GetEnvironmentVariable("VERIFICATION_CODE") ?? "VERIFICATION_CODE";
-        var credentials = Credentials.FromAppIdAndPrivateKeyPath(appId, privateKeyPath);
+        var VONAGE_APPLICATION_ID = Environment.GetEnvironmentVariable("VONAGE_APP_ID") ?? "VONAGE_APP_ID";
+        var VONAGE_APPLICATION_PRIVATE_KEY_PATH = Environment.GetEnvironmentVariable("VONAGE_PRIVATE_KEY_PATH") ?? "VONAGE_PRIVATE_KEY_PATH";
+        var REQUEST_ID = Guid.Parse(Environment.GetEnvironmentVariable("REQUEST_ID") ?? "REQUEST_ID");
+        var CODE = Environment.GetEnvironmentVariable("VERIFICATION_CODE") ?? "VERIFICATION_CODE";
+        var credentials = Credentials.FromAppIdAndPrivateKeyPath(VONAGE_APPLICATION_ID, VONAGE_APPLICATION_PRIVATE_KEY_PATH);
         var client = new VonageClient(credentials);
         var request = Vonage.VerifyV2.VerifyCode.VerifyCodeRequest.Build()
-            .WithRequestId(requestId)
-            .WithCode(verificationCode)
+            .WithRequestId(REQUEST_ID)
+            .WithCode(CODE)
             .Create();
         var response = await client.VerifyV2Client.VerifyCodeAsync(request);
         var message = response.Match(