Merge branch 'release/3.5.30'

README.md

@@ -69,6 +69,9 @@ If you want to build a local production-ready version of the plugin you can run
 
 ## Changelog
 
+#### 3.5.30
+* When on Servebolt the plugin now checks the environement.json file to see if the key `api_url` exists. If its there it will use that, if not it will continue to use the pre-defined url for communication with the Servebolt API. 
+
 #### 3.5.29
 * adapted cache tags prefix to be unique: Chosing between the shortest of bolt_id plus environment_id as one string, the domain name without dots as the other string.  
 

Readme.txt

@@ -98,6 +98,9 @@ If you're a Servebolt client, please reach out to our Support Team and we'll be
 
 == Changelog ==
 
+= 3.5.30 =
+* When on Servebolt the plugin now checks the environement.json file to see if the key `api_url` exists. If its there it will use that, if not it will continue to use the pre-defined url for communication with the Servebolt API. 
+
 = 3.5.29 =
 * adapted cache tags prefix to be unique: Chosing between the shortest of bolt_id plus environment_id as one string, the domain name without dots as the other string.  
 

servebolt-optimizer.php

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Servebolt Optimizer
-Version: 3.5.29
+Version: 3.5.30
 Author: Servebolt
 Author URI: https://servebolt.com
 Description: A plugin that implements Servebolt Security & Performance best practises for WordPress.

src/Servebolt/Helpers/Helpers.php

@@ -356,6 +356,20 @@ function getSiteId(): ?string
  *
  * @return mixed|null
  */
+function getApiUrlFromEnvFile(): ?string
+{
+    $env = \Servebolt\Optimizer\Utils\EnvFile\Reader::getInstance();
+    if ($env->api_url) {
+        return $env->api_url . '/v1/';
+    }
+    return "https://api.servebolt.io/v1/";
+}
+
+/**
+ * Get site API url from Env-file.
+ *
+ * @return mixed|null
+ */
 function getSiteIdFromEnvFile(): ?string
 {
     $env = \Servebolt\Optimizer\Utils\EnvFile\Reader::getInstance();
@@ -364,7 +378,6 @@ function getSiteIdFromEnvFile(): ?string
     }
     return null;
 }
-
 /**
  * Get site ID from the webroot folder path.
  *

src/Servebolt/ServeboltOptimizer.php

@@ -35,6 +35,7 @@
 use function Servebolt\Optimizer\Helpers\isHostedAtServebolt;
 use function Servebolt\Optimizer\Helpers\isTesting;
 use function Servebolt\Optimizer\Helpers\envFileFailureHandling;
+use function Servebolt\Optimizer\Helpers\getApiUrlFromEnvFile;
 
 /**
  * Class ServeboltOptimizer
@@ -46,7 +47,7 @@ class ServeboltOptimizer
      * Boot the plugin.
      */
     public static function boot()
-    {          
+    {
         // Handle activation/deactivation
         new PluginActiveStateHandling;
 
@@ -70,6 +71,7 @@ public static function boot()
         WpMenuOptimizer::init();
 
         if (isHostedAtServebolt()) {
+
             // ACD Init
             AcceleratedDomains::init();
 
@@ -79,6 +81,11 @@ public static function boot()
             // Init environment file reader
             EnvFileReader::getInstance();
 
+            // Now settings the API URI based on the environment file->api_url.
+            // it always defaults to the Prod api if the environment file value is not present.
+            if(!defined('SERVEBOLT_SDK_BASE_URI')) {
+                define('SERVEBOLT_SDK_BASE_URI', getApiUrlFromEnvFile());
+            }
         }
 
         new AddCacheTagsHeaders;