Skip to content
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

Jump to bottom

expose authentication challenge callback to support iOS WKWebView #12

Merged
merged 5 commits into from
Jan 17, 2022
Merged

expose authentication challenge callback to support iOS WKWebView #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43594a7
expose didReceiveAuthenticationChallenge callback from plugin
brodycj Dec 21, 2021
3d389f3
FIX-UP: [should] fix functionality with cordova-ios pre-6.x with UIWe…
brodycj Dec 21, 2021
a2a6ebd
expose static method - [should] be able to help support another plugi…
brodycj Dec 21, 2021
cbc1de7
remove extra comments & logging
brodycj Jan 17, 2022
53161a7
add & update some comments
brodycj Jan 17, 2022
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
2 changes: 2 additions & 0 deletions src/ios/ClientCertificate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
- (void)registerAuthenticationCertificate:(CDVInvokedUrlCommand*)command;
- (void)validateSslChain:(CDVInvokedUrlCommand*)command;

+ (void) didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler withOptionsNullable:(NSObject *) options;

+ (void)registerCertificateFromPath:(NSString*)path withPassword:(NSString*)password;

@end
20 changes: 18 additions & 2 deletions src/ios/ClientCertificate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,23 @@ - (BOOL)customHTTPProtocol:(CustomHTTPProtocol *)protocol canAuthenticateAgainst

- (void)customHTTPProtocol:(CustomHTTPProtocol *)protocol didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
// support cordova-ios pre-6.x with UIWebView
[ClientCertificate didReceiveAuthenticationChallenge:challenge completionHandler:^(NSURLSessionAuthChallengeDisposition _, NSURLCredential * credential){
[protocol resolveAuthenticationChallenge:challenge withCredential:credential];
} withOptionsNullable:nil];
}

- (void) didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler
{
// works with cordova-ios & WKWebView with update proposed in:
// - https://github.com/apache/cordova-ios/pull/1212
// - https://github.com/brodybits/cordova-ios/tree/auth-challenge-callback-support
[ClientCertificate didReceiveAuthenticationChallenge:challenge completionHandler:completionHandler withOptionsNullable:nil];
}

+ (void) didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler withOptionsNullable:(NSObject *) _optionsIgnored
{
// now exposed as a static method usable by @brodybits/cordova-plugin-ios-xhr
if([challenge previousFailureCount] == 0) {

NSURLCredential *credential = nil;
Expand Down Expand Up @@ -160,8 +177,7 @@ - (void)customHTTPProtocol:(CustomHTTPProtocol *)protocol didReceiveAuthenticati

}

[protocol resolveAuthenticationChallenge:challenge withCredential:credential];

completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
}
}

Expand Down