Merge pull request #163 from Nexmo/application_fixes

Application Update / List, Redact, GetRecording fixed or added

Nexmo.Api/ApplicationV2.cs

@@ -64,24 +64,62 @@ public class Capabilities
 
     public class VoiceWebhook
     {
-        [JsonProperty("answer_url")]
-        public WebHook AnswerUrl { get; set; }
-        [JsonProperty("event_url")]
-        public WebHook EventUrl { get; set; }
+        [JsonProperty("webhooks")]
+        public webhooks Hooks { get; private set; }
+
+        public VoiceWebhook(Webhook answerUrl, Webhook eventUrl)
+        {
+            Hooks = new webhooks()
+            {
+                AnswerUrl = answerUrl,
+                EventUrl = eventUrl
+            };
+        }
+
+        public class webhooks
+        {
+            [JsonProperty("answer_url")]
+            public Webhook AnswerUrl { get; set; }
+            [JsonProperty("event_url")]
+            public Webhook EventUrl { get; set; }
+        }
     }
 
     public class RtcWebhook
     {
-        [JsonProperty("event_url")]
-        public WebHook EventUrl { get; set; }
+        [JsonProperty("webhooks")]
+        public webhooks Hooks { get; private set; }
+
+        public RtcWebhook(Webhook eventUrl)
+        {
+            Hooks = new webhooks() { EventUrl = eventUrl };
+        }
+
+        public class webhooks
+        {
+            [JsonProperty("event_url")]
+            public Webhook EventUrl { get; set; }
+        }
     }
 
     public class MessagesWebhook
     {
-        [JsonProperty("inbound_url")]
-        public WebHook InboundUrl { get; set; }
-        [JsonProperty("status_url")]
-        public WebHook StatusUrl { get; set; }
+        [JsonProperty("webhooks")]
+        public webhooks Hooks { get; private set; }
+
+        public MessagesWebhook(Webhook inboundUrl, Webhook statusUrl)
+        {
+            Hooks = new webhooks() { InboundUrl = inboundUrl, StatusUrl = statusUrl };
+        }
+
+        public class webhooks
+        {
+            [JsonProperty("inbound_url")]
+            public Webhook InboundUrl { get; set; }
+            [JsonProperty("status_url")]
+            public Webhook StatusUrl { get; set; }
+        }
+
     }
 
     public class VbcWebhook
@@ -173,7 +211,7 @@ public static List<AppResponse> List(int pageSize = 10, int page = 0,  Credentia
                 var authBytes = Encoding.UTF8.GetBytes(credentials.ApiKey + ":" + credentials.ApiSecret);
                 using (WebClient client = new WebClient())
                 {
-                    client.Headers[HttpRequestHeader.Authorization] = "Basic" + Convert.ToBase64String(authBytes);
+                    client.Headers[HttpRequestHeader.Authorization] = "Basic " + Convert.ToBase64String(authBytes);
                     client.Headers[HttpRequestHeader.ContentType] = "application/json";
                     client.QueryString.Add("page_size", pageSize.ToString());
                     client.QueryString.Add("page", page.ToString());

Nexmo.Api/Client/Call.cs

@@ -1,5 +1,7 @@
 using Newtonsoft.Json;
 using Nexmo.Api.Request;
+using System.IO;
+using System;
 
 namespace Nexmo.Api.ClientMethods
 {
@@ -120,5 +122,15 @@ public Voice.Call.CallCommandResponse SendDtmf(string id, Voice.Call.DtmfCommand
             return Voice.Call.SendDtmf(id, cmd, creds ?? Credentials);
         }
         #endregion
+
+        /// <summary>
+        /// Retrieves a Recording
+        /// <param name="recordingUrl">Url where the recording is stored</param>
+        /// <param name="creds">(Optional) Overridden credentials for only this request</param>
+        /// </summary>
+        public Voice.Call.CallGetRecordingResponse GetRecording(string recordingUrl, Credentials creds = null)
+        {
+            return Voice.Call.GetRecording(recordingUrl, creds ?? Credentials);
+        }
     }
 }

Nexmo.Api/Client/Redact.cs

@@ -17,9 +17,9 @@ public Redact(Credentials creds)
             Credentials = creds;
         }
 
-        public void RedactTransaction (RedactRequest redactRequest, Credentials creds = null)
+        public NexmoResponse RedactTransaction (RedactRequest redactRequest, Credentials creds = null)
         {
-            Nexmo.Api.Redact.RedactTransaction(redactRequest, creds ?? Credentials);
+            return Nexmo.Api.Redact.RedactTransaction(redactRequest, creds ?? Credentials);
         }
     }
 }

Nexmo.Api/Nexmo.Api.nuspec

@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>Nexmo.Csharp.Client</id>
-		<version>3.0.1</version>
+		<version>4.1.0</version>
 		<title>Nexmo API Client</title>
 		<authors>Nexmo</authors>
 		<owners>Nexmo</owners>
@@ -12,7 +12,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>Official C#/.NET wrapper for the Nexmo API</description>
 		<releaseNotes>
-			* Fix missing NumberInsight instantiation on client
+			* adding workflow_id to VerifyRequest
 		</releaseNotes>
 		<copyright>© Nexmo 2018</copyright>
 		<tags>SMS voice telephony phone nexmo</tags>

Nexmo.Api/Properties/AssemblyInfo.cs

@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("4.1.0.0")]
+[assembly: AssemblyFileVersion("4.1.0.0")]

Nexmo.Api/Redact.cs

@@ -50,9 +50,9 @@ public RedactRequest(string id, string product, string type)
         /// <param name="redactRequest"></param>
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         /// <returns></returns>
-        public static void RedactTransaction(RedactRequest redactRequest, Credentials creds = null)
+        public static NexmoResponse RedactTransaction(RedactRequest redactRequest, Credentials creds = null)
         {
-            ApiRequest.DoPostRequestWithContent(ApiRequest.GetBaseUriFor(typeof(Redact), "/v1/redact/transaction"), redactRequest, creds);
+            return VersionedApiRequest.DoRequest("POST",ApiRequest.GetBaseUriFor(typeof(Redact), "/v1/redact/transaction"), redactRequest, creds);
         }
     }
 }

Nexmo.Api/Request/ApiRequest.cs

@@ -294,6 +294,42 @@ public static NexmoResponse DoRequest(string method, Uri uri, object requestBody
             }
         }
 
+        internal static HttpResponseMessage DoRequestJwt(Uri uri, Credentials creds)
+        {
+            var appId = creds?.ApplicationId ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Id"];
+            var appKeyPath = creds?.ApplicationKey ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Key"];
+
+            var req = new HttpRequestMessage
+            {
+                RequestUri = uri,
+                Method = HttpMethod.Get
+            };
+
+            VersionedApiRequest.SetUserAgent(ref req, creds);
+
+            req.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer",
+                Jwt.CreateToken(appId, appKeyPath));
+
+            using (LogProvider.OpenMappedContext("ApiRequest.DoRequestJwt", uri.GetHashCode()))
+            {
+                Logger.Debug($"GET {uri}");
+                var sendTask = Configuration.Instance.Client.SendAsync(req);
+                sendTask.Wait();
+
+                if (!sendTask.Result.IsSuccessStatusCode)
+                {
+                    Logger.Error($"FAIL: {sendTask.Result.StatusCode}");
+
+                    if (string.Compare(Configuration.Instance.Settings["appSettings:Nexmo.Api.EnsureSuccessStatusCode"],
+                            "true", StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        sendTask.Result.EnsureSuccessStatusCode();
+                    }
+                }
+                return sendTask.Result;
+            }
+        }
+
         internal static NexmoResponse DoPostRequest(Uri uri, object parameters, Credentials creds = null)
         {
             var apiParams = GetParameters(parameters);

Nexmo.Api/Request/VersionedApiRequest.cs

@@ -134,7 +134,7 @@ public static NexmoResponse DoRequest(string method, Uri uri, object payload, Cr
 
             // do we need to use basic auth?
             // TODO / HACK: this is a newer auth method that needs to be incorporated better in the future
-            if (uri.AbsolutePath.StartsWith("/accounts/") || uri.AbsolutePath.StartsWith("/v2/applications"))
+            if (uri.AbsolutePath.StartsWith("/accounts/") || uri.AbsolutePath.StartsWith("/v2/applications") || uri.AbsolutePath.StartsWith("/v1/redact/transaction"))
             {
                 var authBytes = Encoding.UTF8.GetBytes(creds.ApiKey + ":" + creds.ApiSecret);
                 req.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic",

Nexmo.Api/Voice/Call.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Nexmo.Api.Helpers;
@@ -112,6 +114,19 @@ public class CallCommandResponse
             public string uuid { get; set; }
         }
 
+        public class CallGetRecordingResponse
+        {
+            /// <summary>
+            /// Response Status of the HTTP Request
+            /// </summary>
+            public HttpStatusCode Status { get; set; }
+
+            /// <summary>
+            /// Stream of bytes containg the recording file's content
+            /// </summary>
+            public byte[] ResultStream { get; set; }
+        }
+
         public class CallEditCommand
         {
             /// <summary>
@@ -306,5 +321,25 @@ public static CallResponse Edit(string id, CallEditCommand cmd, Credentials cred
 
             return JsonConvert.DeserializeObject<CallResponse>(response.JsonResponse);
         }
+
+        public static CallGetRecordingResponse GetRecording(string url, Credentials creds = null)
+        {
+            using (var response = ApiRequest.DoRequestJwt(new Uri(url), creds))
+            {
+                var readTask = response.Content.ReadAsStreamAsync();
+                byte[] bytes;
+                readTask.Wait();
+                using (var ms = new MemoryStream())
+                {
+                    readTask.Result.CopyTo(ms);
+                    bytes = ms.ToArray();
+                }
+                return new CallGetRecordingResponse()
+                {
+                    ResultStream = bytes,
+                    Status = response.StatusCode
+                };
+            }
+        }
     }
 }