Skip to content

[5.0] Fix com_ajax event with webauthn plugin #41720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 2 commits into from
Sep 12, 2023
Merged

[5.0] Fix com_ajax event with webauthn plugin #41720

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5baaf45
Fix com_ajax event with webauthn plugin
Fedik Sep 12, 2023
69bdf91
Merge branch '5.0-dev' into fix-41719
HLeithner Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions components/com_ajax/ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Event\AbstractEvent;
use Joomla\CMS\Event\GenericEvent;
use Joomla\CMS\Event\Plugin\AjaxEvent;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
Expand Down Expand Up @@ -130,11 +132,17 @@
$dispatcher = $app->getDispatcher();
$group = $input->get('group', 'ajax');
$eventName = 'onAjax' . ucfirst($input->get('plugin', ''));

// @TODO: plugin plg_system_webauthn and all other plugins should use common AjaxEvent
$event = AbstractEvent::create($eventName, ['subject' => $app]);

if ($event instanceof GenericEvent) {
$event = new AjaxEvent($eventName, ['subject' => $app]);
}

PluginHelper::importPlugin($group, null, true, $dispatcher);

$results = $dispatcher->dispatch($eventName, new AjaxEvent($eventName, [
'subject' => $app,
]))->getArgument('result', []);
$results = $dispatcher->dispatch($eventName, $event)->getArgument('result', []);
} catch (Throwable $e) {
$results = $e;
}
Expand Down