New public method Utility.HttpGet() implemented to retrieve the HTTP(s) request for the GET verb

New public method Utility.HttpPOST() implemented to retrieve the HTTP(s) request for the POST verb

Author: lorenzobruni

rls/API.Library.dll

@@ -84,7 +84,6 @@ public class Common
         /// </summary>
         internal string NetworkUsername = null;
 
-
         /// <summary>
         /// Authenticate the user in the context
         /// </summary>

rls/API.Library.pdb

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -25,7 +24,7 @@ public class JSONRPC : Common, IHttpHandler, IRequiresSessionState
         /// <summary>
         ///  GET request parameter
         /// </summary>
-        internal const string JSONRPC_Container = "data";
+        internal const string JSONRPC_GETparam = "data";
 
         /// <summary>
         ///  JSON-stat mimetype
@@ -175,43 +174,32 @@ private JSONRPC_Request ParseRequest(ref HttpContext context)
         {
             // Initialise requests
             string request = null;
-            string requestGET = null;
-            string requestPOST = null;
+            string DATArequest = null;
+            string POSTrequest = null;
 
-            try
-            {
-                // Read the request from GET 
-                requestGET = context.Request.QueryString[JSONRPC_Container];
-
-                // Read the request from POST
-                StreamReader HttpReader = new StreamReader(context.Request.InputStream);
-                requestPOST = HttpReader.ReadToEnd();
-            }
-            catch (Exception e)
-            {
-                Log.Instance.Fatal(e);
+            // Read the request from GET 
+            DATArequest = Utility.HttpGET()[JSONRPC_GETparam];
 
-                JSONRPC_Error error = new JSONRPC_Error { code = -32700 };
-                ParseError(ref context, null, error);
-            }
+            // Read the request from POST
+            POSTrequest = Utility.HttpPOST();
 
             // Check the query input exists
-            if (string.IsNullOrWhiteSpace(requestGET)
-            && string.IsNullOrWhiteSpace(requestPOST))
+            if (string.IsNullOrWhiteSpace(DATArequest)
+            && string.IsNullOrWhiteSpace(POSTrequest))
             {
                 JSONRPC_Error error = new JSONRPC_Error { code = -32700 };
                 ParseError(ref context, null, error);
             }
 
             // POST request overrides GET one
-            if (!string.IsNullOrWhiteSpace(requestPOST))
+            if (!string.IsNullOrWhiteSpace(POSTrequest))
             {
-                request = requestPOST;
+                request = POSTrequest;
                 Log.Instance.Info("Request type: POST");
             }
             else
             {
-                request = requestGET;
+                request = DATArequest;
                 Log.Instance.Info("Request type: GET");
             }
 

src/API.Library/Entities/API.Common.cs

@@ -431,6 +431,42 @@ public static string GetUserAcceptLanguage()
                 return null;
             }
         }
+
+        /// <summary>
+        /// Get the HTTP request for the GET method
+        /// </summary>
+        /// <returns></returns>
+        public static NameValueCollection HttpGET()
+        {
+            try
+            {
+                // Read the request from GET 
+                return HttpContext.Current.Request.QueryString;
+            }
+            catch (Exception e)
+            {
+                Log.Instance.Info(e);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Get the HTTP request for the POST method
+        /// </summary>
+        /// <returns></returns>
+        public static string HttpPOST()
+        {
+            try
+            {
+                // Read the request from POST
+                return new StreamReader(HttpContext.Current.Request.InputStream).ReadToEnd();
+            }
+            catch (Exception e)
+            {
+                Log.Instance.Info(e);
+                return null;
+            }
+        }
         #endregion
     }
 }

src/API.Library/Entities/API.JSONRPC.cs

@@ -32,8 +32,8 @@
 // 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("4.1.0")]
-[assembly: AssemblyFileVersion("4.1.0")]
+[assembly: AssemblyVersion("4.1.1")]
+[assembly: AssemblyFileVersion("4.1.1")]
 
 // Configure log4net using the Web.config file by default
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]

src/API.Library/Entities/Utility.cs

@@ -72,9 +72,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="API.Library, Version=4.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="API.Library, Version=4.1.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\API.Library.4.1.0\API.Library.dll</HintPath>
+      <HintPath>..\packages\API.Library.4.1.1\API.Library.dll</HintPath>
     </Reference>
     <Reference Include="Enyim.Caching, Version=2.16.0.0, Culture=neutral, PublicKeyToken=cec98615db04012e, processorArchitecture=MSIL">
       <HintPath>..\packages\EnyimMemcached.2.16.0\lib\net35\Enyim.Caching.dll</HintPath>

src/API.Library/Properties/AssemblyInfo.cs

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

test/API.Test/API.Test.csproj

@@ -199,7 +199,7 @@
 	********************************************************************** 
 	-->
 		<!-- MemCacheD - Switch on [TRUE] or off [FALSE] the MemCacheD -->
-		<add key="API_MEMCACHED_ENABLED" value="TRUE" />
+		<add key="API_MEMCACHED_ENABLED" value="FALSE" />
 		<!-- MemCacheD - Maximum validity in number of seconds that MemCacheD can handle (30 days = 2592000) -->
 		<add key="API_MEMCACHED_MAX_VALIDITY" value="2592000" />
 		<!-- MemCacheD - Salsa code to isolate the cache records form other applications or environments -->