From 2947463a6014d0994342a95cf7ed61e00f115014 Mon Sep 17 00:00:00 2001
From: RobMalvern <rob@randomtask.co.uk>
Date: Wed, 6 Sep 2017 08:38:57 +0100
Subject: [PATCH 1/4] WIP for filtering

Adding support for JSON filters, incomplete - commited for discussion
---
 src/VimeoDotNet/IVimeoClient.cs       |  3 ++-
 src/VimeoDotNet/Net/ApiRequest.cs     | 13 +++++++++++++
 src/VimeoDotNet/Net/IApiRequest.cs    |  4 ++++
 src/VimeoDotNet/VimeoClient_Videos.cs | 14 +++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/VimeoDotNet/IVimeoClient.cs b/src/VimeoDotNet/IVimeoClient.cs
index 43c93ed..0348d0d 100644
--- a/src/VimeoDotNet/IVimeoClient.cs
+++ b/src/VimeoDotNet/IVimeoClient.cs
@@ -167,9 +167,10 @@ Paginated<Video> GetAlbumVideos(long albumId, int? page, int? perPage,
         /// <param name="perPage">Number of items to show on each page. Max 50.</param>
         /// <param name="sort">The default sort order of an Album's videos</param>
         /// <param name="direction">The direction that the results are sorted.</param>
+        /// <param name="fields">JSON filter, as per https://developer.vimeo.com/api/common-formats#json-filter </param>
         /// <returns>Paginated videos</returns>
         Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage,
-            string sort = null, string direction = null);
+            string sort = null, string direction = null, string[] fields = null);
 
         /// <summary>
         /// Get video from album by AlbumId and ClipId
diff --git a/src/VimeoDotNet/Net/ApiRequest.cs b/src/VimeoDotNet/Net/ApiRequest.cs
index 2430d3c..a898a63 100644
--- a/src/VimeoDotNet/Net/ApiRequest.cs
+++ b/src/VimeoDotNet/Net/ApiRequest.cs
@@ -21,6 +21,7 @@ public class ApiRequest : IApiRequest
         private readonly Dictionary<string, string> _hashValues = new Dictionary<string, string>();
         private readonly Dictionary<string, string> _queryString = new Dictionary<string, string>();
         private readonly Dictionary<string, string> _urlSegments = new Dictionary<string, string>();
+        private readonly List<string> _fields = new List<string>();
         private static readonly JsonSerializerSettings DateFormatSettings = new JsonSerializerSettings
         {
             DateFormatString = "yyyy-MM-ddTHH:mm:sszzz",
@@ -97,6 +98,14 @@ public IDictionary<string, string> Query
             get { return _queryString; }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<string> Fields
+        {
+            get { return _fields; }
+        }
+
         /// <summary>
         ///
         /// </summary>
@@ -439,6 +448,10 @@ protected string BuildUrl()
             {
                 path = path.Replace($"{{{urlSegment.Key}}}", urlSegment.Value);
             }
+            if (_fields.Count > 0)
+            {
+                Query.Add("fields", string.Concat(",", _fields));
+            }
             sb.Append(path);
             if (Query.Keys.Count == 0)
                 return sb.ToString();
diff --git a/src/VimeoDotNet/Net/IApiRequest.cs b/src/VimeoDotNet/Net/IApiRequest.cs
index fe6c560..a9460a8 100644
--- a/src/VimeoDotNet/Net/IApiRequest.cs
+++ b/src/VimeoDotNet/Net/IApiRequest.cs
@@ -50,6 +50,10 @@ public interface IApiRequest
         /// </summary>
         bool ExcludeAuthorizationHeader { get; set; }
         /// <summary>
+        /// 
+        /// </summary>
+        List<string> Fields { get; }
+        /// <summary>
         ///
         /// </summary>
         IDictionary<string, string> Query { get; }
diff --git a/src/VimeoDotNet/VimeoClient_Videos.cs b/src/VimeoDotNet/VimeoClient_Videos.cs
index 5d2ac9c..dbaf391 100644
--- a/src/VimeoDotNet/VimeoClient_Videos.cs
+++ b/src/VimeoDotNet/VimeoClient_Videos.cs
@@ -76,12 +76,13 @@ public async Task<Video> GetAlbumVideoAsync(long albumId, long clipId)
         /// <param name="perPage">Number of items to show on each page. Max 50.</param>
         /// <param name="sort">The default sort order of an Album's videos</param>
         /// <param name="direction">The direction that the results are sorted.</param>
+        /// <param name="fields">JSON filter, as per https://developer.vimeo.com/api/common-formats#json-filter </param>
         /// <returns>Paginated videos</returns>
-        public async Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage, string sort = null, string direction = null)
+        public async Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage, string sort = null, string direction = null, string[] fields = null)
         {
             try
             {
-                var request = GenerateAlbumVideosRequest(albumId, page: page, perPage: perPage, sort: sort, direction: direction);
+                var request = GenerateAlbumVideosRequest(albumId, page: page, perPage: perPage, sort: sort, direction: direction, fields: fields);
                 var response = await request.ExecuteRequestAsync<Paginated<Video>>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving account album videos.", HttpStatusCode.NotFound);
@@ -393,7 +394,7 @@ private IApiRequest GenerateVideosRequest(long? userId = null, long? clipId = nu
             return request;
         }
 
-        private IApiRequest GenerateAlbumVideosRequest(long albumId, long? userId = null, long? clipId = null, int? page = null, int? perPage = null, string sort = null, string direction = null)
+        private IApiRequest GenerateAlbumVideosRequest(long albumId, long? userId = null, long? clipId = null, int? page = null, int? perPage = null, string sort = null, string direction = null, string[] fields = null)
         {
             ThrowIfUnauthorized();
 
@@ -411,6 +412,13 @@ private IApiRequest GenerateAlbumVideosRequest(long albumId, long? userId = null
             {
                 request.UrlSegments.Add("clipId", clipId.ToString());
             }
+            if (fields != null)
+            {
+                foreach (var field in fields)
+                {
+                    request.Fields.Add(field);
+                }
+            }
             if (page.HasValue)
             {
                 request.Query.Add("page", page.ToString());

From 9e343a3422dd9c6e5b5e1791e2d0e52fb2d8b52a Mon Sep 17 00:00:00 2001
From: RobMalvern <rob@randomtask.co.uk>
Date: Wed, 6 Sep 2017 08:38:57 +0100
Subject: [PATCH 2/4] WIP for filtering

Adding support for JSON filters, incomplete - commited for discussion
---
 src/VimeoDotNet/IVimeoClient.cs       |  3 ++-
 src/VimeoDotNet/Net/ApiRequest.cs     | 13 +++++++++++++
 src/VimeoDotNet/Net/IApiRequest.cs    |  4 ++++
 src/VimeoDotNet/VimeoClient_Videos.cs | 14 +++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/VimeoDotNet/IVimeoClient.cs b/src/VimeoDotNet/IVimeoClient.cs
index 43c93ed..0348d0d 100644
--- a/src/VimeoDotNet/IVimeoClient.cs
+++ b/src/VimeoDotNet/IVimeoClient.cs
@@ -167,9 +167,10 @@ Paginated<Video> GetAlbumVideos(long albumId, int? page, int? perPage,
         /// <param name="perPage">Number of items to show on each page. Max 50.</param>
         /// <param name="sort">The default sort order of an Album's videos</param>
         /// <param name="direction">The direction that the results are sorted.</param>
+        /// <param name="fields">JSON filter, as per https://developer.vimeo.com/api/common-formats#json-filter </param>
         /// <returns>Paginated videos</returns>
         Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage,
-            string sort = null, string direction = null);
+            string sort = null, string direction = null, string[] fields = null);
 
         /// <summary>
         /// Get video from album by AlbumId and ClipId
diff --git a/src/VimeoDotNet/Net/ApiRequest.cs b/src/VimeoDotNet/Net/ApiRequest.cs
index 2430d3c..a898a63 100644
--- a/src/VimeoDotNet/Net/ApiRequest.cs
+++ b/src/VimeoDotNet/Net/ApiRequest.cs
@@ -21,6 +21,7 @@ public class ApiRequest : IApiRequest
         private readonly Dictionary<string, string> _hashValues = new Dictionary<string, string>();
         private readonly Dictionary<string, string> _queryString = new Dictionary<string, string>();
         private readonly Dictionary<string, string> _urlSegments = new Dictionary<string, string>();
+        private readonly List<string> _fields = new List<string>();
         private static readonly JsonSerializerSettings DateFormatSettings = new JsonSerializerSettings
         {
             DateFormatString = "yyyy-MM-ddTHH:mm:sszzz",
@@ -97,6 +98,14 @@ public IDictionary<string, string> Query
             get { return _queryString; }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<string> Fields
+        {
+            get { return _fields; }
+        }
+
         /// <summary>
         ///
         /// </summary>
@@ -439,6 +448,10 @@ protected string BuildUrl()
             {
                 path = path.Replace($"{{{urlSegment.Key}}}", urlSegment.Value);
             }
+            if (_fields.Count > 0)
+            {
+                Query.Add("fields", string.Concat(",", _fields));
+            }
             sb.Append(path);
             if (Query.Keys.Count == 0)
                 return sb.ToString();
diff --git a/src/VimeoDotNet/Net/IApiRequest.cs b/src/VimeoDotNet/Net/IApiRequest.cs
index fe6c560..a9460a8 100644
--- a/src/VimeoDotNet/Net/IApiRequest.cs
+++ b/src/VimeoDotNet/Net/IApiRequest.cs
@@ -50,6 +50,10 @@ public interface IApiRequest
         /// </summary>
         bool ExcludeAuthorizationHeader { get; set; }
         /// <summary>
+        /// 
+        /// </summary>
+        List<string> Fields { get; }
+        /// <summary>
         ///
         /// </summary>
         IDictionary<string, string> Query { get; }
diff --git a/src/VimeoDotNet/VimeoClient_Videos.cs b/src/VimeoDotNet/VimeoClient_Videos.cs
index 5d2ac9c..dbaf391 100644
--- a/src/VimeoDotNet/VimeoClient_Videos.cs
+++ b/src/VimeoDotNet/VimeoClient_Videos.cs
@@ -76,12 +76,13 @@ public async Task<Video> GetAlbumVideoAsync(long albumId, long clipId)
         /// <param name="perPage">Number of items to show on each page. Max 50.</param>
         /// <param name="sort">The default sort order of an Album's videos</param>
         /// <param name="direction">The direction that the results are sorted.</param>
+        /// <param name="fields">JSON filter, as per https://developer.vimeo.com/api/common-formats#json-filter </param>
         /// <returns>Paginated videos</returns>
-        public async Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage, string sort = null, string direction = null)
+        public async Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage, string sort = null, string direction = null, string[] fields = null)
         {
             try
             {
-                var request = GenerateAlbumVideosRequest(albumId, page: page, perPage: perPage, sort: sort, direction: direction);
+                var request = GenerateAlbumVideosRequest(albumId, page: page, perPage: perPage, sort: sort, direction: direction, fields: fields);
                 var response = await request.ExecuteRequestAsync<Paginated<Video>>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving account album videos.", HttpStatusCode.NotFound);
@@ -393,7 +394,7 @@ private IApiRequest GenerateVideosRequest(long? userId = null, long? clipId = nu
             return request;
         }
 
-        private IApiRequest GenerateAlbumVideosRequest(long albumId, long? userId = null, long? clipId = null, int? page = null, int? perPage = null, string sort = null, string direction = null)
+        private IApiRequest GenerateAlbumVideosRequest(long albumId, long? userId = null, long? clipId = null, int? page = null, int? perPage = null, string sort = null, string direction = null, string[] fields = null)
         {
             ThrowIfUnauthorized();
 
@@ -411,6 +412,13 @@ private IApiRequest GenerateAlbumVideosRequest(long albumId, long? userId = null
             {
                 request.UrlSegments.Add("clipId", clipId.ToString());
             }
+            if (fields != null)
+            {
+                foreach (var field in fields)
+                {
+                    request.Fields.Add(field);
+                }
+            }
             if (page.HasValue)
             {
                 request.Query.Add("page", page.ToString());

From 2d6d3f5084a4615f1f926c81a28188f2a565d650 Mon Sep 17 00:00:00 2001
From: RobMalvern <rob@randomtask.co.uk>
Date: Tue, 12 Sep 2017 16:43:15 +0100
Subject: [PATCH 3/4] Working unit test proving fields work for get account
 video

---
 .../VimeoClientAsyncTests.cs                  | 11 +++++
 src/VimeoDotNet/IVimeoClient.cs               | 49 ++++++++++++-------
 src/VimeoDotNet/Net/ApiRequest.cs             |  4 +-
 src/VimeoDotNet/VimeoClient_Sync.cs           | 44 ++++++++++-------
 src/VimeoDotNet/VimeoClient_Videos.cs         | 46 +++++++++++------
 5 files changed, 101 insertions(+), 53 deletions(-)

diff --git a/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs b/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs
index 3de2f62..f2b7840 100644
--- a/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs
+++ b/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs
@@ -324,6 +324,17 @@ public async Task Integration_VimeoClient_GetAccountVideo_RetrievesVideo()
             video.pictures.uri.ShouldNotBeNull();
         }
 
+        [Fact]
+        public async Task Integration_VimeoClient_GetAccountVideo_WithFields_RetrievesVideo()
+        {
+            var client = CreateAuthenticatedClient();
+            var video = await client.GetVideoAsync(_vimeoSettings.VideoId, new []{"uri", "name"});
+            video.ShouldNotBeNull();
+            video.uri.ShouldNotBeNull();
+            video.name.ShouldNotBeNull();
+            video.pictures.ShouldBeNull();
+        }
+
         [Fact]
         public async Task Integration_VimeoClient_GetAccountAlbumVideos_RetrievesCurrentAccountAlbumVideos()
         {
diff --git a/src/VimeoDotNet/IVimeoClient.cs b/src/VimeoDotNet/IVimeoClient.cs
index 0348d0d..ff6bb90 100644
--- a/src/VimeoDotNet/IVimeoClient.cs
+++ b/src/VimeoDotNet/IVimeoClient.cs
@@ -64,15 +64,17 @@ public interface IVimeoClient
         /// Get video by ClipId
         /// </summary>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Video GetVideo(long clipId);
+        Video GetVideo(long clipId, string[] fields = null);
 
         /// <summary>
         /// Get video by ClipId asynchronously
         /// </summary>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Task<Video> GetVideoAsync(long clipId);
+        Task<Video> GetVideoAsync(long clipId, string[] fields = null);
 
 
         // ...for current account
@@ -81,13 +83,13 @@ public interface IVimeoClient
         /// Get paginated video for current account
         /// </summary>
         /// <returns>Paginated videos</returns>
-        Paginated<Video> GetVideos();
+        Paginated<Video> GetVideos(string[] fields = null);
 
         /// <summary>
         /// Get paginated video for current account asynchronously
         /// </summary>
         /// <returns>Paginated videos</returns>
-        Task<Paginated<Video>> GetVideosAsync(int? page, int? perPage);
+        Task<Paginated<Video>> GetVideosAsync(int? page, int? perPage, string[] fields = null);
 
 
         // ...for another account
@@ -97,32 +99,36 @@ public interface IVimeoClient
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Video GetUserVideo(long userId, long clipId);
+        Video GetUserVideo(long userId, long clipId, string[] fields = null);
 
         /// <summary>
         /// Get video by ClipId for UserId asynchronously
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Task<Video> GetUserVideoAsync(long userId, long clipId);
+        Task<Video> GetUserVideoAsync(long userId, long clipId, string[] fields = null);
 
         /// <summary>
         /// Get videos  by UserId and query
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="query">Search query</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        Paginated<Video> GetUserVideos(long userId, string query = null);
+        Paginated<Video> GetUserVideos(long userId, string query = null, string[] fields = null);
 
         /// <summary>
         /// Get videos by UserId and query asynchronously
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="query">Search query</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        Task<Paginated<Video>> GetUserVideosAsync(long userId, string query = null);
+        Task<Paginated<Video>> GetUserVideosAsync(long userId, string query = null, string[] fields = null);
 
         /// <summary>
         /// Get videos by UserId and query and page parameters
@@ -130,9 +136,10 @@ public interface IVimeoClient
         /// <param name="userId">UserId</param>
         /// <param name="perPage">Number of items to show on each page. Max 50</param>
         /// <param name="query">Search query</param>
+        /// <param name="fields"></param>
         /// <param name="page">The page number to show</param>
         /// <returns>Paginated videos</returns>
-        Paginated<Video> GetUserVideos(long userId, int? page, int? perPage, string query = null);
+        Paginated<Video> GetUserVideos(long userId, int? page, int? perPage, string query = null, string[] fields = null);
 
         /// <summary>
         /// Get videos by UserId and query and page parameters asynchronously
@@ -140,9 +147,10 @@ public interface IVimeoClient
         /// <param name="userId">UserId</param>
         /// <param name="perPage">Number of items to show on each page. Max 50</param>
         /// <param name="query">Search query</param>
+        /// <param name="fields"></param>
         /// <param name="page">The page number to show</param>
         /// <returns>Paginated videos</returns>
-        Task<Paginated<Video>> GetUserVideosAsync(long userId, int? page, int? perPage, string query = null);
+        Task<Paginated<Video>> GetUserVideosAsync(long userId, int? page, int? perPage, string query = null, string[] fields = null);
 
 
         // ...for an album
@@ -155,9 +163,10 @@ public interface IVimeoClient
         /// <param name="perPage">Number of items to show on each page. Max 50</param>
         /// <param name="sort">The default sort order of an Album's videos</param>
         /// <param name="direction">The direction that the results are sorted</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
         Paginated<Video> GetAlbumVideos(long albumId, int? page, int? perPage,
-            string sort = null, string direction = null);
+            string sort = null, string direction = null, string[] fields = null);
 
         /// <summary>
         /// Get videos by AlbumId asynchronously
@@ -177,32 +186,36 @@ Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage
         /// </summary>
         /// <param name="albumId">AlbumId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Video GetAlbumVideo(long albumId, long clipId);
+        Video GetAlbumVideo(long albumId, long clipId, string[] fields = null);
 
         /// <summary>
         /// Get video from album by AlbumId and ClipId asynchronously
         /// </summary>
         /// <param name="albumId">AlbumId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Task<Video> GetAlbumVideoAsync(long albumId, long clipId);
+        Task<Video> GetAlbumVideoAsync(long albumId, long clipId, string[] fields = null);
 
         /// <summary>
         /// Get videos from album by AlbumId and UserId
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="albumId">AlbumId</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        Paginated<Video> GetUserAlbumVideos(long userId, long albumId);
+        Paginated<Video> GetUserAlbumVideos(long userId, long albumId, string[] fields = null);
 
         /// <summary>
         /// Get videos from album by AlbumId and UserId asynchronously
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="albumId">AlbumId</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        Task<Paginated<Video>> GetUserAlbumVideosAsync(long userId, long albumId);
+        Task<Paginated<Video>> GetUserAlbumVideosAsync(long userId, long albumId, string[] fields = null);
 
         /// <summary>
         /// Get video from album by AlbumId and UserId and ClipId
@@ -210,8 +223,9 @@ Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage
         /// <param name="userId">AlbumId</param>
         /// <param name="albumId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Video GetUserAlbumVideo(long userId, long albumId, long clipId);
+        Video GetUserAlbumVideo(long userId, long albumId, long clipId, string[] fields = null);
 
         /// <summary>
         /// Get video from album by AlbumId and UserId and ClipId asynchronously
@@ -219,8 +233,9 @@ Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page, int? perPage
         /// <param name="userId">AlbumId</param>
         /// <param name="albumId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        Task<Video> GetUserAlbumVideoAsync(long userId, long albumId, long clipId);
+        Task<Video> GetUserAlbumVideoAsync(long userId, long albumId, long clipId, string[] fields = null);
 
         /// <summary>
         /// Update allowed domain for clip
diff --git a/src/VimeoDotNet/Net/ApiRequest.cs b/src/VimeoDotNet/Net/ApiRequest.cs
index a898a63..70cba04 100644
--- a/src/VimeoDotNet/Net/ApiRequest.cs
+++ b/src/VimeoDotNet/Net/ApiRequest.cs
@@ -448,11 +448,11 @@ protected string BuildUrl()
             {
                 path = path.Replace($"{{{urlSegment.Key}}}", urlSegment.Value);
             }
+            sb.Append(path);
             if (_fields.Count > 0)
             {
-                Query.Add("fields", string.Concat(",", _fields));
+                Query.Add("fields", string.Join(",", _fields));
             }
-            sb.Append(path);
             if (Query.Keys.Count == 0)
                 return sb.ToString();
             sb.Append("?");
diff --git a/src/VimeoDotNet/VimeoClient_Sync.cs b/src/VimeoDotNet/VimeoClient_Sync.cs
index aa9c37e..96c9d62 100644
--- a/src/VimeoDotNet/VimeoClient_Sync.cs
+++ b/src/VimeoDotNet/VimeoClient_Sync.cs
@@ -336,11 +336,11 @@ public bool RemoveFromAlbum(long userId, long albumId, long clipId)
         /// </summary>
         /// <returns>Paginated videos</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Paginated<Video> GetVideos()
+        public Paginated<Video> GetVideos(string[] fields = null)
         {
             try
             {
-                return GetVideosAsync().RunSynchronouslyWithCurrentCulture();
+                return GetVideosAsync(fields:fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -354,13 +354,14 @@ public Paginated<Video> GetVideos()
         /// Get video by ClipId
         /// </summary>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Video GetVideo(long clipId)
+        public Video GetVideo(long clipId, string[] fields = null)
         {
             try
             {
-                return GetVideoAsync(clipId).RunSynchronouslyWithCurrentCulture();
+                return GetVideoAsync(clipId, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -375,11 +376,12 @@ public Video GetVideo(long clipId)
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="query">Search query</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Paginated<Video> GetUserVideos(long userId, string query = null)
+        public Paginated<Video> GetUserVideos(long userId, string query = null, string[] fields = null)
         {
-            return GetUserVideos(userId, null, null, query);
+            return GetUserVideos(userId, null, null, query, fields);
         }
 
         /// <inheritdoc />
@@ -390,13 +392,14 @@ public Paginated<Video> GetUserVideos(long userId, string query = null)
         /// <param name="perPage">Number of items to show on each page. Max 50</param>
         /// <param name="query">Search query</param>
         /// <param name="page">The page number to show</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Paginated<Video> GetUserVideos(long userId, int? page, int? perPage, string query = null)
+        public Paginated<Video> GetUserVideos(long userId, int? page, int? perPage, string query = null, string[] fields = null)
         {
             try
             {
-                return GetUserVideosAsync(userId, page, perPage, query).RunSynchronouslyWithCurrentCulture();
+                return GetUserVideosAsync(userId, page, perPage, query, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -411,13 +414,14 @@ public Paginated<Video> GetUserVideos(long userId, int? page, int? perPage, stri
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Video GetUserVideo(long userId, long clipId)
+        public Video GetUserVideo(long userId, long clipId, string[] fields = null)
         {
             try
             {
-                return GetUserVideoAsync(userId, clipId).RunSynchronouslyWithCurrentCulture();
+                return GetUserVideoAsync(userId, clipId, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -435,13 +439,14 @@ public Video GetUserVideo(long userId, long clipId)
         /// <param name="perPage">Number of items to show on each page. Max 50</param>
         /// <param name="sort">The default sort order of an Album's videos</param>
         /// <param name="direction">The direction that the results are sorted</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Paginated<Video> GetAlbumVideos(long albumId, int? page, int? perPage, string sort = null, string direction = null)
+        public Paginated<Video> GetAlbumVideos(long albumId, int? page, int? perPage, string sort = null, string direction = null, string[] fields = null)
         {
             try
             {
-                return GetAlbumVideosAsync(albumId, page, perPage, sort, direction).RunSynchronouslyWithCurrentCulture();
+                return GetAlbumVideosAsync(albumId, page, perPage, sort, direction, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -456,13 +461,14 @@ public Paginated<Video> GetAlbumVideos(long albumId, int? page, int? perPage, st
         /// </summary>
         /// <param name="albumId">AlbumId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Video GetAlbumVideo(long albumId, long clipId)
+        public Video GetAlbumVideo(long albumId, long clipId, string[] fields = null)
         {
             try
             {
-                return GetAlbumVideoAsync(albumId, clipId).RunSynchronouslyWithCurrentCulture();
+                return GetAlbumVideoAsync(albumId, clipId, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -477,13 +483,14 @@ public Video GetAlbumVideo(long albumId, long clipId)
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="albumId">AlbumId</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Paginated<Video> GetUserAlbumVideos(long userId, long albumId)
+        public Paginated<Video> GetUserAlbumVideos(long userId, long albumId, string[] fields = null)
         {
             try
             {
-                return GetUserAlbumVideosAsync(userId, albumId).RunSynchronouslyWithCurrentCulture();
+                return GetUserAlbumVideosAsync(userId, albumId, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
@@ -499,13 +506,14 @@ public Paginated<Video> GetUserAlbumVideos(long userId, long albumId)
         /// <param name="userId">AlbumId</param>
         /// <param name="albumId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
         [Obsolete("Use async API instead sync wrapper")]
-        public Video GetUserAlbumVideo(long userId, long albumId, long clipId)
+        public Video GetUserAlbumVideo(long userId, long albumId, long clipId, string[] fields = null)
         {
             try
             {
-                return GetUserAlbumVideoAsync(userId, albumId, clipId).RunSynchronouslyWithCurrentCulture();
+                return GetUserAlbumVideoAsync(userId, albumId, clipId, fields).RunSynchronouslyWithCurrentCulture();
             }
             catch (AggregateException ex)
             {
diff --git a/src/VimeoDotNet/VimeoClient_Videos.cs b/src/VimeoDotNet/VimeoClient_Videos.cs
index dbaf391..ba5d1df 100644
--- a/src/VimeoDotNet/VimeoClient_Videos.cs
+++ b/src/VimeoDotNet/VimeoClient_Videos.cs
@@ -41,12 +41,13 @@ public async Task DeleteVideoAsync(long clipId)
         /// </summary>
         /// <param name="albumId">AlbumId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        public async Task<Video> GetAlbumVideoAsync(long albumId, long clipId)
+        public async Task<Video> GetAlbumVideoAsync(long albumId, long clipId, string[] fields = null)
         {
             try
             {
-                var request = GenerateAlbumVideosRequest(albumId, clipId: clipId);
+                var request = GenerateAlbumVideosRequest(albumId, clipId: clipId, fields:fields);
                 var response = await request.ExecuteRequestAsync<Video>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving user album video.", HttpStatusCode.NotFound);
@@ -114,12 +115,13 @@ public async Task<Paginated<Video>> GetAlbumVideosAsync(long albumId, int? page,
         /// <param name="userId">AlbumId</param>
         /// <param name="albumId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        public async Task<Video> GetUserAlbumVideoAsync(long userId, long albumId, long clipId)
+        public async Task<Video> GetUserAlbumVideoAsync(long userId, long albumId, long clipId, string[] fields = null)
         {
             try
             {
-                var request = GenerateAlbumVideosRequest(albumId, userId, clipId);
+                var request = GenerateAlbumVideosRequest(albumId, userId, clipId, fields:fields);
                 var response = await request.ExecuteRequestAsync<Video>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving user album video.", HttpStatusCode.NotFound);
@@ -145,12 +147,13 @@ public async Task<Video> GetUserAlbumVideoAsync(long userId, long albumId, long
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="albumId">AlbumId</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        public async Task<Paginated<Video>> GetUserAlbumVideosAsync(long userId, long albumId)
+        public async Task<Paginated<Video>> GetUserAlbumVideosAsync(long userId, long albumId, string[] fields = null)
         {
             try
             {
-                var request = GenerateAlbumVideosRequest(albumId, userId);
+                var request = GenerateAlbumVideosRequest(albumId, userId, fields:fields);
                 var response = await request.ExecuteRequestAsync<Paginated<Video>>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving user album videos.", HttpStatusCode.NotFound);
@@ -181,12 +184,13 @@ public async Task<Paginated<Video>> GetUserAlbumVideosAsync(long userId, long al
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        public async Task<Video> GetUserVideoAsync(long userId, long clipId)
+        public async Task<Video> GetUserVideoAsync(long userId, long clipId, string[] fields = null)
         {
             try
             {
-                var request = GenerateVideosRequest(userId, clipId);
+                var request = GenerateVideosRequest(userId, clipId, fields:fields);
                 var response = await request.ExecuteRequestAsync<Video>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving user video.", HttpStatusCode.NotFound);
@@ -212,10 +216,11 @@ public async Task<Video> GetUserVideoAsync(long userId, long clipId)
         /// </summary>
         /// <param name="userId">UserId</param>
         /// <param name="query">Search query</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        public async Task<Paginated<Video>> GetUserVideosAsync(long userId, string query = null)
+        public async Task<Paginated<Video>> GetUserVideosAsync(long userId, string query = null, string[] fields = null)
         {
-            return await GetUserVideosAsync(userId, null, null, query);
+            return await GetUserVideosAsync(userId, null, null, query, fields);
         }
 
         /// <summary>
@@ -225,12 +230,13 @@ public async Task<Paginated<Video>> GetUserVideosAsync(long userId, string query
         /// <param name="perPage">Number of items to show on each page. Max 50</param>
         /// <param name="query">Search query</param>
         /// <param name="page">The page number to show</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated videos</returns>
-        public async Task<Paginated<Video>> GetUserVideosAsync(long userId, int? page, int? perPage, string query = null)
+        public async Task<Paginated<Video>> GetUserVideosAsync(long userId, int? page, int? perPage, string query = null, string[] fields = null)
         {
             try
             {
-                var request = GenerateVideosRequest(userId: userId, page: page, perPage: perPage, query: query);
+                var request = GenerateVideosRequest(userId: userId, page: page, perPage: perPage, query: query, fields:fields);
                 var response = await request.ExecuteRequestAsync<Paginated<Video>>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving user videos.", HttpStatusCode.NotFound);
@@ -260,12 +266,13 @@ public async Task<Paginated<Video>> GetUserVideosAsync(long userId, int? page, i
         /// Get video by ClipId asynchronously
         /// </summary>
         /// <param name="clipId">ClipId</param>
+        /// <param name="fields"></param>
         /// <returns>Video</returns>
-        public async Task<Video> GetVideoAsync(long clipId)
+        public async Task<Video> GetVideoAsync(long clipId, string[] fields = null)
         {
             try
             {
-                var request = GenerateVideosRequest(clipId: clipId);
+                var request = GenerateVideosRequest(clipId: clipId, fields:fields);
                 var response = await request.ExecuteRequestAsync<Video>();
                 UpdateRateLimit(response);
                 CheckStatusCodeError(response, "Error retrieving account video.", HttpStatusCode.NotFound);
@@ -290,7 +297,7 @@ public async Task<Video> GetVideoAsync(long clipId)
         /// Get paginated video for current account asynchronously
         /// </summary>
         /// <returns>Paginated videos</returns>
-        public async Task<Paginated<Video>> GetVideosAsync(int? page = null, int? perPage = null)
+        public async Task<Paginated<Video>> GetVideosAsync(int? page = null, int? perPage = null, string[] fields = null)
         {
             try
             {
@@ -359,7 +366,7 @@ public async Task UpdateVideoAllowedDomainAsync(long clipId, string domain)
             }
         }
 
-        private IApiRequest GenerateVideosRequest(long? userId = null, long? clipId = null, int? page = null, int? perPage = null, string query = null)
+        private IApiRequest GenerateVideosRequest(long? userId = null, long? clipId = null, int? page = null, int? perPage = null, string query = null, string[] fields = null)
         {
             ThrowIfUnauthorized();
 
@@ -378,6 +385,13 @@ private IApiRequest GenerateVideosRequest(long? userId = null, long? clipId = nu
             {
                 request.UrlSegments.Add("clipId", clipId.ToString());
             }
+            if (fields != null)
+            {
+                foreach (var field in fields)
+                {
+                    request.Fields.Add(field);
+                }
+            }
             if (page.HasValue)
             {
                 request.Query.Add("page", page.ToString());

From eaaedbd62a413d62067f82a0b427de69f75db240 Mon Sep 17 00:00:00 2001
From: RobMalvern <rob@randomtask.co.uk>
Date: Tue, 12 Sep 2017 17:12:03 +0100
Subject: [PATCH 4/4] Started adding unit tests for all API calls with fields
 support

---
 .../VimeoClientAsyncTests.cs                  | 44 ++++++++++++++++++-
 src/VimeoDotNet/IVimeoClient.cs               |  3 +-
 src/VimeoDotNet/VimeoClient_Async.cs          | 11 ++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs b/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs
index f2b7840..8652f6e 100644
--- a/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs
+++ b/src/VimeoDotNet.Tests/VimeoClientAsyncTests.cs
@@ -325,7 +325,7 @@ public async Task Integration_VimeoClient_GetAccountVideo_RetrievesVideo()
         }
 
         [Fact]
-        public async Task Integration_VimeoClient_GetAccountVideo_WithFields_RetrievesVideo()
+        public async Task Integration_VimeoClient_GetAccountVideoWithFields_RetrievesVideo()
         {
             var client = CreateAuthenticatedClient();
             var video = await client.GetVideoAsync(_vimeoSettings.VideoId, new []{"uri", "name"});
@@ -344,6 +344,15 @@ public async Task Integration_VimeoClient_GetAccountAlbumVideos_RetrievesCurrent
             videos.data.Count.ShouldBeGreaterThan(0);
         }
 
+        [Fact]
+        public async Task Integration_VimeoClient_GetAccountAlbumVideosWithFields_RetrievesCurrentAccountAlbumVideos()
+        {
+            var client = CreateAuthenticatedClient();
+            var videos = await client.GetAlbumVideosAsync(_vimeoSettings.AlbumId, 1, null, fields: new[] { "uri", "name" });
+            videos.ShouldNotBeNull();
+            videos.data.Count.ShouldBeGreaterThan(0);
+        }
+
         [Fact]
         public async Task Integration_VimeoClient_GetAccountAlbumVideo_RetrievesVideo()
         {
@@ -352,6 +361,14 @@ public async Task Integration_VimeoClient_GetAccountAlbumVideo_RetrievesVideo()
             video.ShouldNotBeNull();
         }
 
+        [Fact]
+        public async Task Integration_VimeoClient_GetAccountAlbumVideoWithFields_RetrievesVideo()
+        {
+            var client = CreateAuthenticatedClient();
+            var video = await client.GetAlbumVideoAsync(_vimeoSettings.AlbumId, _vimeoSettings.VideoId, new[] { "uri", "name" });
+            video.ShouldNotBeNull();
+        }
+
         [Fact]
         public async Task Integration_VimeoClient_GetUserAlbumVideos_RetrievesUserAlbumVideos()
         {
@@ -361,6 +378,15 @@ public async Task Integration_VimeoClient_GetUserAlbumVideos_RetrievesUserAlbumV
             videos.data.Count.ShouldBeGreaterThan(0);
         }
 
+        [Fact]
+        public async Task Integration_VimeoClient_GetUserAlbumVideosWithFields_RetrievesUserAlbumVideos()
+        {
+            var client = CreateAuthenticatedClient();
+            var videos = await client.GetUserAlbumVideosAsync(_vimeoSettings.UserId, _vimeoSettings.AlbumId, new []{"name", "link"});
+            videos.ShouldNotBeNull();
+            videos.data.Count.ShouldBeGreaterThan(0);
+        }
+
         [Fact]
         public async Task Integration_VimeoClient_GetUserAlbumVideo_RetrievesVideo()
         {
@@ -369,6 +395,14 @@ public async Task Integration_VimeoClient_GetUserAlbumVideo_RetrievesVideo()
             video.ShouldNotBeNull();
         }
 
+        [Fact]
+        public async Task Integration_VimeoClient_GetUserAlbumVideoWithFields_RetrievesVideo()
+        {
+            var client = CreateAuthenticatedClient();
+            var video = await client.GetUserAlbumVideoAsync(_vimeoSettings.UserId, _vimeoSettings.AlbumId, _vimeoSettings.VideoId, new []{"uri", "name"});
+            video.ShouldNotBeNull();
+        }
+
         [Fact]
         public async Task Integration_VimeoClient_GetAccountAlbums_NotNull()
         {
@@ -377,6 +411,14 @@ public async Task Integration_VimeoClient_GetAccountAlbums_NotNull()
             albums.ShouldNotBeNull();
         }
 
+        [Fact]
+        public async Task Integration_VimeoClientWithFields_GetAccountAlbums_NotNull()
+        {
+            var client = CreateAuthenticatedClient();
+            var albums = await client.GetAlbumsAsync(fields: new []{"name"});
+            albums.ShouldNotBeNull();
+        }
+
         [Fact]
         public async Task Integration_VimeoClient_AlbumVideoManagement()
         {
diff --git a/src/VimeoDotNet/IVimeoClient.cs b/src/VimeoDotNet/IVimeoClient.cs
index ff6bb90..af0cee6 100644
--- a/src/VimeoDotNet/IVimeoClient.cs
+++ b/src/VimeoDotNet/IVimeoClient.cs
@@ -462,8 +462,9 @@ Task<IUploadRequest> StartUploadFileAsync(IBinaryContent fileContent,
         /// Get album by parameters asynchronously
         /// </summary>
         /// <param name="parameters">GetAlbumsParameters</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated albums</returns>
-        Task<Paginated<Album>> GetAlbumsAsync(GetAlbumsParameters parameters = null);
+        Task<Paginated<Album>> GetAlbumsAsync(GetAlbumsParameters parameters = null, string[] fields = null);
 
         /// <summary>
         /// Get album by UserId and parameters
diff --git a/src/VimeoDotNet/VimeoClient_Async.cs b/src/VimeoDotNet/VimeoClient_Async.cs
index 36163d9..1831b9f 100644
--- a/src/VimeoDotNet/VimeoClient_Async.cs
+++ b/src/VimeoDotNet/VimeoClient_Async.cs
@@ -228,8 +228,9 @@ public async Task<User> GetUserInformationAsync(long userId)
         /// Get album by parameters asynchronously
         /// </summary>
         /// <param name="parameters">GetAlbumsParameters</param>
+        /// <param name="fields"></param>
         /// <returns>Paginated albums</returns>
-        public async Task<Paginated<Album>> GetAlbumsAsync(GetAlbumsParameters parameters = null)
+        public async Task<Paginated<Album>> GetAlbumsAsync(GetAlbumsParameters parameters = null, string[] fields = null)
 		{
 			var request = ApiRequestFactory.AuthorizedRequest(
 				AccessToken,
@@ -239,6 +240,14 @@ public async Task<Paginated<Album>> GetAlbumsAsync(GetAlbumsParameters parameter
 				parameters
 			);
 
+		    if (fields != null)
+		    {
+		        foreach (var field in fields)
+		        {
+		            request.Fields.Add(field);
+		        }
+		    }
+
 			return await ExecuteApiRequest<Paginated<Album>>(request);
 		}