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
32 changes: 23 additions & 9 deletions packages/wallet/src/W3mFrame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,16 @@ export class W3mFrame {
if (!shouldHandleEvent(W3mFrameConstants.FRAME_EVENT_KEY, data)) {
return
}
const frameEvent = W3mFrameSchema.frameEvent.parse(data)
if (frameEvent.id === id) {
callback(frameEvent)
const frameEvent = W3mFrameSchema.frameEvent.safeParse(data)

if (!frameEvent.success) {
console.warn('W3mFrame: invalid frame event', frameEvent.error.message)

return
}

if (frameEvent.data?.id === id) {
callback(frameEvent.data)
window.removeEventListener('message', eventHandler)
}
}
Expand All @@ -191,8 +198,12 @@ export class W3mFrame {
return
}

const frameEvent = W3mFrameSchema.frameEvent.parse(data)
callback(frameEvent)
const frameEvent = W3mFrameSchema.frameEvent.safeParse(data)
if (frameEvent.success) {
callback(frameEvent.data)
} else {
console.warn('W3mFrame: invalid frame event', frameEvent.error.message)
}
})
}
},
Expand All @@ -203,8 +214,13 @@ export class W3mFrame {
if (!shouldHandleEvent(W3mFrameConstants.APP_EVENT_KEY, data)) {
return
}
const appEvent = W3mFrameSchema.appEvent.parse(data)
callback(appEvent)
const appEvent = W3mFrameSchema.appEvent.safeParse(data)
// Frame side, if the event is invalid, we allow it to go through anyways
if (!appEvent.success) {
console.warn('W3mFrame: invalid app event', appEvent.error.message)
}

callback(data as W3mFrameTypes.AppEvent)
})
}
},
Expand All @@ -214,7 +230,6 @@ export class W3mFrame {
if (!this.iframe?.contentWindow) {
throw new Error('W3mFrame: iframe is not set')
}
W3mFrameSchema.appEvent.parse(event)
this.iframe.contentWindow.postMessage(event, '*')
}
},
Expand All @@ -224,7 +239,6 @@ export class W3mFrame {
if (!parent) {
throw new Error('W3mFrame: parent is not set')
}
W3mFrameSchema.frameEvent.parse(event)
parent.postMessage(event, '*')
}
}
Expand Down
23 changes: 23 additions & 0 deletions packages/wallet/tests/W3mFrame.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,29 @@ describe('W3mFrame', () => {
)
})

it('should not throw error when posting app event with invalid event', () => {
w3mFrame = new W3mFrame({ projectId: PROJECT_ID })

// Mock iframe and its contentWindow
w3mFrame['iframe'] = {
contentWindow: {
postMessage: vi.fn()
}
} as any

const testEvent = {
id: 'test-id',
type: W3mFrameConstants.APP_CONNECT_SOCIAL
}

w3mFrame.events.postAppEvent(testEvent as any)

expect(w3mFrame['iframe']?.contentWindow?.postMessage).toHaveBeenCalledWith(
expect.objectContaining(testEvent),
'*'
)
})

it('should throw error when posting app event without iframe', () => {
w3mFrame = new W3mFrame({ projectId: PROJECT_ID, isAppClient: true })

Expand Down
Loading