fixing hubspot integration

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [2.2.0]
+
+### Changed
+- HubSpot internal logic for api auth. Switching from API Key to Private App.
+
 ## [2.1.0]
 
 ### Fixed
@@ -150,6 +155,7 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 - Initial production release.
 
+[2.2.0]: https://github.com/infinum/eightshift-forms/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/infinum/eightshift-forms/compare/2.0.1...2.1.0
 [2.0.1]: https://github.com/infinum/eightshift-forms/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/infinum/eightshift-forms/compare/1.4.0...2.0.0

eightshift-forms.php

@@ -6,7 +6,7 @@
  * Description: Eightshift form builder plugin.
  * Author: Team Eightshift
  * Author URI: https://eightshift.com/
- * Version: 2.1.0
+ * Version: 2.2.0
  * Text Domain: eightshift-forms
  *
  * @package EightshiftForms

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@eightshift/eightshift-forms",
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"description": "This repository contains all the tools you need to start building a modern WordPress project.",
 	"authors": [
 		{

src/Integrations/Greenhouse/GreenhouseClient.php

@@ -327,13 +327,13 @@ private function getGreenhouseJob(string $jobId)
 	/**
 	 * Set headers used for fetching data.
 	 *
-	 * @param boolean $postHeaders If using post method we need to send Authorization header and type in the request.
+	 * @param boolean $isCurl If using post method we need to send Authorization header and type in the request.
 	 *
 	 * @return array<int|string, string>
 	 */
-	private function getHeaders(bool $postHeaders = false): array
+	private function getHeaders(bool $isCurl = false): array
 	{
-		if ($postHeaders) {
+		if ($isCurl) {
 			return [
 				'Authorization: Basic ' . $this->getApiKey(),
 				'Content-Type: multipart/form-data',

src/Integrations/Hubspot/HubspotClient.php

@@ -398,16 +398,15 @@ private function postFileMedia(array $file, string $formId): string
 				\CURLOPT_FAILONERROR => true,
 				\CURLOPT_POST => true,
 				\CURLOPT_RETURNTRANSFER => true,
-				\CURLOPT_POSTFIELDS => $postData
+				\CURLOPT_POSTFIELDS => $postData,
+				\CURLOPT_HTTPHEADER => $this->getHeaders(true),
 			]
 		);
 
 		$response = \curl_exec($curl); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_exec
 		$statusCode = \curl_getinfo($curl, \CURLINFO_HTTP_CODE); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_getinfo
 		\curl_close($curl); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_close
 
-		error_log( print_r( ( $statusCode ), true ) );
-
 		if ($statusCode === 200) {
 			$response = \json_decode((string) $response, true);
 
@@ -562,10 +561,19 @@ private function getHubspotItems()
 	/**
 	 * Set headers used for fetching data.
 	 *
+	 * @param boolean $isCurl If using post method we need to send Authorization header and type in the request.
+	 *
 	 * @return array<string, mixed>
 	 */
-	private function getHeaders(): array
+	private function getHeaders(bool $isCurl = false): array
 	{
+		if ($isCurl) {
+			return [
+				'Content-Type: multipart/form-data',
+				'Authorization: Bearer ' . $this->getApiKey(),
+			];
+		}
+
 		return [
 			'Content-Type' => 'application/json; charset=utf-8',
 			'Authorization' => "Bearer {$this->getApiKey()}"

src/Integrations/Hubspot/SettingsHubspot.php

@@ -319,8 +319,9 @@ public function getSettingsGlobalData(): array
 				'introSubtitle' => \__('<ol>
 						<li>Log in to your HubSpot account</li>
 						<li>Click on the settings cog icon in the top right, next to your account</li>
-						<li>In the menu on the left, under <strong>Integrations</strong> click <strong>API Key</strong></li>
-						<li>On the page that loads in the <strong>Active API key</strong> panel, click on <strong>Show</strong>, verify the captcha if needed, then click <strong>Copy</strong></li>
+						<li>In the menu on the left, under <strong>Integrations</strong> click <strong>Private Apps</strong></li>
+						<li>Click on <strong>Create a private app</strong></li>
+						<li>Provide the app name and these scopes: <strong>forms, files, crm.objects.contacts.write, crm.schemas.custom.read</strong>.</li>
 						<li>Copy the API key into the field below or use the global constant.</li>
 					</ol>', 'eightshift-forms'),
 			],

src/Rest/ApiHelper.php

@@ -14,7 +14,6 @@
 use EightshiftForms\Settings\SettingsHelper;
 use EightshiftForms\Troubleshooting\SettingsTroubleshooting;
 use EightshiftFormsVendor\EightshiftLibs\Helpers\Components;
-use WP_Error;
 
 /**
  * ApiHelper trait.
@@ -59,7 +58,7 @@ public function getApiReponseDetails(
 	): array {
 
 		// Do regular stuff if this is not and WP_Error.
-		if (!is_wp_error($response)) {
+		if (!\is_wp_error($response)) {
 			if ($isCurl) {
 				$code = $response['status'] ?? 200;
 				$body = $response;

src/Settings/SettingsHelper.php

@@ -112,7 +112,7 @@ public function getOptionValueGroup(string $key): array
 			return [];
 		}
 
-		return unserialize($value);
+		return \unserialize($value); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_unserialize
 	}
 
 	/**