Skip to content

feat(ios): support HTTPS callback URLs via ASWebAuthenticationSessionCallback (iOS 17.4+) #486

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
brian-ouellette-cb wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(ios): support HTTPS callback URLs via ASWebAuthenticationSessionCallback (iOS 17.4+) #486

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
40 changes: 29 additions & 11 deletions ios/RNInAppBrowser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,39 @@ + (BOOL)requiresMainQueueSetup
}
};

NSString *escapedRedirectURL = nil;
if (redirectURL) {
escapedRedirectURL = [[NSURL alloc] initWithString:redirectURL].scheme;
}
NSURL *redirectNSURL = redirectURL ? [[NSURL alloc] initWithString:redirectURL] : nil;
BOOL isHTTPSRedirect = redirectNSURL && [redirectNSURL.scheme isEqualToString:@"https"];
BOOL usedHTTPSCallback = NO;

if (@available(iOS 12.0, *)) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_17_4) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_17_4
if (isHTTPSRedirect && @available(iOS 17.4, *)) {
ASWebAuthenticationSessionCallback *httpsCallback =
[ASWebAuthenticationSessionCallback callbackWithHTTPSHost:redirectNSURL.host
path:redirectNSURL.path.length ? redirectNSURL.path : @"/"];
webAuthSession = [[ASWebAuthenticationSession alloc]
initWithURL:url
callbackURLScheme:escapedRedirectURL
completionHandler:completionHandler];
} else {
authSession = [[SFAuthenticationSession alloc]
initWithURL:url
callbackURLScheme:escapedRedirectURL
callback:httpsCallback
completionHandler:completionHandler];
usedHTTPSCallback = YES;
}
#endif
#pragma clang diagnostic pop

if (!usedHTTPSCallback) {
NSString *callbackScheme = redirectNSURL.scheme;
if (@available(iOS 12.0, *)) {
webAuthSession = [[ASWebAuthenticationSession alloc]
initWithURL:url
callbackURLScheme:callbackScheme
completionHandler:completionHandler];
} else {
authSession = [[SFAuthenticationSession alloc]
initWithURL:url
callbackURLScheme:callbackScheme
completionHandler:completionHandler];
}
}

#pragma clang diagnostic push
Expand Down