Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,28 @@ describe('getExtensionsPayloadStoreRawPayload()', () => {
expect(rawPayload.app.allowedDomains).toStrictEqual(['https://cdn.example.com'])
expect(rawPayload.app.assets).toBeUndefined()
})

test('defaults allowed_domains to empty array when admin has no allowed_domains configured', async () => {
// Given
vi.spyOn(payload, 'getUIExtensionPayload').mockResolvedValue({mock: 'ext'} as unknown as UIExtensionPayload)
const adminExt = createAdminExtension({})

const options = {
apiKey: 'api-key',
appName: 'my-app',
url: 'https://tunnel.example.com',
websocketURL: 'wss://tunnel.example.com',
extensions: [adminExt],
storeFqdn: 'store.myshopify.com',
manifestVersion: '3',
} as unknown as ExtensionsPayloadStoreOptions

// When
const rawPayload = await getExtensionsPayloadStoreRawPayload(options, 'bundle-path')

// Then
expect(rawPayload.app.allowedDomains).toStrictEqual([])
})
})

describe('ExtensionsPayloadStore()', () => {
Expand Down Expand Up @@ -522,7 +544,7 @@ describe('ExtensionsPayloadStore()', () => {
store.updateAdminConfigFromExtensionEvents([{extension: adminExt} as unknown as ExtensionEvent])

// Then
expect(store.getRawPayload().app.allowedDomains).toBeUndefined()
expect(store.getRawPayload().app.allowedDomains).toStrictEqual([])
})
Comment thread
melissaluu marked this conversation as resolved.

test('does nothing when no admin extension event is present', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface ExtensionsPayloadStoreOptions extends ExtensionDevOptions {
}

interface AdminConfig {
allowedDomains?: string[]
allowedDomains: string[]
staticRoot?: string
}

Expand All @@ -24,7 +24,7 @@ function getAdminConfig(extensions: ExtensionInstance[]): AdminConfig | undefine
if (!adminExtension) return undefined
const admin = (adminExtension.configuration as AdminConfigType).admin
return {
allowedDomains: admin?.allowed_domains,
allowedDomains: admin?.allowed_domains ?? [],
staticRoot: admin?.static_root,
}
Comment thread
melissaluu marked this conversation as resolved.
}
Expand Down
Loading