From 6ed9a61082086bb2fde3fb3ab2997a92f82259ec Mon Sep 17 00:00:00 2001
From: NZ Transport Agency <channels@nzta.govt.nz>
Date: Tue, 23 Jun 2020 12:17:02 +1200
Subject: [PATCH 1/2] remove tcp prefix

---
 src/gateway/OktaGateway.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gateway/OktaGateway.php b/src/gateway/OktaGateway.php
index 64f319e..aff2a03 100755
--- a/src/gateway/OktaGateway.php
+++ b/src/gateway/OktaGateway.php
@@ -141,8 +141,8 @@ public function get($endpoint)
                 $proxyPort = Environment::getEnv('SS_OUTBOUND_PROXY_PORT');
                 $proxy = [
                     'proxy' => [
-                        'http'  => sprintf('tcp://%s:%s', $proxy, $proxyPort), // Use this proxy with "http"
-                        'https' => sprintf('tcp://%s:%s', $proxy, $proxyPort), // Use this proxy with "https",
+                        'http'  => sprintf('%s:%s', $proxy, $proxyPort), // Use this proxy with "http"
+                        'https' => sprintf('%s:%s', $proxy, $proxyPort), // Use this proxy with "https",
                     ],
                 ];
             }

From f70f78d58ec194a40c875000702114f073bd7481 Mon Sep 17 00:00:00 2001
From: StephenMak <stephen.makrogianni@silverstripe.com>
Date: Mon, 6 Jul 2020 16:39:19 +1200
Subject: [PATCH 2/2] Change the header array key to use lowercase

---
 src/services/OktaService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/OktaService.php b/src/services/OktaService.php
index 6dff3cc..62a5990 100755
--- a/src/services/OktaService.php
+++ b/src/services/OktaService.php
@@ -268,7 +268,7 @@ public function getUsersFromGroup($limit, $after, $groupID)
     private function getAfterFromLinkHeader($data)
     {
         $after = null;
-        $linkHeader = (isset($data['Headers']['Link'])) ? $data['Headers']['Link'] : null;
+        $linkHeader = (isset($data['Headers']['link'])) ? $data['Headers']['link'] : null;
 
         // parse the "Link" header
         if ($linkHeader) {