[Feature] Remove the requestPassedAsString variable LRN-44748

Learnosity · Sep 17, 2024 · 19b7b66 · 19b7b66
1 parent 3ee465c
commit 19b7b66
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/src/Request/Init.php b/src/Request/Init.php
@@ -71,12 +71,6 @@ class Init
      */
     private $requestPacket;
 
-    /**
-     * Tracking if the request was passed as a string
-     * @var bool
-     */
-    private $requestPassedAsString = false;
-
     /**
      * An optional value used to define what type of request is being
      * made. This is only required for certain requests made to the
@@ -247,9 +241,7 @@ public function generate(bool $encode = true)
                 break;
             case 'assess':
                 // Stringify the request packet if necessary
-                $output = $this->requestPassedAsString ?
-                    Json::encode($this->requestPacket) :
-                    $this->requestPacket;
+                $output = $this->requestPacket;
                 break;
             case 'author':
             case 'authoraide':
@@ -259,9 +251,7 @@ public function generate(bool $encode = true)
                 $output['security'] = $this->securityPacket;
 
                 // Stringify the request packet if necessary
-                $output['request'] = $this->requestPassedAsString ?
-                    Json::encode($this->requestPacket) :
-                    $this->requestPacket;
+                $output['request'] = $this->requestPacket;
                 break;
             case 'questions':
                 // Add the security packet (with signature) to the root of output
@@ -271,7 +261,7 @@ public function generate(bool $encode = true)
                 unset($output['domain']);
 
                 if (!empty($this->requestPacket)) {
-                    $output = array_merge($output, $this->requestPacket);
+                    $output['request'] = $this->requestPacket;
                 }
                 break;
             case 'events':
@@ -297,7 +287,7 @@ public function generate(bool $encode = true)
      */
     public function generateSignature(): string
     {
-        $preHashString = $this->preHashStringGenerator->getPreHashString (
+        $preHashString = $this->preHashStringGenerator->getPreHashString(
             $this->securityPacket,
             $this->requestPacket,
             $this->action
@@ -413,10 +403,8 @@ private function setServiceOptions()
      */
     public function validate(string $service, string $secret, $securityPacket, $requestPacket): array
     {
-        if (is_string($requestPacket)) {
-            //$requestPacketObject = json_decode($requestPacket);
-            //$requestPacket = (array)$requestPacketObject;
-            $this->requestPassedAsString = true;
+        if (!is_string($requestPacket)) {
+            throw new ValidationException('The request packet must a JSON string');
         }
 
         if (is_null($requestPacket)) {