Merge pull request #196 from plivo/SUP-1831

replace base uri if request is not from voice
plivo · Nov 17, 2020 · f3c5018 · f3c5018
2 parents 938e665 + 0b299eb
commit f3c5018
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [v4.15.1](https://github.com/plivo/plivo-php/releases/tag/v4.15.1) - 2020-11-17
+- Fix resource not found exception when making sequential requests.
+
 ## [v4.15.0](https://github.com/plivo/plivo-php/releases/tag/v4.15.0) - 2020-11-17
 - Add number_priority support for Powerpack API.
 

diff --git a/src/Plivo/BaseClient.php b/src/Plivo/BaseClient.php
@@ -168,20 +168,18 @@ public function sendRequest(PlivoRequest $request, $url = null)
         $fullUrl = $url ? $url : null;
         list($url, $method, $headers, $body) =
             $this->prepareRequestMessage($request, $fullUrl);
-        if(static::$isVoiceRequest){
-            if(static::$voiceRetryCount == 0){
+        if (static::$isVoiceRequest) {
+            if (static::$voiceRetryCount == 0) {
                 $url = self::VOICE_BASE_API_URL . $request->getUrl();
-            }
-            elseif(static::$voiceRetryCount == 1){
+            } elseif (static::$voiceRetryCount == 1) {
                 $url = self::VOICE_BASE_API_FALLBACK_URL_1 . $request->getUrl();
-            }
-            elseif(static::$voiceRetryCount == 2){
+            } elseif (static::$voiceRetryCount == 2) {
                 $url = self::VOICE_BASE_API_FALLBACK_URL_2 . $request->getUrl();
             }
-	}
-	if (static::$isLookupRequest) {
-	    $url = self::LOOKUP_API_BASE_URL . $request->getUrl();
-	}
+        }
+        if (static::$isLookupRequest) {
+            $url = self::LOOKUP_API_BASE_URL . $request->getUrl();
+        }
         $timeout = $this->timeout ?: static::DEFAULT_REQUEST_TIMEOUT;
 
         $plivoResponse =
@@ -193,9 +191,9 @@ public function sendRequest(PlivoRequest $request, $url = null)
         if (!$plivoResponse->ok() && !static::$isVoiceRequest) {
             return $plivoResponse;
         }
-        if($plivoResponse->getStatusCode() >= 500 && static::$isVoiceRequest){
+        if ($plivoResponse->getStatusCode() >= 500 && static::$isVoiceRequest) {
             static::$voiceRetryCount++;
-            if(static::$voiceRetryCount > 2){
+            if (static::$voiceRetryCount > 2) {
                 static::$voiceRetryCount = 0;
                 return $plivoResponse;
             }
@@ -213,11 +211,14 @@ public function sendRequest(PlivoRequest $request, $url = null)
      */
     public function fetch($uri, $params)
     {
-        if (array_key_exists("isVoiceRequest", $params)){
+        if (array_key_exists("isVoiceRequest", $params)) {
             static::$isVoiceRequest = true;
             unset($params['isVoiceRequest']);
-	}
-        if (array_key_exists("isLookupRequest", $params)){
+        }
+        else{
+            static::$isVoiceRequest = false;
+        }
+        if (array_key_exists("isLookupRequest", $params)) {
             static::$isLookupRequest = true;
             unset($params['isLookupRequest']);
         }
@@ -241,11 +242,13 @@ public function update($uri, $params)
             $isCallInsightsRequest = TRUE;
             $url = $params['CallInsightsEndpoint'];
             unset($params['CallInsightsEndpoint']);
-        }
-        elseif (array_key_exists("isVoiceRequest", $params)){
+        } elseif (array_key_exists("isVoiceRequest", $params)) {
             static::$isVoiceRequest = true;
             unset($params['isVoiceRequest']);
         }
+        else{
+            static::$isVoiceRequest = false;
+        }
         $request =
             new PlivoRequest(
                 'POST', $uri, ArrayOperations::removeNull($params));
@@ -306,10 +309,13 @@ public function getPhlorunner($uri, $params)
      */
     public function delete($uri, $params)
     {
-        if (array_key_exists("isVoiceRequest", $params)){
+        if (array_key_exists("isVoiceRequest", $params)) {
             static::$isVoiceRequest = true;
             unset($params['isVoiceRequest']);
         }
+        else{
+            static::$isVoiceRequest = false;
+        }
         $request =
             new PlivoRequest(
                 'DELETE', $uri, ArrayOperations::removeNull($params));

diff --git a/src/Plivo/Version.php b/src/Plivo/Version.php
@@ -24,7 +24,7 @@ class Version
     /**
      * @const int PHP helper library patch number
      */
-    const PATCH = 0;
+    const PATCH = 1;
     /**
      * @return string
      */