status-im
/
react-native-keychain
mirror of https://github.com/status-im/react-native-keychain.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed lack of conversion of NSErrors.

This commit is contained in:
Joel Arvidsson 2015-05-28 19:08:18 +02:00
parent f8e0fc52de
commit 30217ff1b5
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
RNKeychainManager/RNKeychainManager.m
View File

@ -10,12 +10,18 @@
#import "RNKeychainManager.h"
#import "RCTConvert.h"
#import "RCTBridge.h"
#import "RCTUtils.h"
@implementation RNKeychainManager
@synthesize bridge = _bridge;
RCT_EXPORT_MODULE();
NSDictionary * makeError(NSError *error)
{
return RCTMakeAndLogError(error.localizedDescription, nil, [error dictionaryWithValuesForKeys:@[@"domain", @"code"]]);
}
RCT_EXPORT_METHOD(setInternetCredentialsForServer:(NSString*)server withUsername:(NSString*)username withPassword:(NSString*)password callback:(RCTResponseSenderBlock)callback){
// Create dictionary of search parameters
@ -30,10 +36,10 @@ RCT_EXPORT_METHOD(setInternetCredentialsForServer:(NSString*)server withUsername
// Try to save to keychain
osStatus = SecItemAdd((__bridge CFDictionaryRef) dict, NULL);
if (osStatus) {
if (osStatus != noErr) {
NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:osStatus userInfo:nil];
callback(@[error]);
return callback(@[makeError(error)]);
}
callback(@[[NSNull null]]);
@ -57,9 +63,9 @@ RCT_EXPORT_METHOD(getInternetCredentialsForServer:(NSString*)server callback:(RC
NSString* username = (NSString*) [found objectForKey:(__bridge id)(kSecAttrAccount)];
NSString* password = [[NSString alloc] initWithData:[found objectForKey:(__bridge id)(kSecValueData)] encoding:NSUTF8StringEncoding];
if (osStatus) {
if (osStatus != noErr) {
NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:osStatus userInfo:nil];
callback(@[error]);
return callback(@[makeError(error)]);
}
callback(@[[NSNull null], username, password]);
@ -73,9 +79,9 @@ RCT_EXPORT_METHOD(resetInternetCredentialsForServer:(NSString*)server callback:(
// Remove any old values from the keychain
OSStatus osStatus = SecItemDelete((__bridge CFDictionaryRef) dict);
if (osStatus) {
if (osStatus != noErr) {
NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:osStatus userInfo:nil];
callback(@[error]);
return callback(@[makeError(error)]);
}
callback(@[[NSNull null]]);