Merge pull request #12 from myLocalInfluence/feat/check-if-json-or-b64

fix: Check If Json & B64 Encoded
myLocalInfluence · Dec 23, 2020 · dec6dd0 · dec6dd0
2 parents 17617bf + 6474519
commit dec6dd0
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/src/PubSub/Job.php b/src/PubSub/Job.php
@@ -72,8 +72,15 @@ public function getJobId()
      */
     public function getRawBody()
     {
+        $data = $this->job->data();
+        if (!empty($data) && $this->isBase64Encoded($data)) {
+            $data = base64_decode($data);
+        }
+        if (!empty($data) && $this->isJson($data)) {
+            $data = json_decode($data, true);
+        }
         $fullData = [
-            'data'       => json_decode(base64_decode($this->job->data()), true) ?? [],
+            'data'       => $data ?? [],
             'attributes' => $this->job->attributes() ?? []
         ];
         $newArray = [
@@ -85,6 +92,22 @@ public function getRawBody()
         return json_encode($newArray);
     }
 
+    public function isJson(string $string) : bool
+    {
+        json_decode($string);
+
+        return (json_last_error() == JSON_ERROR_NONE);
+    }
+
+    public function isBase64Encoded(string $data) : bool
+    {
+        if (preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $data)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Delete the job from the queue.
      *