Skip to content
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

Jump to bottom

Fix duplicated slashes when deploying webhooks with relative URIs #4357

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Fix duplicated slashes when deploying webhooks with relative URIs #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc9816d
Avoid duplicated slash in webhook URIs
gonzaloriestra Aug 21, 2024
97aade1
Add changeset
gonzaloriestra Aug 21, 2024
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
5 changes: 5 additions & 0 deletions .changeset/shy-falcons-unite.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/app': patch
---

Remove duplicated slashes when deploying webhooks with relative URIs
2 changes: 1 addition & 1 deletion ...ages/app/src/cli/models/extensions/specifications/app_config_webhook_subscription.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('webhook_subscription', () => {
const webhookSpec = spec

const result = webhookSpec.transformLocalToRemote!(object, {
application_url: 'https://my-app-url.com',
application_url: 'https://my-app-url.com/',
} as unknown as AppConfigurationWithoutPath)

expect(result).toEqual({
Expand Down
5 changes: 4 additions & 1 deletion packages/app/src/cli/models/extensions/specifications/app_config_webhook_subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ const WebhookSubscriptionTransformConfig: CustomTransformationConfig = {
}
return {
...webhookConfig,
uri: appUrl && webhookConfig.uri.startsWith('/') ? `${appUrl}${webhookConfig.uri}` : webhookConfig.uri,
uri:
appUrl && webhookConfig.uri.startsWith('/')
? `${removeTrailingSlash(appUrl)}${webhookConfig.uri}`
: webhookConfig.uri,
}
},
reverse: transformToWebhookSubscriptionConfig,
Expand Down
3 changes: 2 additions & 1 deletion packages/app/src/cli/services/context/breakdown-extensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import {ExtensionSpecification} from '../../models/extensions/specification.js'
import {rewriteConfiguration} from '../app/write-app-configuration-file.js'
import {AppConfigurationUsedByCli} from '../../models/extensions/specifications/types/app_config.js'
import {removeTrailingSlash} from '../../models/extensions/specifications/validation/common.js'
import {deepCompare, deepDifference} from '@shopify/cli-kit/common/object'
import {encodeToml} from '@shopify/cli-kit/node/toml'
import {zod} from '@shopify/cli-kit/node/schema'
Expand Down Expand Up @@ -175,7 +176,7 @@ async function resolveRemoteConfigExtensionIdentifiersBreakdown(
if (baselineConfig?.webhooks?.subscriptions?.length) {
baselineConfig.webhooks.subscriptions = baselineConfig.webhooks.subscriptions.map((subscription) => {
if (subscription.uri.startsWith('/')) {
subscription.uri = `${baselineConfig.application_url}${subscription.uri}`
subscription.uri = `${removeTrailingSlash(baselineConfig.application_url)}${subscription.uri}`
}
return subscription
})
Expand Down
Loading