UPSTREAM FIX

magento2-40858: Customer resolver cache hits across websites with website-scoped customers

Community fix magento2-40858 merged into magento/magento2 on 2026-08-24, not in a release yet; applies cleanly to 18 releases from 2.4.7 to 2.4.9.

Fixes Customer resolver cache hits across websites with website-scoped customers edited

Pull request title
Customer Token Generated on Website A Can Be Used on Website B in Website-Scoped Customer Configuration
Pull request
magento/magento2#40858
Issues
#40847 human
Author
@aasim110
Merged
2026-08-24
Fixed in
no release yet
Reported on
—
Categories
GraphQL
Components
magento/module-customer-graph-ql

Labels

Area
—
Component
GraphQL
Priority
P2
Severity
—
Reported on (labels)
2.4.x

Issue

Title and steps come from the upstream issue and pull request.

Description

A token generated on Website A can be reused successfully on Website B, allowing authentication across websites despite website-scoped customer configuration.

Steps to reproduce

Steps to Reproduce
1. Configure Magento with website-scoped customers.
2. Log in to Website A using generateCustomerToken.
3. Obtain the customer token.
4. Send a GraphQL request to Website B using: Authorization: Bearer <token_from_website_A>

Expected result

When customer accounts are website-scoped, a customer token generated for Website A should only be valid for the customer account belonging to Website A. The token should not authenticate requests against a different website that has a separate customer scope.

Actual result

A token generated on Website A can be reused successfully on Website B, allowing authentication across websites despite website-scoped customer configuration.

Taken from the upstream issue.

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

LineCode match per tagTests
2.4.6
2.4.6 conflict 2.4.6-p1 conflict 2.4.6-p2 conflict 2.4.6-p3 conflict 2.4.6-p4 conflict 2.4.6-p5 conflict 2.4.6-p6 conflict 2.4.6-p7 conflict 2.4.6-p8 conflict 2.4.6-p9 conflict 2.4.6-p10 conflict 2.4.6-p11 conflict 2.4.6-p12 conflict 2.4.6-p13 conflict 2.4.6-p14 conflict 2.4.6-p15 conflict
2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7
2.4.7 clean 2.4.7-p1 clean 2.4.7-p2 clean 2.4.7-p3 clean 2.4.7-p4 clean 2.4.7-p5 clean 2.4.7-p6 clean 2.4.7-p7 clean 2.4.7-p8 clean 2.4.7-p9 clean 2.4.7-p10 clean
2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: fails before, passes afterunit: could not run before, passes after · api-functional: fails before, passes after
2.4.8
2.4.8 clean 2.4.8-p1 clean 2.4.8-p2 clean 2.4.8-p3 clean 2.4.8-p4 clean 2.4.8-p5 clean
2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: fails before, passes afterunit: could not run before, passes after · api-functional: fails before, passes after
2.4.9
2.4.9 clean
2.4.9: fails before (after: error)unit: could not run before, passes after · api-functional: could not run before, could not run after

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 98.4%. Probability it is security relevant: 96.9%.

Show the model's answers and probabilities
QuestionAnswerProbabilitiesConfidence
Change kindbugfixbugfix 94.2%, feature 2.0%, refactor 1.5%, tests_only 1.2%, dependency 0.5%, docs_only 0.5%86.6%
Areagraphql_apigraphql_api 68.8%, customer 26.3%, framework 2.5%47.9%
Reported versionunspecifiedunspecified 28.9%, 2.4.7 2.5%, 2.4.8 2.5%8.1%
Scope0.60 of 20 57.6%, 1 25.2%, 2 17.2%13.8%
Risk1.25 of 22 56.6%, 0 31.5%, 1 11.9%15.1%
Worth backporting1.61 of 22 67.8%, 1 25.3%, 0 6.9%29.3%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-40858/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Packages (1): magento/module-customer-graph-ql
Bundle README (what the ZIP ships)
# magento2-40858

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/40858
Issue: https://github.com/magento/magento2/issues/40847
Author: @aasim110
Source commit: d1f31fdef447812304b99513c97ae02a8c7b8f76
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.

Sources

Łukasz Bajsarowicz
Built by

Łukasz Bajsarowicz, e-commerce architect

Magento and Adobe Commerce architecture, upgrades, performance and audits for merchants and agencies since 2015; magento.watch is the tooling I use on those projects.

Open source, maintained on weekends.