Changeset 2333490

Timestamp:

07/01/2020 12:28:10 PM (5 years ago)

Author:

zapier

Message:

Allow for compatibility with other Zapier-powered plugins

Location:

zapier

Files:

• tags/1.0.1 (copied) (copied from zapier/trunk)
• tags/1.0.1/zapier.php (modified) (2 diffs)
• trunk/zapier.php (modified) (2 diffs)

zapier/tags/1.0.1/zapier.php

@@ -130 +130 @@
     public function get_user_from_token()
     {
-        if (!isset($_SERVER['HTTP_X_ZAPIER_AUTH'])) {
-            $this->error = new WP_Error(
-                'no_auth_header',
-                'X_ZAPIER_AUTH header not found.',
-                array(
-                    'status' => 400,
-                )
-            );
-            return;
-        }
-
         try {
             $token = JWT::decode(
@@ -183 +172 @@
         $is_valid_rest_api_uri = strpos($_SERVER['REQUEST_URI'], $rest_api_slug);
         $is_valid_token_uri = strpos($_SERVER['REQUEST_URI'], $this->namespace . '/token');
-        $is_zapier_request = $_SERVER['HTTP_USER_AGENT'] === 'Zapier';
+        $is_zapier_request = $_SERVER['HTTP_USER_AGENT'] === 'Zapier' && isset($_SERVER['HTTP_X_ZAPIER_AUTH']);
 
         if ($is_zapier_request && $is_valid_rest_api_uri && !$is_valid_token_uri) {

zapier/trunk/zapier.php

@@ -130 +130 @@
     public function get_user_from_token()
     {
-        if (!isset($_SERVER['HTTP_X_ZAPIER_AUTH'])) {
-            $this->error = new WP_Error(
-                'no_auth_header',
-                'X_ZAPIER_AUTH header not found.',
-                array(
-                    'status' => 400,
-                )
-            );
-            return;
-        }
-
         try {
             $token = JWT::decode(
@@ -183 +172 @@
         $is_valid_rest_api_uri = strpos($_SERVER['REQUEST_URI'], $rest_api_slug);
         $is_valid_token_uri = strpos($_SERVER['REQUEST_URI'], $this->namespace . '/token');
-        $is_zapier_request = $_SERVER['HTTP_USER_AGENT'] === 'Zapier';
+        $is_zapier_request = $_SERVER['HTTP_USER_AGENT'] === 'Zapier' && isset($_SERVER['HTTP_X_ZAPIER_AUTH']);
 
         if ($is_zapier_request && $is_valid_rest_api_uri && !$is_valid_token_uri) {