@@ -58,6 +58,12 @@ const windowSender = { mainFrame, getType: () => 'window' };
5858const mainFrameEvent = { sender : windowSender , senderFrame : mainFrame } as unknown as Electron . IpcMainInvokeEvent ;
5959const subframeEvent = { sender : windowSender , senderFrame : { } } as unknown as Electron . IpcMainInvokeEvent ;
6060
61+ function getAppListener < T extends ( ...args : never [ ] ) => void > ( event : string ) : T | undefined {
62+ return ( vi . mocked ( app . on ) . mock . calls as unknown as Array < [ string , T ] > ) . find (
63+ ( [ registered ] ) => registered === event ,
64+ ) ?. [ 1 ] ;
65+ }
66+
6167describe ( 'createClerkBridge' , ( ) => {
6268 const missingStorage = { } as Parameters < typeof createClerkBridge > [ 0 ] ;
6369 const storage : TokenStorage = {
@@ -145,7 +151,6 @@ describe('createClerkBridge', () => {
145151 host : 'renderer' ,
146152 scheme : 'my-app' ,
147153 privileges : {
148- allowExtensions : true ,
149154 allowServiceWorkers : true ,
150155 bypassCSP : true ,
151156 codeCache : true ,
@@ -157,7 +162,6 @@ describe('createClerkBridge', () => {
157162 {
158163 scheme : 'my-app' ,
159164 privileges : {
160- allowExtensions : true ,
161165 allowServiceWorkers : true ,
162166 bypassCSP : true ,
163167 codeCache : true ,
@@ -590,12 +594,9 @@ describe('createClerkBridge', () => {
590594 return channel === OAUTH_TRANSPORT_CHANNELS . open ;
591595 } ) ?. [ 1 ] ;
592596 const openPromise = openHandler ?.( mainFrameEvent , 'https://accounts.example.com/oauth' ) ;
593- const openUrlListener = vi . mocked ( app . on ) . mock . calls . find ( ( [ event ] ) => event === 'open-url' ) ?. [ 1 ] as (
594- event : Electron . Event ,
595- url : string ,
596- ) => void ;
597+ const openUrlListener = getAppListener < ( event : Electron . Event , url : string ) => void > ( 'open-url' ) ;
597598
598- openUrlListener ( { preventDefault : vi . fn ( ) } as unknown as Electron . Event , 'my-app://renderer/?code=123' ) ;
599+ openUrlListener ?. ( { preventDefault : vi . fn ( ) } as unknown as Electron . Event , 'my-app://renderer/?code=123' ) ;
599600
600601 await expect ( openPromise ) . resolves . toEqual ( { callbackUrl : 'my-app://renderer/?code=123' } ) ;
601602 expect ( shell . openExternal ) . toHaveBeenCalledWith ( 'https://accounts.example.com/oauth' ) ;
@@ -615,12 +616,9 @@ describe('createClerkBridge', () => {
615616 return channel === OAUTH_TRANSPORT_CHANNELS . open ;
616617 } ) ?. [ 1 ] ;
617618 const openPromise = openHandler ?.( mainFrameEvent , 'https://accounts.example.com/oauth' ) ;
618- const secondInstanceListener = vi . mocked ( app . on ) . mock . calls . find ( ( [ event ] ) => event === 'second-instance' ) ?. [ 1 ] as (
619- event : Electron . Event ,
620- argv : string [ ] ,
621- ) => void ;
619+ const secondInstanceListener = getAppListener < ( event : Electron . Event , argv : string [ ] ) => void > ( 'second-instance' ) ;
622620
623- secondInstanceListener ( { } as Electron . Event , [
621+ secondInstanceListener ?. ( { } as Electron . Event , [
624622 '/opt/MyApp/my-app' ,
625623 '--enable-features=UseOzonePlatform' ,
626624 'my-app://renderer/?code=123' ,
@@ -647,12 +645,9 @@ describe('createClerkBridge', () => {
647645 return channel === OAUTH_TRANSPORT_CHANNELS . open ;
648646 } ) ?. [ 1 ] ;
649647 const openPromise = openHandler ?.( mainFrameEvent , 'https://accounts.example.com/oauth' ) ;
650- const secondInstanceListener = vi . mocked ( app . on ) . mock . calls . find ( ( [ event ] ) => event === 'second-instance' ) ?. [ 1 ] as (
651- event : Electron . Event ,
652- argv : string [ ] ,
653- ) => void ;
648+ const secondInstanceListener = getAppListener < ( event : Electron . Event , argv : string [ ] ) => void > ( 'second-instance' ) ;
654649
655- secondInstanceListener ( { } as Electron . Event , [ '/opt/MyApp/my-app' , 'my-app://renderer/?code=123' ] ) ;
650+ secondInstanceListener ?. ( { } as Electron . Event , [ '/opt/MyApp/my-app' , 'my-app://renderer/?code=123' ] ) ;
656651
657652 await expect ( openPromise ) . resolves . toEqual ( { callbackUrl : 'my-app://renderer/?code=123' } ) ;
658653 expect ( rendererWindow . restore ) . toHaveBeenCalledOnce ( ) ;
@@ -676,13 +671,10 @@ describe('createClerkBridge', () => {
676671 return channel === OAUTH_TRANSPORT_CHANNELS . open ;
677672 } ) ?. [ 1 ] ;
678673 const openPromise = openHandler ?.( mainFrameEvent , 'https://accounts.example.com/oauth' ) ;
679- const secondInstanceListener = vi . mocked ( app . on ) . mock . calls . find ( ( [ event ] ) => event === 'second-instance' ) ?. [ 1 ] as (
680- event : Electron . Event ,
681- argv : string [ ] ,
682- ) => void ;
674+ const secondInstanceListener = getAppListener < ( event : Electron . Event , argv : string [ ] ) => void > ( 'second-instance' ) ;
683675
684676 rendererWindow . isDestroyed . mockReturnValue ( true ) ;
685- secondInstanceListener ( { } as Electron . Event , [ '/opt/MyApp/my-app' , 'my-app://renderer/?code=123' ] ) ;
677+ secondInstanceListener ?. ( { } as Electron . Event , [ '/opt/MyApp/my-app' , 'my-app://renderer/?code=123' ] ) ;
686678
687679 await expect ( openPromise ) . resolves . toEqual ( { callbackUrl : 'my-app://renderer/?code=123' } ) ;
688680 expect ( rendererWindow . focus ) . not . toHaveBeenCalled ( ) ;
0 commit comments