Update parameters names to be consistent with implementation

#24

Author: tectiv3

.prettierrc.js

@@ -9,13 +9,4 @@ module.exports = {
     jsxBracketSameLine: false,
     arrowParens: 'avoid',
     proseWrap: 'never',
-    overrides: [
-        {
-            files: '*.vue',
-            options: {
-                printWidth: 100,
-            },
-            parser: 'vue',
-        },
-    ],
 }

README.md

@@ -66,9 +66,9 @@ var Aes = NativeModules.Aes
 
 const generateKey = (password, salt, cost, length) => Aes.pbkdf2(password, salt, cost, length)
 
-const encrypt = (text, keyBase64) => {
+const encrypt = (text, key) => {
     return Aes.randomKey(32).then(iv => {
-        return Aes.encrypt(text, keyBase64, iv).then(cipher => ({
+        return Aes.encrypt(text, key, iv).then(cipher => ({
             cipher,
             iv,
         }))

android/src/main/java/com/tectiv3/aes/RCTAes.java

@@ -44,7 +44,6 @@ public class RCTAes extends ReactContextBaseJavaModule {
     private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS7Padding";
     public static final String HMAC_SHA_256 = "HmacSHA256";
     private static final String KEY_ALGORITHM = "AES";
-    private static final String SECRET_KEY_ALGORITHM = "PBEWithSHA256And256BitAES-CBC-BC";
 
     public RCTAes(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -56,9 +55,9 @@ public String getName() {
     }
 
     @ReactMethod
-    public void encrypt(String data, String keyBase64, String ivBase64, Promise promise) {
+    public void encrypt(String data, String key, String iv, Promise promise) {
         try {
-            String result = encrypt(data, keyBase64, ivBase64);
+            String result = encrypt(data, key, iv);
             promise.resolve(result);
         } catch (Exception e) {
             promise.reject("-1", e.getMessage());

index.d.ts

@@ -1,8 +1,9 @@
 declare module '@tectiv3/react-native-aes-crypto' {
-    function pbkdf2(password: string, salt: string): Promise<string>;
+    function pbkdf2(password: string, salt: string, cost: number, length: number): Promise<string>;
     function encrypt(text: string, key: string, iv: string): Promise<string>;
     function decrypt(ciphertext: string, key: string, iv: string): Promise<string>;
     function hmac256(ciphertext: string, key: string): Promise<string>;
+    function randomKey(length: number): Promise<string>;
     function sha1(text: string): Promise<string>;
     function sha256(text: string): Promise<string>;
     function sha512(text: string): Promise<string>;

ios/RCTAes.xcodeproj/project.pbxproj

@@ -105,7 +105,7 @@
 		32D980D51BE9F11C00FA27E5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = tectiv3;
 				TargetAttributes = {
 					32D980DC1BE9F11C00FA27E5 = {
@@ -115,10 +115,11 @@
 			};
 			buildConfigurationList = 32D980D81BE9F11C00FA27E5 /* Build configuration list for PBXProject "RCTAes" */;
 			compatibilityVersion = "Xcode 8.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 32D980D41BE9F11C00FA27E5;
 			productRefGroup = 32D980DE1BE9F11C00FA27E5 /* Products */;
@@ -147,6 +148,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -200,6 +202,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-aes-crypto",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "description": "AES crypto native module for react-native",
     "main": "index.js",
     "types": "index.d.ts",

react-native-aes.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'react-native-aes'
-  s.version       = '1.3.2'
+  s.version       = '1.3.5'
   s.summary       = 'Native module for AES encryption'
   s.author        = "tectiv3"
   s.license       = 'MIT'