Merge branch 'craft-4' of https://github.com/verbb/social-poster into…

… craft-5 # Conflicts: # CHANGELOG.md # composer.json
verbb · May 29, 2024 · 3374f4c · 3374f4c
2 parents 6be5121 + 80cf9ff
commit 3374f4c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,19 @@
 - Update `elementChip()` references.
 - Fix an error when uninstalling.
 
+## 4.0.11 - 2024-05-29
+
+### Changed
+- Update English translations.
+
+## 4.0.10 - 2024-04-29
+
+### Added
+- Add support for `headlessMode` redirect URIs.
+
+### Changed
+- Update English translations.
+
 ## 4.0.9 - 2024-04-05
 
 ### Added

diff --git a/src/SocialPoster.php b/src/SocialPoster.php
@@ -136,6 +136,10 @@ private function _registerCpRoutes(): void
             $event->rules['social-poster/accounts/new'] = 'social-poster/accounts/edit';
             $event->rules['social-poster/accounts/<handle:{handle}>'] = 'social-poster/accounts/edit';
             $event->rules['social-poster/settings'] = 'social-poster/plugin/settings';
+
+            if (Craft::$app->getConfig()->getGeneral()->headlessMode || !Craft::$app->getConfig()->getGeneral()->cpTrigger) {
+                $event->rules['social-poster/auth/callback'] = 'social-poster/auth/callback';
+            }
         });
     }
 

diff --git a/src/base/OAuthAccount.php b/src/base/OAuthAccount.php
@@ -44,7 +44,11 @@ public function getRedirectUri(): ?string
     {
         $siteId = Craft::$app->getSites()->getCurrentSite()->id ?? Craft::$app->getSites()->getPrimarySite()->id;
 
-        // We should always use the primary site for the redirect
+        // Check for Headless Mode and use the Action URL, or when `cpTrigger` is empty to signify split front/back-end
+        if (Craft::$app->getConfig()->getGeneral()->headlessMode || !Craft::$app->getConfig()->getGeneral()->cpTrigger) {
+            return UrlHelper::cpUrl('social-poster/auth/callback', null, null, $siteId);
+        }
+
         return UrlHelper::siteUrl('social-poster/auth/callback', null, null, $siteId);
     }