[FEATURE][SOLUI-195] Added support for new format of Logs in Alumio

experius · Mar 1, 2022 · f5cfa49 · f5cfa49
1 parent ee5ba61
commit f5cfa49
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 3 deletions.
diff --git a/Block/Adminhtml/TaskLog/View/ExportLog.php b/Block/Adminhtml/TaskLog/View/ExportLog.php
@@ -80,10 +80,47 @@ public function getLogs()
         $exportLogArray = [];
         try {
             foreach($this->getExportInfo() as $exportLog) {
+                // Set Request Info
+                if (isset($exportLog['_source']['@fields']['ctxt_alumio-http']['request']['headers'])) {
+                    foreach ($exportLog['_source']['@fields']['ctxt_alumio-http']['request']['headers'] as $key => $header) {
+                        $key = htmlspecialchars($key, ENT_QUOTES);
+                        $header = htmlspecialchars($header, ENT_QUOTES);
+                        $requestHeaders .= "<strong>{$key}:</strong> {$header}<br/>";
+                    }
+                } else {
+                    $requestHeaders = null;
+                }
+                $requestBody = $exportLog['_source']['@fields']['ctxt_alumio-http']['request']['requestBody'] ?? null;
+                $requestMethod = $exportLog['_source']['@fields']['ctxt_alumio-http']['request']['requestMethod'] ?? null;
+                $requestUri = $exportLog['_source']['@fields']['ctxt_alumio-http']['request']['uri'] ?? null;
+
+                // Set Response info
+                if (isset($exportLog['_source']['@fields']['ctxt_alumio-http']['response']['headers'])) {
+                    foreach ($exportLog['_source']['@fields']['ctxt_alumio-http']['response']['headers'] as $key => $header) {
+                        $key = htmlspecialchars($key, ENT_QUOTES);
+                        $header = htmlspecialchars($header, ENT_QUOTES);
+                        $responseHeaders .= "<strong>{$key}:</strong> {$header}<br/>";
+                    }
+                } else {
+                    $responseHeaders = null;
+                }
+                $responseBody = $exportLog['_source']['@fields']['ctxt_alumio-http']['response']['responseBody'] ?? null;
+                $responseStatusCode = $exportLog['_source']['@fields']['ctxt_alumio-http']['response']['statusCode'] ?? null;
+                $responseReasonPhrase = $exportLog['_source']['@fields']['ctxt_alumio-http']['response']['reasonPhrase'] ?? null;
+
+                // Set everything else
                 $exportLogArray[] = [
                     'message' => $exportLog['_source']['@message'],
                     'status' => $exportLog['_source']['@fields']['level'],
-                    'timestamp' => $exportLog['_source']['@timestamp']
+                    'timestamp' => $exportLog['_source']['@timestamp'],
+                    'requestHeaders' => $requestHeaders,
+                    'requestBody' => $requestBody,
+                    'requestMethod' => $requestMethod,
+                    'requestUri' => $requestUri,
+                    'responseHeaders' => $responseHeaders,
+                    'responseBody' => $responseBody,
+                    'responseStatusCode' => $responseStatusCode,
+                    'responseReasonPhrase' => $responseReasonPhrase
                 ];
             }
         } catch (\Exception $e) {

diff --git a/Block/Adminhtml/TaskLog/View/ImportLog.php b/Block/Adminhtml/TaskLog/View/ImportLog.php
@@ -81,10 +81,47 @@ public function getLogs()
         $importLogArray = [];
         try {
             foreach ($this->getImportInfo() as $importLog) {
+                // Set Request Info
+                if (isset($exportLog['_source']['@fields']['ctxt_alumio-http']['request']['headers'])) {
+                    foreach ($exportLog['_source']['@fields']['ctxt_alumio-http']['request']['headers'] as $key => $header) {
+                        $key = htmlspecialchars($key, ENT_QUOTES);
+                        $header = htmlspecialchars($header, ENT_QUOTES);
+                        $requestHeaders .= "<strong>{$key}:</strong> {$header}<br/>";
+                    }
+                } else {
+                    $requestHeaders = null;
+                }
+                $requestBody = $exportLog['_source']['@fields']['ctxt_alumio-http']['request']['requestBody'] ?? null;
+                $requestMethod = $exportLog['_source']['@fields']['ctxt_alumio-http']['request']['requestMethod'] ?? null;
+                $requestUri = $exportLog['_source']['@fields']['ctxt_alumio-http']['request']['uri'] ?? null;
+
+                // Set Response info
+                if (isset($exportLog['_source']['@fields']['ctxt_alumio-http']['response']['headers'])) {
+                    foreach ($exportLog['_source']['@fields']['ctxt_alumio-http']['response']['headers'] as $key => $header) {
+                        $key = htmlspecialchars($key, ENT_QUOTES);
+                        $header = htmlspecialchars($header, ENT_QUOTES);
+                        $responseHeaders .= "<strong>{$key}:</strong> {$header}<br/>";
+                    }
+                } else {
+                    $responseHeaders = null;
+                }
+                $responseBody = $exportLog['_source']['@fields']['ctxt_alumio-http']['response']['responseBody'] ?? null;
+                $responseStatusCode = $exportLog['_source']['@fields']['ctxt_alumio-http']['response']['statusCode'] ?? null;
+                $responseReasonPhrase = $exportLog['_source']['@fields']['ctxt_alumio-http']['response']['reasonPhrase'] ?? null;
+
+                // Set everything else
                 $importLogArray[] = [
                     'message' => $importLog['_source']['@message'],
                     'status' => $importLog['_source']['@fields']['level'],
-                    'timestamp' => $importLog['_source']['@timestamp']
+                    'timestamp' => $importLog['_source']['@timestamp'],
+                    'requestHeaders' => $requestHeaders,
+                    'requestBody' => $requestBody,
+                    'requestMethod' => $requestMethod,
+                    'requestUri' => $requestUri,
+                    'responseHeaders' => $responseHeaders,
+                    'responseBody' => $responseBody,
+                    'responseStatusCode' => $responseStatusCode,
+                    'responseReasonPhrase' => $responseReasonPhrase
                 ];
             }
         } catch (\Exception $e) {

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "experius/module-alumiolog",
     "description": "Shows Alumio logs in Magento 2 backend",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "type": "magento2-module",
     "license": "GPL-3.0",
     "authors": [

diff --git a/view/adminhtml/templates/sub-logs.phtml b/view/adminhtml/templates/sub-logs.phtml
@@ -19,7 +19,30 @@
 
                 <div id="modal-<?= $counter ?>-<?= $type ?>">
                     <div class="modal-<?= $counter ?>-<?= $type ?>-body-content">
+                        <h3>Message:</h3>
                         <p><?php echo nl2br($log['message']) ?></p>
+                        <br />
+
+                        <?php if($log['requestBody']) : ?>
+                            <h3>Request Info:</h3>
+                            <p><strong>Request Headers:</strong></p>
+                                <p style="margin-left: 40px;"><?php echo nl2br($log['requestHeaders']) ?></p>
+                            <p><strong>Request Method:</strong> <?php echo nl2br($log['requestMethod']) ?></p>
+                            <p><strong>Request Uri:</strong> <?php echo nl2br($log['requestUri']) ?></p>
+                            <p><strong>Request Body:</strong></p>
+                                <p style="margin-left: 40px"><?php echo htmlspecialchars($log['requestBody'], ENT_QUOTES) ?></p>
+                            <br />
+                        <?php endif; ?>
+
+                        <?php if($log['responseBody']) : ?>
+                            <h3>Response Info:</h3>
+                            <p><strong>Response Headers:</strong></p>
+                                <p style="margin-left: 40px;"><?php echo nl2br($log['responseHeaders']) ?></p>
+                            <p><strong>Response Answer:</strong> <?php echo nl2br($log['responseReasonPhrase']) ?></p>
+                            <p><strong>Response Status Code:</strong> <?php echo nl2br($log['responseStatusCode']) ?></p>
+                            <p><strong>Response Body:</strong></p>
+                                <p style="margin-left: 40px"><?php echo htmlspecialchars($log['responseBody'], ENT_QUOTES) ?></p>
+                        <?php endif; ?>
                     </div>
                 </div>