Skip to content
This repository was archived by the owner on Oct 30, 2025. It is now read-only.

[FIX] Completions not getting called #3

Merged
diegolmello merged 4 commits into from
Mar 30, 2022
Merged

[FIX] Completions not getting called #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb2f64
Fix read certificate from mmkv
diegolmello Mar 30, 2022
c33a921
Bump RN version
diegolmello Mar 30, 2022
b26d63f
Fix completions
diegolmello Mar 30, 2022
bfd3a94
Merge branch '0.64.2' into fix.mmkv-completions
diegolmello Mar 30, 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
9 changes: 4 additions & 5 deletions Libraries/Network/RCTHTTPRequestHandler.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,14 @@ -(void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticati
return;
}

NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
NSData *cryptKey = [key dataUsingEncoding:NSUTF8StringEncoding];
MMKV *mmkv = [MMKV mmkvWithID:@"default" cryptKey:cryptKey mode:MMKVMultiProcess];
clientSSL = [mmkv getStringForKey:host];
NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];

NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];

if (dict != (id)[NSNull null]) {
if ([clientSSL length] != 0) {
NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
NSString *path = [dict objectForKey:@"path"];
NSString *password = [dict objectForKey:@"password"];
credential = [self getUrlCredential:challenge path:path password:password];
Expand Down
14 changes: 6 additions & 8 deletions Libraries/WebSocket/RCTSRWebSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,14 +564,12 @@ - (void)_initializeStreams
NSData *cryptKey = [key dataUsingEncoding:NSUTF8StringEncoding];
MMKV *mmkv = [MMKV mmkvWithID:@"default" cryptKey:cryptKey mode:MMKVMultiProcess];
clientSSL = [mmkv getStringForKey:host];
NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];

if (dict != (id)[NSNull null]) {
NSString *path = [dict objectForKey:@"path"];
NSString *password = [dict objectForKey:@"password"];

[self setClientSSL:path password:password options:SSLOptions];
if ([clientSSL length] != 0) {
NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
NSString *path = [dict objectForKey:@"path"];
NSString *password = [dict objectForKey:@"password"];
[self setClientSSL:path password:password options:SSLOptions];
}

[_outputStream setProperty:SSLOptions
Expand Down