Skip to content

fix: support scene based lifecycle for ios 27 #1148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Francesco-Voto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support scene based lifecycle for ios 27 #1148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 33 additions & 2 deletions packages/react-native-app-auth/ios/RNAppAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,37 @@ -(BOOL)resumeExternalUserAgentFlowWithURL:(NSURL *)url {
return [_currentSession resumeExternalUserAgentFlowWithURL:url];
}

-(UIViewController *)topmostPresentedViewControllerFromRootViewController:(UIViewController *)rootViewController {
UIViewController *topViewController = rootViewController;
while (topViewController.presentedViewController) {
topViewController = topViewController.presentedViewController;
}
return topViewController;
}

-(UIWindow *)keyWindowFromConnectedScenes {
UIWindow *fallbackKeyWindow = nil;
for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
if (![scene isKindOfClass:[UIWindowScene class]]) {
continue;
}
UIWindowScene *windowScene = (UIWindowScene *)scene;
UIWindow *keyWindow = windowScene.keyWindow;
if (!keyWindow) {
continue;
}
if (windowScene.activationState == UISceneActivationStateForegroundActive) {
[keyWindow layoutIfNeeded];
return keyWindow;
}
if (!fallbackKeyWindow) {
fallbackKeyWindow = keyWindow;
}
}
[fallbackKeyWindow layoutIfNeeded];
return fallbackKeyWindow;
}

- (dispatch_queue_t)methodQueue
{
return dispatch_get_main_queue();
Expand Down Expand Up @@ -374,7 +405,7 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
rnAppAuthTaskId = UIBackgroundTaskInvalid;
}];

UIViewController *presentingViewController = appDelegate.window.rootViewController.view.window ? appDelegate.window.rootViewController : appDelegate.window.rootViewController.presentedViewController;
UIViewController *presentingViewController = [self topmostPresentedViewControllerFromRootViewController:[self keyWindowFromConnectedScenes].rootViewController];

#if TARGET_OS_MACCATALYST
id<OIDExternalUserAgent> externalUserAgent = nil;
Expand Down Expand Up @@ -520,7 +551,7 @@ - (void)endSessionWithConfiguration: (OIDServiceConfiguration *) configuration
rnAppAuthTaskId = UIBackgroundTaskInvalid;
}];

UIViewController *presentingViewController = appDelegate.window.rootViewController.view.window ? appDelegate.window.rootViewController : appDelegate.window.rootViewController.presentedViewController;
UIViewController *presentingViewController = [self topmostPresentedViewControllerFromRootViewController:[self keyWindowFromConnectedScenes].rootViewController];

#if TARGET_OS_MACCATALYST
id<OIDExternalUserAgent> externalUserAgent = nil;
Expand Down
Loading