Expose OAuth access token and introduce new MediaWithTotal

Bynder/Sdk/Api/Converters/BoolConverter.cs

@@ -0,0 +1,44 @@
+// Copyright (c) Bynder. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Bynder.Sdk.Api.Converters
+{
+    /// <summary>
+    /// Class used to convert bool to string.
+    /// True is represented as "1" and false as "0"
+    /// </summary>
+    public class BoolConverter : ITypeToStringConverter
+    {
+        private const string _trueString = "1";
+        private const string _falseString = "0";
+
+        /// <summary>
+        /// Returns true if type is assignable from bool
+        /// </summary>
+        /// <param name="typeToConvert">Check <see cref="ITypeToStringConverter.CanConvert(Type)"/></param>
+        /// <returns>true if type is assignable from bool/></returns>
+        public bool CanConvert(Type typeToConvert)
+        {
+            return typeof(bool).IsAssignableFrom(typeToConvert);
+        }
+
+        /// <summary>
+        /// Converts bool to string represented as "1" or "0"
+        /// </summary>
+        /// <param name="value">bool value</param>
+        /// <returns>converted string</returns>
+        public string Convert(object value)
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue
+                    ? _trueString
+                    : _falseString;
+            }
+
+            return string.Empty;
+        }
+    }
+}

Bynder/Sdk/Bynder.Sdk.csproj

@@ -7,7 +7,7 @@
     <Product>Bynder.Sdk</Product>
     <Copyright>Copyright © Bynder</Copyright>
     <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>2.2.12</PackageVersion>
+    <PackageVersion>2.2.12-fork</PackageVersion>
     <Authors>BynderDevops</Authors>
     <Description>The main goal of this SDK is to speed up the integration of Bynder customers who use C# making it easier to connect to the Bynder API (http://docs.bynder.apiary.io/) and executing requests on it.</Description>
     <PackageIcon>BynderLogo.png</PackageIcon>
@@ -26,7 +26,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

Bynder/Sdk/Model/AssetOrderBy.cs

@@ -0,0 +1,14 @@
+namespace Bynder.Sdk.Model
+{
+    public static class AssetOrderBy
+    {
+        public const string DateCreatedAscending = "dateCreated asc";
+        public const string DateCreatedDescending = "dateCreated desc";
+        public const string DateModifiedAscending = "dateModified asc";
+        public const string DateModifiedDescending = "dateModified desc";
+        public const string DatePublishedAscending = "datePublished asc";
+        public const string DatePublishedDescending = "datePublished desc";
+        public const string NameAscending = "name asc";
+        public const string NameDescending = "name desc";
+    }
+}

Bynder/Sdk/Model/AssetType.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Bynder. All rights reserved.
+// Copyright (c) Bynder. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 
 namespace Bynder.Sdk.Model

Bynder/Sdk/Model/CountValue.cs

@@ -0,0 +1,18 @@
+namespace Bynder.Sdk.Model
+{
+    /// <summary>
+    /// The count values as delivered by the API
+    /// </summary>
+    public class CountValue
+    {
+        /// <summary>
+        /// The property option key
+        /// </summary>
+        public string PropertyOptionKey { get; set; }
+
+        /// <summary>
+        /// the count
+        /// </summary>
+        public int Count { get; set; }
+    }
+}

Bynder/Sdk/Model/Counts.cs

@@ -0,0 +1,50 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Bynder.Sdk.Model
+{
+    /// <summary>
+    /// Counts returned by the API
+    /// </summary>
+    public class Counts : Dictionary<string, object>
+    {
+        public long Total => GetTotalCount();
+
+        private long GetTotalCount()
+        {
+            if (!TryGetValue("total", out var total))
+                return 0;
+
+            if (total is long totalLong)
+                return totalLong;
+
+            return 0;
+        }
+
+        public IEnumerable<CountValue> GetCountValues(string propertyName)
+        {
+            if (string.IsNullOrEmpty(propertyName))
+                throw new ArgumentNullException(nameof(propertyName));
+
+            if (!TryGetValue(propertyName, out var count))
+                return null;
+
+            if (!(count is JObject countJObject))
+                return null;
+
+            return countJObject.Children()
+                .Where(child => child is JProperty)
+                .Select(child => child as JProperty)
+                .Select(jProperty =>
+                    new CountValue()
+                    {
+                        PropertyOptionKey = jProperty.Name,
+                        Count = jProperty.Value.Value<int>()
+                    }
+                );
+        }
+    }
+}

Bynder/Sdk/Model/Media.cs

@@ -30,7 +30,7 @@ public class Media
         /// by an x,y coordinate.
         /// </summary>
         [JsonProperty("activeOriginalFocusPoint")]
-        public IDictionary<string, int> ActiveOriginalFocusPoint { get; set; }
+        public IDictionary<string, decimal> ActiveOriginalFocusPoint { get; set; }
 
         /// <summary>
         /// Number of times the media has been downloaded
@@ -147,6 +147,12 @@ public class Media
         [JsonProperty("mediaItems")]
         public IList<MediaItem> MediaItems { get; set; }
 
+        /// <summary>
+        /// Current active version
+        /// </summary>
+        [JsonProperty("version")]
+        public int? Version { get; set; }
+
         /// <summary>
         /// Current active version
         /// </summary>

Bynder/Sdk/Model/MediaItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Bynder. All rights reserved.
+// Copyright (c) Bynder. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 
 using System.ComponentModel;
@@ -46,13 +46,13 @@ public class MediaItem
         /// Width
         /// </summary>
         [JsonProperty("width")]
-        public int Width { get; set; }
+        public int? Width { get; set; }
 
         /// <summary>
         /// Height
         /// </summary>
         [JsonProperty("height")]
-        public int Height { get; set; }
+        public int? Height { get; set; }
 
         /// <summary>
         /// true if it is corresponds to the current version of the asset

Bynder/Sdk/Model/MediaWithCount.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Bynder. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Bynder.Sdk.Model
+{
+    /// <summary>
+    /// Media items returned by API /media including the individual counts
+    /// </summary>
+    public class MediaWithCount
+    {
+        /// <summary>
+        /// Media items
+        /// </summary>
+        [JsonProperty("media")]
+        public IList<Media> Items { get; set; }
+
+        /// <summary>
+        /// Counts
+        /// </summary>
+        [JsonProperty("count")]
+        public Counts Counts { get; set; }
+    }
+}

Bynder/Sdk/Model/MediaWithTotal.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Bynder. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Bynder.Sdk.Model
+{
+    /// <summary>
+    /// Media items returned by API /media including the total count
+    /// </summary>
+    public class MediaWithTotal
+    {
+        /// <summary>
+        /// Media items
+        /// </summary>
+        [JsonProperty("media")]
+        public IList<Media> Items { get; set; }
+
+        /// <summary>
+        /// Total of results
+        /// </summary>
+        [JsonProperty("total")]
+        public TotalCountResponse Total { get; set; }
+    }
+}

Bynder/Sdk/Model/Metaproperty.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Bynder. All rights reserved.
+// Copyright (c) Bynder. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
@@ -42,6 +42,12 @@ public class Metaproperty
         [JsonProperty("isMultiSelect", ItemConverterType = typeof(BooleanJsonConverter))]
         public bool IsMultiSelect { get; set; }
 
+        /// <summary>
+        /// Returns true if Multifilter is selected for the metaproperty
+        /// </summary>
+        [JsonProperty("isMultiFilter", ItemConverterType = typeof(BooleanJsonConverter))]
+        public bool IsMultiFilter { get; set; }
+
         /// <summary>
         /// Returns true if Required is selected for the metaproperty
         /// </summary>
@@ -71,5 +77,17 @@ public class Metaproperty
         /// </summary>
         [JsonProperty("zindex")]
         public int ZIndex { get; set; }
+
+        /// <summary>
+        /// Type of the metaproperty
+        /// </summary>
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Returns label translation by culture (e.g. 'en_US', 'de_DE' and etc)
+        /// </summary>
+        [JsonProperty("labels")]
+        public IDictionary<string, string> Labels { get; set; } = new Dictionary<string, string>();
     }
 }

Bynder/Sdk/Model/MetapropertyOption.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Bynder. All rights reserved.
+// Copyright (c) Bynder. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
@@ -53,5 +53,11 @@ public class MetapropertyOption
         /// </summary>
         [JsonProperty("linkedOptionIds")]
         public List<string> LinkedOptionIds { get; set; }
+
+        /// <summary>
+        /// Returns label translation by culture (e.g. 'en_US', 'de_DE' and etc)
+        /// </summary>
+        [JsonProperty("labels")]
+        public IDictionary<string, string> Labels { get; set; } = new Dictionary<string, string>();
     }
 }

Bynder/Sdk/Model/TotalCountResponse.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Bynder. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+
+using Newtonsoft.Json;
+
+namespace Bynder.Sdk.Model
+{
+    public class TotalCountResponse
+    {
+        /// <summary>
+        /// The count
+        /// </summary>
+        [JsonProperty("count")]
+        public int Count { get; set; }
+    }
+}

Bynder/Sdk/Query/Asset/MediaQuery.cs

@@ -64,13 +64,36 @@ public class MediaQuery
         /// <summary>
         /// The type of the asset
         /// </summary>
-        [ApiField("type", Converter = typeof(LowerCaseEnumConverter))]
-        public AssetType? Type { get; set; }
+        [ApiField("type")]
+        public string Types { get; set; }
+
+        /// <summary>
+        /// The tags of the asset
+        /// </summary>
+        [ApiField("tags")]
+        public string Tags { get; set; }
+
+        /// <summary>
+        /// The tags of the asset
+        /// </summary>
+        [ApiField("orientation")]
+        public string Orientations { get; set; }
 
         /// <summary>
         /// Metaproperty option ids that the asset has to have
         /// </summary>
         [ApiField("propertyOptionId", Converter = typeof(ListConverter))]
         public IList<string> PropertyOptionId { get; set; } = new List<string>();
+
+        /// <summary>
+        /// Properties values by key
+        /// Examples
+        /// key: property_NAME value: Amsterdam
+        /// or
+        /// key: property_NAME value: 00000000-0000-0000-0000000000000000
+        /// key property_SomethingElse value: 00000000-0000-0000-0000000000000001
+        /// </summary>
+        [ApiField("property_", Converter = typeof(MetapropertyOptionsConverter))]
+        public IDictionary<string, IList<string>> PropertiesByKey { get; set; }
     }
 }