Commit8fcbf2c

authored

fix:Connect atoms not working inside iframe (#25418)

* fix: google connect broken for iframe* chore: add changesets* chore: update atoms exports* chore: update atoms exports

1 parenta050ccb commit8fcbf2cCopy full SHA for 8fcbf2c

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+---`
	`2`	`+"@calcom/atoms":patch`
	`3`	`+---`
	`4`	`+`
	`5`	+This PR fixes the issue of connect atoms not working inside iframes. It also updates the atoms exports to include the`useAvailableSlots` hook.

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export const useGetRedirectUrl = (`
`18`	`18`	`redir?:string,`
`19`	`19`	`isDryRun?:boolean`
`20`	`20`	`)=>{`
`21`		`-constredirectUrl=!!redir ?encodeURIComponent(redir) :"";`
	`21`	`+constredirectUrl=redir ?encodeURIComponent(redir) :"";`
`22`	`22`
`23`	`23`	`constauthUrl=useQuery({`
`24`	`24`	`queryKey:getQueryKey(calendar),`
`@@ -49,7 +49,15 @@ export const useConnect = (calendar: (typeof CALENDARS)[number], redir?: string,`
`49`	`49`	`constredirectUri=awaitrefetch();`
`50`	`50`
`51`	`51`	`if(redirectUri.data){`
`52`		`-window.location.href=redirectUri.data;`
	`52`	`+lettargetWindow;`
	`53`	`+if(window!==window.top&&window.top){`
	`54`	`+// if its an iframe, the target window should be the parent window`
	`55`	`+targetWindow=window.top;`
	`56`	`+}else{`
	`57`	`+targetWindow=window;`
	`58`	`+}`
	`59`	`+`
	`60`	`+targetWindow.location.href=redirectUri.data;`
`53`	`61`	`}`
`54`	`62`	`};`
`55`	`63`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,3 +48,5 @@ export { CreateSchedulePlatformWrapper as CreateSchedule } from "./create-schedu`
`48`	`48`	`export{CreateScheduleForm}from"./create-schedule/CreateScheduleForm";`
`49`	`49`
`50`	`50`	`export{ListSchedulesPlatformWrapperasListSchedules}from"./list-schedules/index";`
	`51`	`+`
	`52`	`+export{useAvailableSlots}from"./hooks/useAvailableSlots";`

Comments

(0)