Merge remote-tracking branch 'origin/master' into master8.3

Author: m45adiwinata

src/Libraries/ClientExternal.php

@@ -169,15 +169,23 @@ public function call(Request $request, array $options = []): ResponseInterface
                 'request' => [
                     'method' => $request->getMethod(),
                     'headers' => $request->getHeaders(),
-                    'body' => json_decode($reqbody, true)
                 ],
                 'response' => [
                     'headers' => $response->getHeaders(),
-                    'body' => json_decode($respbody, true)
                 ],
                 'responseTime' => round($elapsed * 1000),
                 'memoryUsage' => memory_get_usage()
             ];
+            if ($request->getHeader('Content-Type') == 'application/json') {
+                $logData['request']['body'] = json_decode($reqbody, true);
+            } else {
+                $logData['request']['body'] = $reqbody;
+            }
+            if ($response->getHeader('Content-Type') == 'application/json') {
+                $logData['response']['body'] = json_decode($respbody, true);
+            } else {
+                $logData['response']['body'] = $respbody;
+            }
             $response->getBody()->rewind();
             Log::activity()->info($logData);
         }