From 632e2005ee8ea541ee8013a9a2bcc4a32348b801 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 1 Aug 2023 09:47:34 +0200
Subject: [PATCH] Fix gestione deserializzazione claims

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 .../Controllers/DoorImageController.cs        |  1 +
 WebDoorCreator.Data/User/ClaimConverter.cs    | 20 +++++++++----------
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index d306ec0..acb057b 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2308.0108</h4>
+    <h4>Version: 0.9.2308.0109</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 598058e..9d47aac 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2308.0108
+0.9.2308.0109
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 007636e..e7c46c2 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2308.0108</version>
+  <version>0.9.2308.0109</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.API/Controllers/DoorImageController.cs b/WebDoorCreator.API/Controllers/DoorImageController.cs
index 01abf98..b66fca6 100644
--- a/WebDoorCreator.API/Controllers/DoorImageController.cs
+++ b/WebDoorCreator.API/Controllers/DoorImageController.cs
@@ -82,5 +82,6 @@ namespace WebDoorCreator.API.Controllers
         }
 
         #endregion Private Methods
+
     }
 }
\ No newline at end of file
diff --git a/WebDoorCreator.Data/User/ClaimConverter.cs b/WebDoorCreator.Data/User/ClaimConverter.cs
index fa934f9..66798c8 100644
--- a/WebDoorCreator.Data/User/ClaimConverter.cs
+++ b/WebDoorCreator.Data/User/ClaimConverter.cs
@@ -22,27 +22,25 @@ namespace WebDoorCreator.Data.User
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            JObject jo = JObject.Load(reader);
-            string type = (string)jo["Type"];
-            string value = (string)jo["Value"];
-            string valueType = (string)jo["ValueType"];
-            string issuer = (string)jo["Issuer"];
-            string originalIssuer = (string)jo["OriginalIssuer"];
+            JObject jObj = JObject.Load(reader);
+            string type = $"{jObj["Type"]}";
+            string value = $"{jObj["Value"]}";
+            string valueType = $"{jObj["ValueType"]}";
+            string issuer = $"{jObj["Issuer"]}";
+            string originalIssuer = $"{jObj["OriginalIssuer"]}";
             return new Claim(type, value, valueType, issuer, originalIssuer);
         }
 
+
         public override bool CanWrite
         {
             get { return false; }
         }
 
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
-#if false
+            // lascio eccezione perché è un deserializzatore "in sola lettura"
             throw new NotImplementedException(); 
-#endif
-            // da verificare
-            writer.WriteValue(JsonConvert.SerializeObject(value));
         } 
     }
 }
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index f5387b2..befbed7 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2308.0108</Version>
+        <Version>0.9.2308.0109</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
