From 1078b41af348c603499e9d52eea61239a6b69039 Mon Sep 17 00:00:00 2001
From: Ross Cooper <ross.cooper@rosss-mbp.home>
Date: Sat, 12 Nov 2022 21:26:08 +0000
Subject: [PATCH] Fixed support for private apps

---
 composer.json                      |  2 +-
 src/HubSpotServiceProvider.php     | 14 +++++++-------
 src/config/hubspot.php             | 16 ++++++++--------
 tests/Unit/ServiceProviderTest.php | 14 +++++++-------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/composer.json b/composer.json
index 72fba7b..8ce3489 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "illuminate/support": ">=5.3",
-        "hubspot/hubspot-php": "^3.0"
+        "hubspot/hubspot-php": "^5.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/HubSpotServiceProvider.php b/src/HubSpotServiceProvider.php
index 0f92a7c..712a814 100644
--- a/src/HubSpotServiceProvider.php
+++ b/src/HubSpotServiceProvider.php
@@ -13,13 +13,13 @@ public function register()
 	{
 		//Bind the HubSpot wrapper class
 		$this->app->bind('Rossjcooper\LaravelHubSpot\HubSpot', function ($app) {
-            if (config('hubspot.use_oauth2')) {
-                return HubSpot::createWithOAuth2Token(
-                    config('hubspot.api_key'),
-                    null,
-                    config('hubspot.client_options', [])
-                );
-            }
+			if (env('HUBSPOT_USE_OAUTH2', config('hubspot.use_oauth2'))) {
+				return HubSpot::createWithOAuth2Token(
+					env('HUBSPOT_API_KEY', config('hubspot.api_key')),
+					null,
+					config('hubspot.client_options', [])
+				);
+			}
 
 			return HubSpot::create(
 				env('HUBSPOT_API_KEY', config('hubspot.api_key')),
diff --git a/src/config/hubspot.php b/src/config/hubspot.php
index f1f86bd..51f69bd 100644
--- a/src/config/hubspot.php
+++ b/src/config/hubspot.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    /*
-     * Either the API key or the private app access token
-     */
+	/*
+	 * Either the API key or the private app access token
+	 */
 	'api_key' => env('HUBSPOT_API_KEY'),
 
-    /*
-     * Should the library connect via OAuth2 or use the API key. The usage of the API key will be deprecated on
-     * November 30th, 2022.
-     */
-    'use_oauth2' => env('HUBSPOT_USE_OAUTH2', false),
+	/*
+	 * Should the library connect via OAuth2 or use the API key. The usage of the API key will be deprecated on
+	 * November 30th, 2022.
+	 */
+	'use_oauth2' => env('HUBSPOT_USE_OAUTH2', false),
 
 	'client_options' => [
 		'http_errors' => true,
diff --git a/tests/Unit/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php
index 73db940..a7b8fbf 100644
--- a/tests/Unit/ServiceProviderTest.php
+++ b/tests/Unit/ServiceProviderTest.php
@@ -23,13 +23,13 @@ public function test_api_key_set()
 	}
 
     public function test_oauth2_client_is_built()
-    {
-        Config::set('hubspot.use_oauth2', true);
-        Config::set('hubspot.api_key', 'FooBarBaz');
+	{
+		Config::set('hubspot.use_oauth2', true);
+		Config::set('hubspot.api_key', 'FooBarBaz');
 
-        $hubspot = app(HubSpot::class);
+		$hubspot = app(HubSpot::class);
 
-        $this->assertEquals('FooBarBaz', $hubspot->getClient()->key);
-        $this->assertTrue($hubspot->getClient()->oauth2);
-    }
+		$this->assertEquals(env('HUBSPOT_API_KEY'), $hubspot->getClient()->key);
+		$this->assertTrue($hubspot->getClient()->oauth2);
+	}
 }