@@ -370,7 +370,12 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
370
370
}];
371
371
372
372
UIViewController *presentingViewController = appDelegate.window .rootViewController .view .window ? appDelegate.window .rootViewController : appDelegate.window .rootViewController .presentedViewController ;
373
+
374
+ #if TARGET_OS_MACCATALYST
375
+ id <OIDExternalUserAgent> externalUserAgent = nil ;
376
+ #elif TARGET_OS_IOS
373
377
id <OIDExternalUserAgent> externalUserAgent = iosCustomBrowser != nil ? [self getCustomBrowser: iosCustomBrowser] : nil ;
378
+ #endif
374
379
375
380
OIDAuthorizationCallback callback = ^(OIDAuthorizationResponse *_Nullable authorizationResponse, NSError *_Nullable error) {
376
381
typeof (self) strongSelf = weakSelf;
@@ -504,10 +509,14 @@ - (void)endSessionWithConfiguration: (OIDServiceConfiguration *) configuration
504
509
}];
505
510
506
511
UIViewController *presentingViewController = appDelegate.window .rootViewController .view .window ? appDelegate.window .rootViewController : appDelegate.window .rootViewController .presentedViewController ;
507
-
508
- id <OIDExternalUserAgent> externalUserAgent = iosCustomBrowser != nil ? [self getCustomBrowser: iosCustomBrowser] : [self getExternalUserAgentWithPresentingViewController: presentingViewController
509
- prefersEphemeralSession: prefersEphemeralSession];
510
512
513
+ #if TARGET_OS_MACCATALYST
514
+ id <OIDExternalUserAgent> externalUserAgent = nil ;
515
+ #elif TARGET_OS_IOS
516
+ id <OIDExternalUserAgent> externalUserAgent = iosCustomBrowser != nil ? [self getCustomBrowser: iosCustomBrowser] : [self getExternalUserAgentWithPresentingViewController: presentingViewController
517
+ prefersEphemeralSession: prefersEphemeralSession];
518
+ #endif
519
+
511
520
_currentSession = [OIDAuthorizationService presentEndSessionRequest: endSessionRequest
512
521
externalUserAgent: externalUserAgent
513
522
callback: ^(OIDEndSessionResponse *_Nullable response, NSError *_Nullable error) {
@@ -681,6 +690,7 @@ - (NSString*)getErrorCode: (NSError*) error defaultCode: (NSString *) defaultCod
681
690
return defaultCode;
682
691
}
683
692
693
+ #if !TARGET_OS_MACCATALYST
684
694
- (id <OIDExternalUserAgent>)getCustomBrowser : (NSString *) browserType {
685
695
typedef id <OIDExternalUserAgent> (^BrowserBlock)(void );
686
696
@@ -705,6 +715,7 @@ - (NSString*)getErrorCode: (NSError*) error defaultCode: (NSString *) defaultCod
705
715
BrowserBlock browser = browsers[browserType];
706
716
return browser ();
707
717
}
718
+ #endif
708
719
709
720
- (NSString *)getErrorMessage : (NSError *) error {
710
721
NSDictionary * userInfo = [error userInfo ];
0 commit comments