Repository navigation
Conversation
Backport of https://delta.shopify.io/shop/world/pull/2441506 World merge commit: cdadff8120019d47669d34c1ea1663bac8714c08 Copied with `git diff --relative=areas/platforms/shopify-cli` and `git apply -3`, because the World commit has the zone path prefix. Conflicts resolved by hand in: services/app/env/show.ts, services/app/env/show.test.ts, services/app/env/pull.ts, services/app/env/pull.test.ts, services/bulk-operations/bulk-operation-status.ts, services/dev.ts, services/dev.test.ts, services/generate/shop-import/declarative-definitions.ts, services/generate/shop-import/declarative-definitions.test.ts.
dmerand
force-pushed
the
dmerand/4.9-app-client-secret
branch
2 times, most recently
from
November 16, 2026 20:09
7803694 to
1299860
Compare
Backport of https://delta.shopify.io/shop/world/pull/2457769 World commit: 6e56e2decdd1f65410dc6bbe6665da5b6ddab94b
dmerand
force-pushed
the
dmerand/4.9-app-client-secret
branch
from
November 16, 2026 20:29
1299860 to
cdc2491
Compare
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
WHY are these changes introduced?
Backports the app client secret fix from World
maintostable/4.9, for release 4.9.6.App Management will stop returning app client secrets to restricted automation tokens (https://delta.shopify.io/shop/world/pull/2441828, behind a flag that is still off). With this change, app lookups (deploy, release, versions) no longer request the secret. Commands that need it explain clearly when they don't get it. Users who can't move to 5.x get the same behaviour.
Please merge without squashing. Each commit maps to one World PR.
WHAT is this pull request doing?
Each commit is a copy of a World diff with the
areas/platforms/shopify-cli/prefix removed (git diff <base> <commit> --relative=areas/platforms/shopify-cli, thengit apply -3).cherry-pick -xcan't cross the zone prefix.cdadff8120(merge)6e56e2decd(draft, not merged yet)On 4.9, conflicts were resolved by hand in 9 files, without bringing over refactors from
main:services/app/env/show.ts,pull.tsand their tests: 4.9's text output is kept. A missing secret printsSHOPIFY_API_SECRET=and warns.env pullkeeps an existing.envsecret.services/bulk-operations/bulk-operation-status.ts: both 4.9 call sites useappClientSecret.services/dev.ts,dev.test.tsand the shop-import files: only import conflicts. The dev-instance tests are left out, because 4.9 doesn't have that feature.commands/app/env/show.test.tsis left out. It tests the JSON env output frommain, which 4.9 doesn't have.The changeset from 2441506 is already
patch.SHOPIFY_CLI_APP_CLIENT_SECRETis not included; it ships only in the next minor.Known CI failures (not from this change)
Resource not accessible by integration. The repository's default workflow token is now read-only.maingot per-workflow permissions in a1d9b74, and the stable branches don't have that commit yet. The type diff itself passes; only its PR comment step fails. Craig owns the backport of a1d9b74.business-platform-organizations/generated/types.d.ts, which this PR doesn't touch (schema drift since the last stable run).app devnow needs thewrite_app_proxyscope for the e2e apps (a server-side change). The same failure shows on both stable lines.How to manually test your changes?
SHOPIFY_CLI_PARTNERS_TOKENset, runpnpm shopify app deploy --verbose. No request selectsclientCredentials.pnpm shopify app execute --query '{ shop { name } }'. It sendsAppClientCredentialsand succeeds while the server flag is off.pnpm shopify app env pullon a.envfile that has a secret. The secret is kept.Post-release steps
Release 4.9.6 before 5.0.2. This branch's release job runs
pnpm release latest, so publishing 4.9.6 moves npmlatestoff 5.0.1. Publish 5.0.2 (thestable/5.0backport) right after it. If 5.0.2 is delayed, movelatestback to 5.0.1 by hand. Skip the Homebrew, Observe and notification steps for 4.9.6.Checklist
patchchangeset included from the original PR