Add handling for multi-site refresh-token front-end requests

Author: engram-design

src/elements/Form.php

@@ -17,6 +17,7 @@
 use verbb\formie\helpers\ArrayHelper;
 use verbb\formie\helpers\HandleHelper;
 use verbb\formie\helpers\Html;
+use verbb\formie\helpers\UrlHelper;
 use verbb\formie\models\FieldLayout;
 use verbb\formie\models\FieldLayoutPage;
 use verbb\formie\models\FormSettings;
@@ -45,7 +46,6 @@
 use craft\helpers\Json;
 use craft\helpers\Session;
 use craft\helpers\StringHelper;
-use craft\helpers\UrlHelper;
 use craft\models\FieldLayout as CraftFieldLayout;
 use craft\validators\HandleValidator;
 use craft\web\View;
@@ -1772,10 +1772,10 @@ public function getFrontEndJsVariables(): array
             'enableBackSubmission' => $pluginSettings->enableBackSubmission,
             'ajaxTimeout' => $pluginSettings->ajaxTimeout,
             'outputConsoleMessages' => $pluginSettings->outputConsoleMessages,
-            'baseActionUrl' => rtrim(UrlHelper::actionUrl(''), '/'),
+            'baseActionUrl' => rtrim(UrlHelper::siteActionUrl(''), '/'),
 
             // Generate the refresh token here to make use of `UrlHelper` generation
-            'refreshTokenUrl' => UrlHelper::actionUrl('formie/forms/refresh-tokens', ['form' => 'FORM_PLACEHOLDER']),
+            'refreshTokenUrl' => UrlHelper::siteActionUrl('formie/forms/refresh-tokens', ['form' => 'FORM_PLACEHOLDER']),
         ];
 
         // Render options could contain settings for script tag attributes (CSP)

src/helpers/UrlHelper.php

@@ -0,0 +1,27 @@
+<?php
+namespace verbb\formie\helpers;
+
+use verbb\formie\Formie;
+
+use Craft;
+use craft\helpers\UrlHelper as CraftUrlHelper;
+
+class UrlHelper extends CraftUrlHelper
+{
+    // Static Methods
+    // =========================================================================
+
+    public static function siteActionUrl(string $path = '', array|string|null $params = null, ?string $scheme = null, ?bool $showScriptName = null): string
+    {
+        // Swap the domain to resolve to the current site for front-end requests.
+        // Note that this should only be done for other domains, hence the check for host changes.
+        // Otherwise, sub-directory installs would be affected.
+        // https://github.com/verbb/formie/issues/2479
+        $url = static::actionUrl($path, $params, $scheme, $showScriptName);
+        $baseSiteUrl = parse_url(static::baseSiteUrl())['host'] ?? '';
+        $baseCpUrl = parse_url(static::baseCpUrl())['host'] ?? '';
+
+        return str_replace($baseCpUrl, $baseSiteUrl, $url);
+    }
+
+}