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

Fixes broken error handling (#22)

This commit is contained in:
Vojtech Novak 2016-06-02 11:54:39 +02:00 committed by Joel Arvidsson
parent 008ee03b76
commit 60455e88ce
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
index.js
View File

@ -20,9 +20,10 @@ var Keychain = {
): Promise { ): Promise {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
RNKeychainManager.setInternetCredentialsForServer(server, username, password, function(err) { RNKeychainManager.setInternetCredentialsForServer(server, username, password, function(err) {
callback && callback((err && convertError(err)) || null); err = convertError(err);
callback && callback(err || null);
if (err) { if (err) {
reject(convertError(err)); reject(err);
} else { } else {
resolve(); resolve();
} }
@ -45,9 +46,9 @@ var Keychain = {
if(!err && arguments.length === 1) { if(!err && arguments.length === 1) {
err = new Error('No keychain entry found for server "' + server + '"'); err = new Error('No keychain entry found for server "' + server + '"');
} }
callback && callback((err && convertError(err)) || null, username, password); callback && callback(err || null, username, password);
if (err) { if (err) {
reject(convertError(err)); reject(err);
} else { } else {
resolve({ username, password }); resolve({ username, password });
} }
@ -66,9 +67,10 @@ var Keychain = {
): Promise { ): Promise {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
RNKeychainManager.resetInternetCredentialsForServer(server, function(err) { RNKeychainManager.resetInternetCredentialsForServer(server, function(err) {
callback && callback((err && convertError(err)) || null); err = convertError(err);
callback && callback(err || null);
if (err) { if (err) {
reject(convertError(err)); reject(err);
} else { } else {
resolve(); resolve();
} }
@ -89,9 +91,10 @@ var Keychain = {
): Promise { ): Promise {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
RNKeychainManager.setGenericPasswordForService(service, username, password, function(err) { RNKeychainManager.setGenericPasswordForService(service, username, password, function(err) {
callback && callback((err && convertError(err)) || null); err = convertError(err);
callback && callback(err || null);
if (err) { if (err) {
reject(convertError(err)); reject(err);
} else { } else {
resolve(); resolve();
} }
@ -115,9 +118,9 @@ var Keychain = {
if(!err && arguments.length === 1) { if(!err && arguments.length === 1) {
err = new Error('No keychain entry found' + (service ? ' for service "' + service + '"' : '')); err = new Error('No keychain entry found' + (service ? ' for service "' + service + '"' : ''));
} }
callback && callback((err && convertError(err)) || null, username, password); callback && callback(err || null, username, password);
if (err) { if (err) {
reject(convertError(err)); reject(err);
} else { } else {
resolve({ username, password }); resolve({ username, password });
} }
@ -136,9 +139,10 @@ var Keychain = {
): Promise { ): Promise {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
RNKeychainManager.resetGenericPasswordForService(service, function(err) { RNKeychainManager.resetGenericPasswordForService(service, function(err) {
callback && callback((err && convertError(err)) || null); err = convertError(err);
callback && callback(err || null);
if (err) { if (err) {
reject(convertError(err)); reject(err);
} else { } else {
resolve(); resolve();
} }
@ -149,15 +153,15 @@ var Keychain = {
}; };
function convertError(err) { function convertError(err) {
if (Platform.OS === 'android') {
return new Error(err);
}
if (!err) { if (!err) {
return null; return null;
} }
if (Platform.OS === 'android') {
return new Error(err);
}
var out = new Error(err.message); var out = new Error(err.message);
out.key = err.key; out.key = err.key;
return out; return out;
} }
module.exports = Keychain; module.exports = Keychain;