Merge pull request #8 from bunq/7-fix-session-server-serialization

Fix SessionServerConverter, bump up to 0.9.2.0-beta [#7]

Author: OGKevin

BunqSdk/BunqSdk.csproj

@@ -10,7 +10,7 @@
     <PackageId>Bunq.Sdk</PackageId>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>0.9.1.0</VersionPrefix>
+    <VersionPrefix>0.9.2.0</VersionPrefix>
     <VersionSuffix>beta</VersionSuffix>
   </PropertyGroup>
   <PropertyGroup>
@@ -34,4 +34,4 @@
     <Content Include="../README.md" />
     <Content Include="../.gitignore" />
   </ItemGroup>
-</Project>
+</Project>

BunqSdk/Http/ApiClient.cs

@@ -38,7 +38,7 @@ public class ApiClient
         /// Values for the default headers
         /// </summary>
         private const string CACHE_CONTROL_NONE = "no-cache";
-        private const string USER_AGENT_BUNQ = "bunq-sdk-csharp/0.9.0.1-beta";
+        private const string USER_AGENT_BUNQ = "bunq-sdk-csharp/0.9.2.0-beta";
         private const string LANGUAGE_EN_US = "en_US";
         private const string REGION_NL_NL = "nl_NL";
         private const string GEOLOCATION_ZERO = "0 0 0 0 NL";

BunqSdk/Json/SessionServerConverter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Bunq.Sdk.Model;
 using Bunq.Sdk.Model.Generated;
 using Newtonsoft.Json;
@@ -26,19 +25,19 @@ public class SessionServerConverter : JsonConverter
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
             JsonSerializer serializer)
         {
-            var jObjects = JArray.Load(reader).ToObject<List<JObject>>();
-            var id = GetByIndexAndFieldName(jObjects, INDEX_ID, FIELD_ID).ToObject<Id>();
-            var token = GetByIndexAndFieldName(jObjects, INDEX_TOKEN, FIELD_TOKEN).ToObject<SessionToken>();
+            var jObjects = JArray.Load(reader);
+            var id = FetchObject<Id>(jObjects[INDEX_ID], FIELD_ID);
+            var token = FetchObject<SessionToken>(jObjects[INDEX_TOKEN], FIELD_TOKEN);
             var userBody = jObjects[INDEX_USER];
 
             return userBody[FIELD_USER_COMPANY] == null
-                ? new SessionServer(id, token, userBody.GetValue(FIELD_USER_PERSON).ToObject<UserPerson>())
-                : new SessionServer(id, token, userBody.GetValue(FIELD_USER_COMPANY).ToObject<UserCompany>());
+                ? new SessionServer(id, token, FetchObject<UserPerson>(userBody, FIELD_USER_PERSON))
+                : new SessionServer(id, token, FetchObject<UserCompany>(userBody, FIELD_USER_COMPANY));
         }
 
-        private static JToken GetByIndexAndFieldName(IReadOnlyList<JObject> jObjects, int index, string fieldName)
+        private static T FetchObject<T>(JToken jToken, string fieldName)
         {
-            return jObjects[index].GetValue(fieldName);
+            return jToken[fieldName].ToObject<T>();
         }
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)