Skip to content

Add support of Mercure running on a subdomain#1394

Merged
martineiber merged 7 commits into
pimcore:1.xfrom
vrobert78:mercure-on-subdomain
Nov 17, 2025
Merged

Add support of Mercure running on a subdomain#1394
martineiber merged 7 commits into
pimcore:1.xfrom
vrobert78:mercure-on-subdomain

Conversation

@vrobert78
Copy link
Copy Markdown
Contributor

@vrobert78 vrobert78 commented Sep 23, 2025

On Pimcore PaaS, we'd like to switch from running Mercure in a side app to running Mercure as a Service.
But running Mercure as a Service implies that we run it on a subdomain.
Those modifications are required for the authentication layer.

There are also changes required in studio-ui-bundle, see pimcore/studio-ui-bundle#2095.

@vrobert78
Copy link
Copy Markdown
Contributor Author

I replaced the cookieSameSite variable by jwt_cookie_strictness to have the same behavior as on Direct-Edit, see https://github.com/pimcore/direct-edit/pull/85/files.

Copy link
Copy Markdown
Contributor

@martineiber martineiber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR!
I just have a small suggestion to improve readability.

Comment thread src/Mercure/Service/HubService.php
vrobert78 and others added 2 commits September 23, 2025 10:32
Co-authored-by: Martin Eiber <martin.eiber@gmail.com>
@sonarqubecloud
Copy link
Copy Markdown

Comment thread config/mercure.yaml Outdated
Comment thread src/DependencyInjection/Configuration.php
Comment thread src/Mercure/Service/HubService.php Outdated
Comment thread src/Mercure/Service/HubService.php Outdated
Co-authored-by: JiaJia Ji <kingjia90@gmail.com>
@sonarqubecloud
Copy link
Copy Markdown

@bluvulture
Copy link
Copy Markdown
Contributor

@kingjia90 @martineiber can we merge this one?

@bluvulture bluvulture requested a review from kingjia90 November 12, 2025 12:31
@kingjia90
Copy link
Copy Markdown
Contributor

@martineiber is that

is necessary? we need to adapt the direct-edit in case

@martineiber
Copy link
Copy Markdown
Contributor

@martineiber is that

is necessary? we need to adapt the direct-edit in case

I do not see why it should be necessary. And can be removed.

From my point this looks good.

Copy link
Copy Markdown
Contributor

@martineiber martineiber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@martineiber
Copy link
Copy Markdown
Contributor

@bluvulture @vrobert78 Can we merge this one from you side?

@bluvulture
Copy link
Copy Markdown
Contributor

lgtm 👍

@martineiber martineiber self-assigned this Nov 17, 2025
@martineiber martineiber added this to the next milestone Nov 17, 2025
@martineiber martineiber merged commit 325cc45 into pimcore:1.x Nov 17, 2025
13 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants