Merge pull request #156 from Nexmo/ApplicationV2

Application v2 - READY TO MERGE
Vonage · Jun 11, 2019 · 369cc93 · 369cc93
2 parents 93f41fb + 731ca4c
commit 369cc93
Show file tree

Hide file tree

Showing 10 changed files with 419 additions and 156 deletions.
diff --git a/Nexmo.Api.Test.Integration/ApplicationTest.cs b/Nexmo.Api.Test.Integration/ApplicationTest.cs
diff --git a/Nexmo.Api.Test.Unit/ApplicationTest.cs b/Nexmo.Api.Test.Unit/ApplicationTest.cs
diff --git a/Nexmo.Api.Test.Unit/ApplicationV2Test.cs b/Nexmo.Api.Test.Unit/ApplicationV2Test.cs
@@ -0,0 +1,90 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Nexmo.Api.Request;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nexmo.Api.Test.Unit
+{
+    [TestClass]
+    public class ApplicationV2Test : MockedWebTest
+    {
+        [TestMethod]
+        public void ShouldCreateApplication()
+        {
+            var appRequest = new AppRequest
+            {
+                Name = "AppV2Test"
+            };
+
+
+            SetExpect($"{ApiUrl}/v2/applications",
+"{\"id\":\"ffffffff-ffff-ffff-ffff-ffffffffffff\",\"name\":\"AppV2Test\",\"capabilities\":{},\"keys\":{\"public_key\":\"-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxyBT5FqzibSYK0vB+Gr\\nP+YlyYqsx4lvAmotTwmObZEhTWNAdU0p9hrnNXWX1Gy5O0NDIue40SUhYhJT5r4x\\nugbpNA/1KJauB8VQjetKr9bu697yskz2+EuKa2D9e6N2EMY6PD1tJWmeMmddM1tW\\n2DAXuYo7/xsDWIIA6egCTzyShNvzlKo5081t41xVVsPjsWN887Xp1KYfE0IMGV2j\\n8Nwdtw/MQfP/7Qz7i9VXb7bgx0LEg84dWsnz8u3VZ3IQHlydzPX/2iw7e4pc+k27\\nOU1SkmPn/2JtfFFS2LJpcO/FmdSyNnyHezNPyzNRLVbE0sJJ1tEhxi9GZc1I+Oc4\\ndwIDAQAB\\n-----END PUBLIC KEY-----\\n\",\"private_key\":\"-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDHIFPkWrOJtJg\\nrS8H4as/5iXJiqzHiW8Cai1PCY5tkSFNY0B1TSn2Guc1dZfUbLk7Q0Mi57jRJSFi\\nElPmvjG6Buk0D/Uolq4HxVCN60qv1u7r3vKyTPb4S4prYP17o3YQxjo8PW0laZ4y\\nZ10zW1bYMBe5ijv/GwNYggDp6AJPPJKE2/OUqjnTzW3jXFVWw+OxY3zztenUph8T\\nQgwZXaPw3B23D8xB8//tDPuL1VdvtuDHQsSDzh1ayfPy7dVnchAeXJ3M9f/aLDt7\\nilz6Tbs5TVKSY+f/Ym18UVLYsmlw78WZ1LI2fId7M0/LM1EtVsTSwknW0SHGL0Zl\\nzUj45zh3AgMBAAECggEAFP06iJ7p9fkQKwKbwMXNQIes1fm7QjtDJr0vAvB8vXBe\\nPER/7n6EE+vApqwapBP5eJTGTU7PP382kFB3bScAaMo4iSIUVgRLqXNXtJoKGVDO\\nYq/DvQbxjzQVKnMEdyoBAqdIeYAu1IEAWdzBFnbDfhNCYh0q/MkLpZhVVSm2dzkq\\nl+xrEOTyuE48RQxTQqliUYXXlUd5+bjR+oREuYsjt8j9iiK1u6Gv2ztDPeyzupny\\ntCvSlykvAKn/K6xmeO4hapPKUZ7DRthg3I3uPx+mw48GvO28mzhsqXpbDcYI7q82\\nfZgZJ3JKBTRaNnEE8d5llblC5dksMttLgO2EewdXlQKBgQDscfdVVvLYDW3lsPKl\\nAhEmi3ZcWvzDMCGeGLjJEZPfMnc+7rKbCBADQzNMZI/bsWwMJdQCMy2xMaDXr4Ew\\n4TiBdQ7ogpRex9yuJ3miKs3eey6bvpNxV70lj/xvZoSu7oANSFOCMNFUvSWFTPC5\\nNiNGk35g6xklf3WAYLx4bVJcDQKBgQDTP2qL2zQbU/hmQPnq8x/wgGn8T6zQZXbt\\nojyNPTsnIbQhwQzlFM01SzNsF4hVMB8Zz6r+8XHuo3TsDdg6Orx1auIV5lXCWMj/\\n3MW/jy2JabXJyh7BViHFqQjBPHWDrX17TGGsLK/rfOqMRPPgBGTXfVhINaCo7EAh\\nSTPv2x2RkwKBgBQinGpzDhkiA6LUz8UHiQhcRgcVZIMGvUYmWs4cphgSxx7f2uvi\\n4uI0PdEamzmdQVNDgWtyikiVrlnPw1OzSkmT+2IHhLURlhRqniwWMxPoL47pysqT\\nKzNgsKGX/GKdQuBesWXb3Ge399MDO1i6aIShGNkODEUqNoppMoOa47GdAoGAWn3t\\n/F84YQSFgfgPlu/zHKlFvYm788GjQoSe/7ndHxQ2/8ac6X0RsuS18HXcNvHYQMxO\\n6cswDRQEQCJmH/uNQ5c3pj33OruhzskaBMcmsJiSAREOP6/P48ZXM7/cbz3gZPMB\\nXCoAahYmu1PGTI5VTGIrcTNX0UTy689Z6kOo1PUCgYEAjYPkvv4j286XbGHDQyt7\\ngPvbFUPwtYxwk0u/CuZ1scBkVRCMwc8Gic1hL0yB09nvp86cCjNyYcFqa8fTpjom\\n0C7wjZd6zHR4y23U/jVxhdny6lotpgpWKO7DVprjyHQ90yGu+EDq3jDCOjyhdmqP\\n766dkdpKIYoBJOTH9+3r8gc=\\n-----END PRIVATE KEY-----\\n\"}}",
+$"api_key={ApiKey}&api_secret={ApiSecret}&");
+
+
+            var result = ApplicationV2.Create(appRequest);
+
+            Assert.AreEqual("ffffffff-ffff-ffff-ffff-ffffffffffff", result.Id);
+        }
+
+        [TestMethod]
+        public void ShouldGetListOfApplications()
+        {
+            SetExpect($"{ApiUrl}/v2/applications?page_size=10&page_index=0&api_key={ApiKey}&api_secret={ApiSecret}&",
+"{\"count\":1,\"page_size\":10,\"page_index\":0,\"_embedded\":{\"applications\":[{\"id\":\"ffffffff-ffff-ffff-ffff-ffffffffffff\",\"name\":\"AppV2Test\",\"capabilities\":{},\"keys\":{\"public_key\":\"-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxyBT5FqzibSYK0vB+Gr\\nP+YlyYqsx4lvAmotTwmObZEhTWNAdU0p9hrnNXWX1Gy5O0NDIue40SUhYhJT5r4x\\nugbpNA/1KJauB8VQjetKr9bu697yskz2+EuKa2D9e6N2EMY6PD1tJWmeMmddM1tW\\n2DAXuYo7/xsDWIIA6egCTzyShNvzlKo5081t41xVVsPjsWN887Xp1KYfE0IMGV2j\\n8Nwdtw/MQfP/7Qz7i9VXb7bgx0LEg84dWsnz8u3VZ3IQHlydzPX/2iw7e4pc+k27\\nOU1SkmPn/2JtfFFS2LJpcO/FmdSyNnyHezNPyzNRLVbE0sJJ1tEhxi9GZc1I+Oc4\\ndwIDAQAB\\n-----END PUBLIC KEY-----\\n\"}");
+
+            var results = ApplicationV2.List();
+
+            Assert.AreEqual(1, results.Count);
+        }
+
+        [TestMethod]
+        public void ShouldGetApplication()
+        {
+            var appId = "ffffffff-ffff-ffff-ffff-ffffffffffff";
+
+            SetExpect($"{ApiUrl}/v2/applications/{appId}?api_key={ApiKey}&api_secret={ApiSecret}&",
+"{\"id\":\"ffffffff-ffff-ffff-ffff-ffffffffffff\",\"name\":\"AppV2Test\",\"capabilities\":{},\"keys\":{\"public_key\":\"-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxyBT5FqzibSYK0vB+Gr\\nP+YlyYqsx4lvAmotTwmObZEhTWNAdU0p9hrnNXWX1Gy5O0NDIue40SUhYhJT5r4x\\nugbpNA/1KJauB8VQjetKr9bu697yskz2+EuKa2D9e6N2EMY6PD1tJWmeMmddM1tW\\n2DAXuYo7/xsDWIIA6egCTzyShNvzlKo5081t41xVVsPjsWN887Xp1KYfE0IMGV2j\\n8Nwdtw/MQfP/7Qz7i9VXb7bgx0LEg84dWsnz8u3VZ3IQHlydzPX/2iw7e4pc+k27\\nOU1SkmPn/2JtfFFS2LJpcO/FmdSyNnyHezNPyzNRLVbE0sJJ1tEhxi9GZc1I+Oc4\\ndwIDAQAB\\n-----END PUBLIC KEY-----\\n\"}");
+
+            var results = ApplicationV2.Get(appId);
+
+            Assert.AreEqual(appId, results.Id);
+        }
+
+        [TestMethod]
+        public void ShouldUpdateApplication()
+        {
+            var appId = "ffffffff-ffff-ffff-ffff-ffffffffffff";
+            var appRequest = new AppRequest
+            {
+                Id = "ffffffff-ffff-ffff-ffff-ffffffffffff",
+                Name = "UpdatedAppTest"
+            };
+
+            // TODO: don't want to introduce UrlEncode dependency, but URLs are hardcoded
+            SetExpect($"{ApiUrl}/v2/applications/{appId}?id={appId}&name={appRequest.Name}&api_key={ApiKey}&api_secret={ApiSecret}&",
+"{\"id\":\"ffffffff-ffff-ffff-ffff-ffffffffffff\",\"name\":\"UpdatedAppTest\",\"capabilities\":{},\"keys\":{\"public_key\":\"-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxyBT5FqzibSYK0vB+Gr\\nP+YlyYqsx4lvAmotTwmObZEhTWNAdU0p9hrnNXWX1Gy5O0NDIue40SUhYhJT5r4x\\nugbpNA/1KJauB8VQjetKr9bu697yskz2+EuKa2D9e6N2EMY6PD1tJWmeMmddM1tW\\n2DAXuYo7/xsDWIIA6egCTzyShNvzlKo5081t41xVVsPjsWN887Xp1KYfE0IMGV2j\\n8Nwdtw/MQfP/7Qz7i9VXb7bgx0LEg84dWsnz8u3VZ3IQHlydzPX/2iw7e4pc+k27\\nOU1SkmPn/2JtfFFS2LJpcO/FmdSyNnyHezNPyzNRLVbE0sJJ1tEhxi9GZc1I+Oc4\\ndwIDAQAB\\n-----END PUBLIC KEY-----\\n\"},\"_links\":{\"self\":{\"href\":\"/v1/applications/ffffffff-ffff-ffff-ffff-ffffffffffff\"}}}");
+
+            var result = ApplicationV2.Update(appRequest);
+
+            Assert.AreEqual("UpdatedAppTest", result.Name);
+        }
+
+        [TestMethod]
+        public void ShouldDeleteApplication()
+        {
+            var appId = "ffffffff-ffff-ffff-ffff-ffffffffffff";
+
+            SetExpect($"{ApiUrl}/v2/applications/{appId}?api_key={ApiKey}&api_secret={ApiSecret}&",
+"");
+            SetExpectStatus(HttpStatusCode.NoContent);
+            var result = ApplicationV2.Delete(appId);
+
+            Assert.AreEqual(true, result);
+        }
+    }
+}
diff --git a/Nexmo.Api/Application.cs b/Nexmo.Api/Application.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Net;
 using Newtonsoft.Json;
 using Nexmo.Api.Request;
@@ -61,10 +62,10 @@ public class KeyPair
 
     public class VoiceHooks
     {
-        public Webhook[] webhooks { get; set; }
+        public WebHook[] webhook { get; set; }
     }
 
-    public class Webhook
+    public class WebHook
     {
         public string endpoint { get; set; }
         public string endpoint_type { get; set; }
@@ -98,6 +99,7 @@ public class ApplicationList
     public class ApplicationListResponse : PaginatedResponse<ApplicationList>
     {}
 
+    [Obsolete("This version of the API has been deprecated", true)]
     public class Application
     {
         /// <summary>