Changeset 12607

Timestamp:

06/01/2023 02:21:32 AM (3 years ago)

Author:

dd32

Message:

API: Helpscout: Cleanup the code and allow the functions to be used within a CLI script.

Location:

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout

Files:

• common.php (modified) (2 diffs)
• dpo.php (modified) (1 diff)
• forums.php (modified) (1 diff)
• plugins-themes.php (modified) (1 diff)
• profile.php (modified) (1 diff)
• webhook.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php

@@ -1 +1 @@
 <?php
+namespace WordPressdotorg\API\HelpScout;
 use WordPressdotorg\MU_Plugins\Utilities\HelpScout;
 
-if ( ! isset( $wp_init_host ) ) {
-    $wp_init_host = 'https://api.wordpress.org/';
-}
-$base_dir = dirname( dirname( __DIR__ ) );
-require( $base_dir . '/wp-init.php' );
+/**
+ * Load WordPress.
+ */
+function load_wordpress( $wp_init_host = '' ) {
+    if ( ! $wp_init_host ) {
+        $wp_init_host = 'https://api.wordpress.org/';
+    }
+
+    $base_dir = dirname( dirname( __DIR__ ) );
+    require( $base_dir . '/wp-init.php' );
+}
+// Always load WordPress, if WordPress is not loaded.
+if ( ! defined( 'ABSPATH' ) ) {
+    load_wordpress( $wp_init_host ?? '' );
+}
+
+/**
+ * Retrieve the incoming payload, and verify it's from HelpScout.
+ */
+function get_request() {
+    // HelpScout sends json data in the POST, so grab it from the input directly.
+    $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+
+    // Check the signature matches.
+    if ( ! is_from_helpscout( $HTTP_RAW_POST_DATA, $_SERVER['HTTP_X_HELPSCOUT_SIGNATURE'] ?? '' ) ) {
+        exit;
+    }
+
+    // get the info from HS.
+    return json_decode( $HTTP_RAW_POST_DATA );
+}
 
 // function to verify signature from HelpScout
@@ -365 +392 @@
     return $user;
 }
-
-// HelpScout sends json data in the POST, so grab it from the input directly.
-$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
-
-// Check the signature matches.
-if ( ! is_from_helpscout( $HTTP_RAW_POST_DATA, $_SERVER['HTTP_X_HELPSCOUT_SIGNATURE'] ?? '' ) ) {
-    exit;
-}
-
-// get the info from HS.
-return json_decode( $HTTP_RAW_POST_DATA );

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/dpo.php

@@ -1 +1 @@
 <?php
+namespace WordPressdotorg\API\HelpScout;
+
 // Add current DPO Export/Erasure status for the customer.
+$wp_init_host = 'https://wordpress.org/'; // DPO site.
+include __DIR__ . '/common.php';
 
 // $request is the validated HelpScout request.
-$wp_init_host = 'https://wordpress.org/'; // DPO site.
-$request      = include __DIR__ . '/common.php';
+$request = get_request();
 
 if ( empty( $request->customer->email ) ) {

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/forums.php

@@ -1 +1 @@
 <?php
+namespace WordPressdotorg\API\HelpScout;
+
 // Simple User Notes sidebar panel.
+include __DIR__ . '/common.php';
 
 // $request is the validated HelpScout request.
-$request = include __DIR__ . '/common.php';
+$request = get_request();
 
 // default empty output

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/plugins-themes.php

@@ -22 +22 @@
 */
 
+include __DIR__ . '/common.php';
+
 // $request is the validated HelpScout request.
-$request = include __DIR__ . '/common.php';
+$request = get_request();
 
 // default empty output

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/profile.php

@@ -1 +1 @@
 <?php
+namespace WordPressdotorg\API\HelpScout;
+
 // Simple profile lookup for HelpScout sidebar. Returns w.org links to HS for emails received.
 
+include __DIR__ . '/common.php';
+
 // $request is the validated HelpScout request.
-$request = include __DIR__ . '/common.php';
+$request = get_request();
 
 // default empty output

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/webhook.php

@@ -5 +5 @@
 // Events: Conversation Created (convo.created), convo.assigned, convo.customer.reply.created, convo.merged, convo.agent.reply.created, convo.deleted, convo.status, convo.moved
 
+include __DIR__ . '/common.php';
+
 // $request is the validated HelpScout request.
-$request = include __DIR__ . '/common.php';
+$request = get_request();
 $event   = $_SERVER['HTTP_X_HELPSCOUT_EVENT'] ?? '';