feat: initial implementation of new DNS panel integration

modules/registrars/openprovider/Controllers/Hooks/ClientAreaPrimarySidebarController.php

@@ -21,10 +21,17 @@ class ClientAreaPrimarySidebarController
      * @var ApiHelper
      */
     private $apiHelper;
-
-    public function __construct(ApiHelper $apiHelper)
+    /**
+     * @var DNS
+     */
+    private $dnsHelper;
+    /**
+     * ConfigController constructor.
+     */
+    public function __construct(ApiHelper $apiHelper, DNS $dnsHelper)
     {
         $this->apiHelper = $apiHelper;
+        $this->dnsHelper = $dnsHelper;
     }
 
     public function show($primarySidebar)
@@ -43,7 +50,7 @@ private function replaceDnsMenuItem($primarySidebar)
         if (!$dnsManagement = $domainDetailsManagement->getChild('Manage DNS Host Records'))
             return;
 
-        if ($url = DNS::getDnsUrlOrFail($_REQUEST['domainid'])) {
+        if ($url = $this->dnsHelper->getDnsUrlOrFail($_REQUEST['domainid'])) {
             // Update the URL.
             $dnsManagement->setUri($url);
 

modules/registrars/openprovider/Controllers/Hooks/DnsAuthController.php

@@ -12,9 +12,22 @@
  */
 
 class DnsAuthController {
+
+    /**
+     * @var DNS
+     */
+    private $dnsHelper;
+    /**
+     * ConfigController constructor.
+     */
+    public function __construct(DNS $dnsHelper)
+    {
+        $this->dnsHelper = $dnsHelper;
+    }
+
     public function redirectDnsManagementPage ($params)
     {
-        if($url = DNS::getDnsUrlOrFail($params['domainid']))
+        if($url = $this->dnsHelper->getDnsUrlOrFail($params['domainid']))
         {
             $urlOne = $_SERVER['HTTP_REFERER'];
             $url_decoded = html_entity_decode($urlOne);

modules/registrars/openprovider/Controllers/System/DnsController.php

@@ -13,6 +13,7 @@
 use OpenProvider\API\Domain;
 use WeDevelopCoffee\wPower\Controllers\BaseController;
 use WeDevelopCoffee\wPower\Core\Core;
+use OpenProvider\WhmcsRegistrar\helpers\DNS;
 
 class DnsController extends BaseController
 {
@@ -26,16 +27,20 @@ class DnsController extends BaseController
      * @var ApiHelper
      */
     private $apiHelper;
-
+    /**
+     * @var DNS
+     */
+    private $dnsHelper;
     /**
      * ConfigController constructor.
      */
-    public function __construct(Core $core, Domain $domain, ApiHelper $apiHelper)
+    public function __construct(Core $core, Domain $domain, ApiHelper $apiHelper, DNS $dnsHelper)
     {
         parent::__construct($core);
 
         $this->domain = $domain;
         $this->apiHelper = $apiHelper;
+        $this->dnsHelper = $dnsHelper;
     }
 
     /**
@@ -112,6 +117,35 @@ public function save($params)
         }
     }
 
+    public function redirectDnsManagementPage ($params)
+    {
+        if($url = $this->dnsHelper->getDnsUrlOrFail($params['domainid'], true))
+        {
+            $urlOne = $_SERVER['HTTP_REFERER'];
+            $url_decoded = html_entity_decode($urlOne);
+
+            // JavaScript confirm dialog
+            echo '<script type="text/javascript">
+                    document.addEventListener("DOMContentLoaded", function() {
+                        var userConfirmed = confirm("Do you want to open in New Tab?");
+                        if (userConfirmed) {
+                            var newWindow = window.open("' . $url . '", "_blank"); // Open OP DNS management page in a new tab
+                            if (newWindow) {
+                                window.location.href = "' . $url_decoded . '"; // Redirect to previous page
+                                newWindow.focus(); // Focus on the new tab
+                            } else {
+                                alert("New tab opening blocked! Please allow it for this site.");
+                                window.location.href = "' . $url . '"; // Redirect to OP DNS management page
+                            }
+                        } else {
+                            window.location.href = "' . $url . '"; // Redirect to OP DNS management page
+                        }
+                    });
+                  </script>';
+            exit;
+        }
+    }
+
     /**
      * @param array $records
      *

modules/registrars/openprovider/OpenProvider/API/ApiHelper.php

@@ -483,6 +483,22 @@ public function deleteDnsRecords(Domain $domain): array
         return [];
     }
 
+    /**
+     * @param string $domain
+     * @param string $zone_provider
+     * @return array
+     * @throws \Exception 
+     */
+    public function getDnsDomainToken(string $domain, string $zone_provider): array
+    {
+        $args = [
+            'domain' => $domain,
+            'zone_provider' => $zone_provider,
+        ];
+
+        return $this->buildResponse($this->apiClient->call('createDomainTokenRequest', $args));
+    }
+
     /**
      * @param string $handle
      * @param bool $formattedForWhmcs
@@ -605,7 +621,6 @@ public function getTldMeta(string $tld): array
         );
     }
 
-
     /**
      * @param ResponseInterface $response
      * @return array

modules/registrars/openprovider/OpenProvider/API/CommandMapping.php

@@ -15,6 +15,7 @@
 use Openprovider\Api\Rest\Client\Person\Api\ResellerServiceApi;
 use Openprovider\Api\Rest\Client\Tld\Api\TldServiceApi;
 use Openprovider\Api\Rest\Client\Domain\Api\AuthCodeApi;
+use Openprovider\Api\Rest\Client\Dns\Api\DomainTokenApi;
 
 class CommandMapping
 {
@@ -130,6 +131,10 @@ class CommandMapping
             self::COMMAND_MAP_METHOD => 'createZone',
             self::COMMAND_MAP_CLASS => ZoneServiceApi::class,
         ],
+        'createDomainTokenRequest' => [
+            self::COMMAND_MAP_METHOD => 'createToken',
+            self::COMMAND_MAP_CLASS => DomainTokenApi::class
+        ],
 
         // Nameservers
         'searchNsRequest' => [

modules/registrars/openprovider/composer.json

@@ -16,7 +16,7 @@
     "require": {
         "wedevelopcoffee/wpower": "2.2.*",
         "viison/address-splitter": "^0.3.2",
-        "openprovider/rest-client-php": "2.0.2-beta",
+        "openprovider/rest-client-php": "dev-v1beta",
         "symfony/serializer": "^5.2",
         "psr/log": "^1.1",
         "symfony/property-access": "^5.2",

modules/registrars/openprovider/helpers/DNS.php

@@ -2,41 +2,69 @@
 
 namespace OpenProvider\WhmcsRegistrar\helpers;
 
+use OpenProvider\API\ApiHelper;
 use OpenProvider\WhmcsRegistrar\src\Configuration;
-use OpenProvider\WhmcsRegistrar\src\OpenProvider;
+use OpenProvider\WhmcsRegistrar\helpers\DomainFullNameToDomainObject;
 use WHMCS\Database\Capsule;
 
 class DNS
 {
+    /**
+     * @var ApiHelper
+     */
+    private $apiHelper;
+
+    /**
+     * ConfigController constructor.
+     */
+    public function __construct(ApiHelper $apiHelper)
+    {
+        $this->apiHelper = $apiHelper;
+    }
+
     /**
      * Get the DNS URL
      *
-     * @return bool|void
+     * @param int $domain_id
+     * @param bool $skipConfigCheck  Whether to ignore useNewDnsManagerFeature flag
+     * @return string|bool
      */
-    public static function getDnsUrlOrFail($domain_id)
+    public function getDnsUrlOrFail($domain_id, bool $skipConfigCheck = false)
     {
         // Get the domain details
         $domain = Capsule::table('tbldomains')
             ->where('id', $domain_id)
             ->first();
+
+        if (!$domain) {
+            return false;
+        }
 
         // Check if OpenProvider is the provider
         if($domain->registrar != 'openprovider' || $domain->status != 'Active')
             return false;
 
-        // Check if we are allowed to make a redirect.
-        $newDnsStatus = Configuration::getOrDefault('useNewDnsManagerFeature', false);
+        // Client-side feature toggle (unless skipped)
+        if (!$skipConfigCheck) {
 
+            // Check if we are allowed to make a redirect
+            $newDnsStatus = Configuration::getOrDefault('useNewDnsManagerFeature', false);
 
-        if($newDnsStatus != true)
-            return false;
+            if ($newDnsStatus !== true) {
+                return false;
+            }
+        }
+
+        $op_domain_obj = DomainFullNameToDomainObject::convert($domain->domain);
 
         // Let's get the URL.
         try {
-            $OpenProvider       = new OpenProvider();
-            return $OpenProvider->api->getDnsSingleDomainTokenUrl($domain->domain)['url'];
+            $domainOp = $this->apiHelper->getDomain($op_domain_obj);
+            $zoneProvider = !empty($domainOp['isSectigoDnsEnabled']) ? 'sectigo' : 'openprovider';
+            $response = $this->apiHelper->getDnsDomainToken($domain->domain, $zoneProvider);
+            return $response['url'] ?? false;
         } catch (\Exception $e) {
-            \logModuleCall('OpenProvider', 'Fetching generateSingleDomainTokenRequest', $domain->domain, @$response, $e->getMessage(), [htmlentities($params['Password']), $params['Password']]);
+            logModuleCall('OpenProvider','getDnsDomainToken',$domain->domain,$e->getMessage(),'', '');
             return false;
         }
     }

modules/registrars/openprovider/openprovider.php

@@ -6,7 +6,7 @@
  * @copyright Copyright (c) Openprovider 2018
  */
 
-use \OpenProvider\WhmcsRegistrar\src\Configuration;
+use OpenProvider\WhmcsRegistrar\src\Configuration;
 use WHMCS\Exception\Module\InvalidConfiguration;
 
 if (!defined("WHMCS")) {
@@ -64,6 +64,7 @@ function openprovider_AdminCustomButtonArray()
     $buttonarray = array(
         "Auto-renew Sync" => "AutoRenewSync",
         "Sync" => "Sync",
+        'Manage DNS Zone' => 'AdminManageDnsZone',
     );
 
     return $buttonarray;
@@ -282,7 +283,7 @@ function openprovider_AutoRenewSync($params)
  * @return array
  */
 function openprovider_Sync($paramsArray)
-{   
+{
     return openprovider_registrar_launch_decorator('domainSync', $paramsArray);
 }
 
@@ -342,6 +343,16 @@ function openprovider_ResendIRTPVerificationEmail(array $params)
     return openprovider_registrar_launch_decorator('resendIRTPVerificationEmail', $params);
 }
 
+/**
+ * Admin Manage Dns Zone
+ *
+ * @param array $params
+ * @return mixed
+ */
+function openprovider_AdminManageDnsZone($params)
+{
+    return openprovider_registrar_launch_decorator('adminManageDnsZone', $params);
+}
 
 function openprovider_config_validate($params)
 {
@@ -358,7 +369,7 @@ function openprovider_config_validate($params)
         $baseUrl = Configuration::get('restapi_url_sandbox');
     }
 
-    $url = "{$baseUrl}{$resourcePath}"; 
+    $url = "{$baseUrl}{$resourcePath}";
 
     $data = array(
         "username" => $username,
@@ -375,6 +386,7 @@ function openprovider_config_validate($params)
     curl_setopt($curl, CURLOPT_POSTFIELDS, $encodedData);
     $result = curl_exec($curl);
     curl_close($curl);
+
     $response = json_decode($result);
     if (!$response->data->token || !$response->data->reseller_id) {
         throw new InvalidConfiguration("Credentials are Invalid for $env Environment");

modules/registrars/openprovider/routes/system.php

@@ -32,6 +32,7 @@
     // DNS
     'getDns'  => 'DnsController@get',
     'saveDns' => 'DnsController@save',
+    'adminManageDnsZone' => 'DnsController@redirectDnsManagementPage',
 
     // Contact
     'getContactDetails'  => 'ContactController@getDetails',

modules/registrars/openprovider/vendor/autoload.php

@@ -14,10 +14,7 @@
             echo $err;
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';