Committing updates.

src/app/Common.cpp

@@ -456,6 +456,30 @@ namespace Apostol {
         }
         //--------------------------------------------------------------------------------------------------------------
 
+        CString CCustomModule::GetAddress(CHTTPRequest *ARequest) {
+            CString Result;
+
+            Result = ARequest->Params["address"];
+
+            if (Result.IsEmpty() && !ARequest->Content.IsEmpty()) {
+                const auto &contentType = ARequest->Headers.Values(_T("content-type"));
+                if (contentType.Find("application/x-www-form-urlencoded") == 0) {
+                    const CStringList &FormData = ARequest->FormData;
+                    Result = FormData["address"];
+                } else if (contentType.Find("multipart/form-data") == 0) {
+                    CFormData FormData;
+                    CHTTPRequestParser::ParseFormData(ARequest, FormData);
+                    Result = FormData.Data("address");
+                } else if (contentType.Find("application/json") == 0) {
+                    const CJSON contextJson(ARequest->Content);
+                    Result = contextJson["address"].AsString();
+                }
+            }
+
+            return Result;
+        }
+        //--------------------------------------------------------------------------------------------------------------
+
         void CCustomModule::DoGet(CHTTPServerConnection *AConnection) {
 
             auto pRequest = AConnection->Request();

src/app/Common.hpp

@@ -105,6 +105,8 @@ namespace Apostol {
             void ModuleNew(CContext &Context);
             void ModuleAuthorize(CContext &Context);
 
+            static CString GetAddress(CHTTPRequest *ARequest);
+
             void DoGet(CHTTPServerConnection *AConnection) override;
 
             virtual void DoPost(CHTTPServerConnection *AConnection);

src/modules/Workers/WebService/WebService.cpp

@@ -223,7 +223,7 @@ namespace Apostol {
             const auto &caModuleAddress = m_Module["address"];
             const auto &caHost = pServerRequest->Headers["host"];
             const auto &caOrigin = pServerRequest->Headers["origin"];
-            const auto &caUserAddress = pServerRequest->Params["address"];
+            const auto &caUserAddress = GetAddress(pServerRequest);
 
             const auto &pgpValue = pServerRequest->Params["pgp"];
             const auto &caServerParam = pServerRequest->Params["server"];
@@ -458,7 +458,7 @@ namespace Apostol {
             const auto &caHost = pServerRequest->Headers["host"];
             const auto &caOrigin = pServerRequest->Headers["origin"];
 
-            const auto &address = pServerRequest->Params["address"];
+            const auto &address = GetAddress(pServerRequest);
             const auto &code = pServerRequest->Params["code"];
 
             const auto &caUserAddress = address.length() == 40 ? CString() : address;
@@ -478,7 +478,7 @@ namespace Apostol {
 
             CString sPayload;
 
-            if (!pServerRequest->Content.IsEmpty()) {
+            if (!pServerRequest->Content.IsEmpty() && Action != "status") {
 
                 const auto &ContentType = pServerRequest->Headers.Values(_T("content-type"));
 
@@ -875,7 +875,7 @@ namespace Apostol {
             const auto &caHost = pServerRequest->Headers["host"];
             const auto &caOrigin = pServerRequest->Headers["origin"];
 
-            const auto &address = pServerRequest->Params["address"];
+            const auto &address = GetAddress(pServerRequest);
             const auto &code = pServerRequest->Params["code"];
 
             const auto &caUserAddress = address.length() == 40 ? CString() : address;

src/modules/Workers/WebSocket/WebSocket.cpp

@@ -362,7 +362,7 @@ namespace Apostol {
             const auto &caModuleAddress = m_Module["address"];
             const auto &caHost = pServerRequest->Headers["host"];
             const auto &caOrigin = pServerRequest->Headers["origin"];
-            const auto &caUserAddress = pServerRequest->Params["address"];
+            const auto &caUserAddress = GetAddress(pServerRequest);
 
             const auto &pgpValue = pServerRequest->Params["pgp"];
             const auto &caServerParam = pServerRequest->Params["server"];
@@ -583,7 +583,7 @@ namespace Apostol {
             const auto &caHost = pServerRequest->Headers["host"];
             const auto &caOrigin = pServerRequest->Headers["origin"];
 
-            const auto &address = pServerRequest->Params["address"];
+            const auto &address = GetAddress(pServerRequest);
             const auto &code = pServerRequest->Params["code"];
             
             const auto &caUserAddress = address.length() == 40 ? CString() : address;
@@ -603,7 +603,7 @@ namespace Apostol {
 
             CString sPayload;
 
-            if (!pServerRequest->Content.IsEmpty()) {
+            if (!pServerRequest->Content.IsEmpty() && Action != "status") {
 
                 const auto &ContentType = pServerRequest->Headers.Values(_T("content-type"));