added error object

Author: pradeep1991singh

android/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,2 @@
-#Tue Jun 27 15:40:46 IST 2017
+#Sun Jul 02 00:45:13 IST 2017
 connection.project.dir=../../../android

android/src/main/java/com/reactlibrary/securekeystore/RNSecureKeyStoreModule.java

@@ -60,9 +60,12 @@ public void set(String alias, String input, Promise promise) {
         Calendar start = Calendar.getInstance();
         Calendar end = Calendar.getInstance();
         end.add(Calendar.YEAR, 1);
-        KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec.Builder(getContext()).setAlias(alias)
-            .setSubject(new X500Principal("CN=" + alias)).setSerialNumber(BigInteger.ONE).setStartDate(start.getTime())
-            .setEndDate(end.getTime()).build();
+        KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec.Builder(getContext())
+                                        .setAlias(alias)
+                                        .setSubject(new X500Principal("CN=" + alias))
+                                        .setSerialNumber(BigInteger.ONE)
+                                        .setStartDate(start.getTime())
+                                        .setEndDate(end.getTime()).build();
 
         KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA", getKeyStore());
         generator.initialize(spec);
@@ -94,7 +97,7 @@ public void set(String alias, String input, Promise promise) {
 
     } catch (Exception e) {
       Log.e(Constants.TAG, "Exception: " + e.getMessage());
-      promise.reject("Api-level:" + Build.VERSION.SDK_INT + "\nException: " + e.getMessage());
+      promise.reject("{\"code\":9,\"api-level\":" + Build.VERSION.SDK_INT + ",\"message\":" + e.getMessage() + "}");
     }
 
   }
@@ -111,7 +114,7 @@ public void get(String alias, Promise promise) {
       Cipher output = Cipher.getInstance(Constants.RSA_ALGORITHM);
       output.init(Cipher.DECRYPT_MODE, privateKey);
       CipherInputStream cipherInputStream = new CipherInputStream(
-          new ByteArrayInputStream(KeyStorage.readValues(getContext(), alias)), output);
+              new ByteArrayInputStream(KeyStorage.readValues(getContext(), alias)), output);
 
       ArrayList<Byte> values = new ArrayList<Byte>();
       int nextByte;
@@ -128,7 +131,7 @@ public void get(String alias, Promise promise) {
 
     } catch (Exception e) {
       Log.e(Constants.TAG, "Exception: " + e.getMessage());
-      promise.reject("Api-level:" + Build.VERSION.SDK_INT + "\nException: " + e.getMessage());
+      promise.reject("{\"code\":1,\"api-level\":" + Build.VERSION.SDK_INT + ",\"message\":" + e.getMessage() + "}");
     }
   }
 
@@ -141,7 +144,7 @@ public void remove(String alias, Promise promise) {
 
     } catch (Exception e) {
       Log.e(Constants.TAG, "Exception: " + e.getMessage());
-      promise.reject("Api-level:" + Build.VERSION.SDK_INT + "\nException: " + e.getMessage());
+      promise.reject("{\"code\":6,\"api-level\":" + Build.VERSION.SDK_INT + ",\"message\":" + e.getMessage() + "}");
     }
   }
 
@@ -163,4 +166,4 @@ private String getKeyStore() {
     }
   }
 
-}
+}

ios/RNSecureKeyStore.m

@@ -82,9 +82,13 @@ - (BOOL)updateKeychainValue:(NSString *)password forIdentifier:(NSString *)ident
     return NO;
 }
 
-- (void)deleteKeychainValue:(NSString *)identifier {
+- (BOOL)deleteKeychainValue:(NSString *)identifier {
     NSMutableDictionary *searchDictionary = [self newSearchDictionary:identifier];
-    SecItemDelete((CFDictionaryRef)searchDictionary);
+    OSStatus status = SecItemDelete((CFDictionaryRef)searchDictionary);
+    if (status == errSecSuccess) {
+        return YES;
+    }
+    return NO;
 }
 
 - (void)clearSecureKeyStore
@@ -111,7 +115,7 @@ - (void)handleAppUninstallation
 
 NSError * secureKeyStoreError(NSString *errMsg)
 {
-    NSError *error = [NSError errorWithDomain:serviceName code:200 userInfo:@{@"Error reason": errMsg}];
+    NSError *error = [NSError errorWithDomain:serviceName code:200 userInfo:@{@"reason": errMsg}];
     return error;
 }
 
@@ -129,12 +133,14 @@ - (void)handleAppUninstallation
             if (status) {
                 resolve(@"key updated successfully");
             } else {
-                reject(@"no_events", @"Not able to save key", secureKeyStoreError(@"Not able to save key"));
+                NSString* errorMessage = @"{\"message\":\"error saving key\"}";
+                reject(@"9", errorMessage, secureKeyStoreError(errorMessage));
             }
         }
     }
     @catch (NSException *exception) {
-        reject(@"no_events", @"Not able to save key", secureKeyStoreError(exception.reason));
+        NSString* errorMessage = [NSString stringWithFormat:@"{\"message\":\"error saving key, please try to un-install and re-install app again\",\"actual-error\":%@}", exception];
+        reject(@"9", errorMessage, secureKeyStoreError(errorMessage));
     }
 }
 
@@ -146,13 +152,15 @@ - (void)handleAppUninstallation
         [self handleAppUninstallation];
         NSString *value = [self searchKeychainCopyMatching:key];
         if (value == nil) {
-            reject(@"no_events", @"Not able to find key", secureKeyStoreError(@"Not able to find key"));
+            NSString* errorMessage = @"{\"message\":\"key does not present\"}";
+            reject(@"1", errorMessage, secureKeyStoreError(errorMessage));
         } else {
             resolve(value);
         }
     }
     @catch (NSException *exception) {
-        reject(@"no_events", @"Not able to find key", secureKeyStoreError(exception.reason));
+        NSString* errorMessage = [NSString stringWithFormat:@"{\"message\":\"key does not present\",\"actual-error\":%@}", exception];
+        reject(@"1", errorMessage, secureKeyStoreError(errorMessage));
     }
 }
 
@@ -161,11 +169,17 @@ - (void)handleAppUninstallation
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     @try {
-        [self deleteKeychainValue:key];
-        resolve(@"key removed successfully");
+        BOOL status = [self deleteKeychainValue:key];
+        if (status) {
+            resolve(@"key removed successfully");
+        } else {
+            NSString* errorMessage = @"{\"message\":\"could not delete key\"}";
+            reject(@"6", errorMessage, secureKeyStoreError(errorMessage));
+        }
     }
     @catch(NSException *exception) {
-        reject(@"no_events", @"Could not remove key from keychain", secureKeyStoreError(exception.reason));
+        NSString* errorMessage = [NSString stringWithFormat:@"{\"message\":\"could not delete key\",\"actual-error\":%@}", exception];
+        reject(@"6", errorMessage, secureKeyStoreError(errorMessage));
     }
 }