Merge pull request #267 from Vonage/dev

Dev into Main for Release
Vonage · Apr 20, 2022 · cd3c53a · cd3c53a
2 parents ef3761a + 857c132
commit cd3c53a
Show file tree

Hide file tree

Showing 50 changed files with 1,319 additions and 204 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, dev ]
 
 jobs:
   build:

diff --git a/Nexmo.Api.Test.Unit/Nexmo.Api.Test.Unit.csproj b/Nexmo.Api.Test.Unit/Nexmo.Api.Test.Unit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;net46;net461;net462;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net47;net471;net472;net48;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net452;net46;net462;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net47;net471;net472;net48;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <NoWarn>1701;1702;0618</NoWarn>
     <IsPackable>false</IsPackable>
     <Configurations>Debug;Release;ReleaseSigned</Configurations>

diff --git a/Vonage.Test.Unit/AccountTest.cs b/Vonage.Test.Unit/AccountTest.cs
@@ -377,7 +377,11 @@ public void CreateApiSecret(bool passCreds)
             //ASSERT
             Assert.Equal("ad6dc56f-07b5-46e1-a527-85530e625800", secret.Id);
             Assert.Equal("2017-03-02T16:34:49Z", secret.CreatedAt);
-            Assert.Equal("abc123", secret.Links.Self.Href);            
+            Assert.Equal("abc123", secret.Links.Self.Href);
+            Assert.Null(secret.Links.Next);
+            Assert.Null(secret.Links.Prev);
+            Assert.Null(secret.Links.First);
+            Assert.Null(secret.Links.Last);
         }
 
         [Theory]

diff --git a/Vonage.Test.Unit/Data/MessagingTests/SendSmsAsyncBadResponse.json b/Vonage.Test.Unit/Data/MessagingTests/SendSmsAsyncBadResponse.json
@@ -0,0 +1,9 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "4",
+      "error-text": "invalid credentials"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/MessagingTests/SendSmsAsyncWithAllPropertiesSet.json b/Vonage.Test.Unit/Data/MessagingTests/SendSmsAsyncWithAllPropertiesSet.json
@@ -0,0 +1,14 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "to": "447700900000",
+      "message-id": "0A0000000123ABCD1",
+      "status": "0",
+      "remaining-balance": "3.14159265",
+      "message-price": "0.03330000",
+      "network": "12345",
+      "account-ref": "customer1234"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/MessagingTests/SendSmsBadResponse.json b/Vonage.Test.Unit/Data/MessagingTests/SendSmsBadResponse.json
@@ -0,0 +1,9 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "4",
+      "error-text": "invalid credentials"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/MessagingTests/SendSmsTypicalUsageSimplifiedAsync.json b/Vonage.Test.Unit/Data/MessagingTests/SendSmsTypicalUsageSimplifiedAsync.json
@@ -0,0 +1,14 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "to": "447700900000",
+      "message-id": "0A0000000123ABCD1",
+      "status": "0",
+      "remaining-balance": "3.14159265",
+      "message-price": "0.03330000",
+      "network": "12345",
+      "account-ref": "customer1234"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/MessagingTests/SendSmsWithAllPropertiesSet.json b/Vonage.Test.Unit/Data/MessagingTests/SendSmsWithAllPropertiesSet.json
@@ -0,0 +1,14 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "to": "447700900000",
+      "message-id": "0A0000000123ABCD1",
+      "status": "0",
+      "remaining-balance": "3.14159265",
+      "message-price": "0.03330000",
+      "network": "12345",
+      "account-ref": "customer1234"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/MessagingTests/SendSmsWrongCredentialsThrowsException.json b/Vonage.Test.Unit/Data/MessagingTests/SendSmsWrongCredentialsThrowsException.json
@@ -0,0 +1,9 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "4",
+      "error-text": "invalid credentials"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/Redact.json b/Vonage.Test.Unit/Data/RedactTests/Redact.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/RedactAsync.json b/Vonage.Test.Unit/Data/RedactTests/RedactAsync.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/RedactReturns401.json b/Vonage.Test.Unit/Data/RedactTests/RedactReturns401.json
@@ -0,0 +1,4 @@
+{
+  "type": "UNAUTHORIZED",
+  "error_title": "Unauthorized"
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/RedactReturns403.json b/Vonage.Test.Unit/Data/RedactTests/RedactReturns403.json
@@ -0,0 +1,6 @@
+{
+  "type": "https://developer.nexmo.com/api-errors/redact#premature-redaction",
+  "title": "Premature Redaction",
+  "detail": "You must wait 60 minutes before redacting ID '0A000000B0C9A1234'",
+  "instance": "bf0ca0bf927b3b52e3cb03217e1a1ddf"
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/RedactReturns404.json b/Vonage.Test.Unit/Data/RedactTests/RedactReturns404.json
@@ -0,0 +1,6 @@
+{
+  "type": "https://developer.nexmo.com/api-errors#invalid-id",
+  "title": "Invalid ID",
+  "detail": "ID '0A000000B0C9A1234' could not be found (type=MT)",
+  "instance": "bf0ca0bf927b3b52e3cb03217e1a1ddf"
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/RedactReturns422.json b/Vonage.Test.Unit/Data/RedactTests/RedactReturns422.json
@@ -0,0 +1,6 @@
+{
+  "type": "https://developer.nexmo.com/api-errors#invalid-json",
+  "title": "Invalid JSON",
+  "detail": "Unexpected character ('\"' (code 34)): was expecting comma to separate Object entries",
+  "instance": "bf0ca0bf927b3b52e3cb03217e1a1ddf"
+}
diff --git a/Vonage.Test.Unit/Data/RedactTests/RedactReturns429.json b/Vonage.Test.Unit/Data/RedactTests/RedactReturns429.json
@@ -0,0 +1,6 @@
+{
+  "type": "https://developer.nexmo.com/api-errors/redact#rate-limit",
+  "title": "Rate Limit Hit",
+  "detail": "Please wait, then retry your request",
+  "instance": "bf0ca0bf927b3b52e3cb03217e1a1ddf"
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/ManageOptIn.json b/Vonage.Test.Unit/Data/ShortCodeTests/ManageOptIn.json
@@ -0,0 +1,6 @@
+{
+  "msisdn": "15559301529",
+  "opt-in": "true",
+  "opt-in-date": "2014-08-21 17:34:47",
+  "opt-out": "false"
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/ManageOptInAsync.json b/Vonage.Test.Unit/Data/ShortCodeTests/ManageOptInAsync.json
@@ -0,0 +1,6 @@
+{
+  "msisdn": "15559301529",
+  "opt-in": "true",
+  "opt-in-date": "2014-08-21 17:34:47",
+  "opt-out": "false"
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/QueryOptIns.json b/Vonage.Test.Unit/Data/ShortCodeTests/QueryOptIns.json
@@ -0,0 +1,24 @@
+{
+  "opt-in-count": "3",
+  "opt-in-list": [
+    {
+      "msisdn": "15558937009",
+      "opt-in": "false",
+      "opt-out": "true",
+      "opt-out-date": "2014-06-27 18:31:33"
+    },
+    {
+      "msisdn": "15554908975",
+      "opt-in": "false",
+      "opt-out": "true",
+      "opt-out-date": "2014-07-18 16:20:20"
+    },
+    {
+      "msisdn": "15559912501",
+      "opt-in": "false",
+      "opt-in-date": "2014-07-18 15:28:23",
+      "opt-out": "true",
+      "opt-out-date": "2014-08-18 23:17:40"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/QueryOptInsAsync.json b/Vonage.Test.Unit/Data/ShortCodeTests/QueryOptInsAsync.json
@@ -0,0 +1,24 @@
+{
+  "opt-in-count": "3",
+  "opt-in-list": [
+    {
+      "msisdn": "15558937009",
+      "opt-in": "false",
+      "opt-out": "true",
+      "opt-out-date": "2014-06-27 18:31:33"
+    },
+    {
+      "msisdn": "15554908975",
+      "opt-in": "false",
+      "opt-out": "true",
+      "opt-out-date": "2014-07-18 16:20:20"
+    },
+    {
+      "msisdn": "15559912501",
+      "opt-in": "false",
+      "opt-in-date": "2014-07-18 15:28:23",
+      "opt-out": "true",
+      "opt-out-date": "2014-08-18 23:17:40"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/SendAlert.json b/Vonage.Test.Unit/Data/ShortCodeTests/SendAlert.json
@@ -0,0 +1,16 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "delivered",
+      "message-id": "abcdefg",
+      "to": "16365553226",
+      "client-ref": "client-ref",
+      "remaining-balance": "remaining-balance",
+      "message-price": "message-price",
+      "network": "network",
+      "error-code": "0",
+      "error-text": "error-message"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/SendAlertAsync.json b/Vonage.Test.Unit/Data/ShortCodeTests/SendAlertAsync.json
@@ -0,0 +1,16 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "delivered",
+      "message-id": "abcdefg",
+      "to": "16365553226",
+      "client-ref": "client-ref",
+      "remaining-balance": "remaining-balance",
+      "message-price": "message-price",
+      "network": "network",
+      "error-code": "0",
+      "error-text": "error-message"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/SendTwoFactorAuth.json b/Vonage.Test.Unit/Data/ShortCodeTests/SendTwoFactorAuth.json
@@ -0,0 +1,15 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "returnCode",
+      "message-id": "messageId",
+      "to": "to",
+      "client-ref": "client-ref",
+      "remaining-balance": "remaining-balance",
+      "message-price": "message-price",
+      "network": "network",
+      "error-text": "error-message"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/Data/ShortCodeTests/SendTwoFactorAuthAsync.json b/Vonage.Test.Unit/Data/ShortCodeTests/SendTwoFactorAuthAsync.json
@@ -0,0 +1,15 @@
+{
+  "message-count": "1",
+  "messages": [
+    {
+      "status": "returnCode",
+      "message-id": "messageId",
+      "to": "to",
+      "client-ref": "client-ref",
+      "remaining-balance": "remaining-balance",
+      "message-price": "message-price",
+      "network": "network",
+      "error-text": "error-message"
+    }
+  ]
+}
diff --git a/Vonage.Test.Unit/JwtTest.cs b/Vonage.Test.Unit/JwtTest.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xunit;
+using Xunit;
 
 namespace Vonage.Test.Unit
 {