@functionland/react-native-fula 1.54.8 → 1.54.10

package/ios/Cryptography.swift

@@ -1,49 +1,59 @@
 import Foundation
-import CommonCrypto
 import CryptoSwift
 import os.log
 
-
-
-public class Cryptography: NSObject {
-    public static func encryptMsg(_ message: Array<UInt8>, _ secretKey: Array<UInt8>)
-    throws -> String {
-        OSLog.viewCycle.info("ReactNative encryptMsg started for \(message)")
-        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
-        OSLog.viewCycle.info("ReactNative encryptMsg aes")
-        let encrypted = try! aes.encrypt(message)
-        OSLog.viewCycle.info("ReactNative encryptMsg encrypted")
-        do{
-            let data = Data(encrypted).base64EncodedString()
-            OSLog.viewCycle.info("ReactNative encryptMsg: \(data)")
-            return data
-        } catch let error {
-            OSLog.viewCycle.info("ReactNative encryptMsg error: \(error.localizedDescription)")
-            throw error
+public class Cryptography {
+    // AES/GCM Encryption with IV handling
+    public static func encryptMsg(_ message: [UInt8], _ secretKey: [UInt8], _ providedIv: [UInt8]? = nil) throws -> String {
+        var iv = providedIv ?? [UInt8](repeating: 0, count: 12) // Default IV value
+        if iv.isEmpty {
+            iv = AES.randomIV(12) // Generate a random IV if not provided or if empty
         }
+        
+        let gcm = GCM(iv: iv, mode: .combined)
+        let aes = try AES(key: secretKey, blockMode: gcm, padding: .noPadding)
+        
+        let encrypted = try aes.encrypt(message)
+        let encryptedDataWithIv = Data(iv + encrypted) // Prepend IV to the encrypted data
+        return encryptedDataWithIv.base64EncodedString()
     }
     
-    public static func decryptMsg(_ cipherText: String, _ secretKey: Array<UInt8>)
-    throws -> Array<UInt8> {
-        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
-        let data =  cipherText.fromBase64()!
-        return try! aes.decrypt(data.bytes)
-
+    // AES/GCM Decryption with IV extracted from the beginning of the cipherText
+    public static func decryptMsg(_ cipherText: String, _ secretKey: [UInt8]) throws -> [UInt8] {
+        guard let encryptedDataWithIv = Data(base64Encoded: cipherText) else {
+            throw NSError(domain: "DecryptionError", code: -1, userInfo: nil)
+        }
+        let iv = Array(encryptedDataWithIv.prefix(12)) // Extract IV (first 12 bytes)
+        let encryptedData = Array(encryptedDataWithIv.dropFirst(12)) // The rest is the encrypted data
+        
+        let gcm = GCM(iv: iv, mode: .combined)
+        let aes = try AES(key: secretKey, blockMode: gcm, padding: .noPadding)
+        
+        let decrypted = try aes.decrypt(encryptedData)
+        return decrypted
     }
     
-    public static func generateKey(_ salt: Data)
-    throws -> Array<UInt8> {
-        let password: [UInt8] = Array("".utf8)
-        let salt: [UInt8] = salt.bytes
-
-        //TODO: Generate a key from a salt and an empty password
-        let key = try PKCS5.PBKDF2(
-            password: password,
-            salt: salt,
-            iterations: 4096,
-            keyLength: 16, /* AES-128 */
-            variant: .sha2(SHA2.Variant.sha256)
-        ).calculate()
-        return key
+    // Key Generation matching Java's logic
+    public static func generateKey(_ identity: Data) throws -> Data {
+        // Transform identity to base64 string to mimic Java's behavior
+        let passwordString = identity.base64EncodedString()
+        let passwordData = Array(passwordString.utf8) // Convert to byte array
+        
+        // Use identity itself as salt for simplicity to mimic Java behavior
+        let salt = Array(identity)
+        
+        do {
+            let key = try PKCS5.PBKDF2(
+                password: passwordData,
+                salt: salt,
+                iterations: 1000, // Adjust the iteration count as needed
+                keyLength: 16, // AES-128
+                variant: .sha256
+            ).calculate()
+            
+            return Data(key)
+        } catch {
+            throw error // Propagate error
+        }
     }
 }

package/ios/Fula.mm

@@ -2,7 +2,8 @@
 
 @interface RCT_EXTERN_MODULE(FulaModule, NSObject)
 
-RCT_EXTERN_METHOD(registerLifecycleListener)
+RCT_EXTERN_METHOD(registerLifecycleListener:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(checkConnection: (nonnull NSNumber *) timeout
                   withResolver:(RCTPromiseResolveBlock)resolve
@@ -189,7 +190,8 @@ RCT_EXTERN_METHOD(getFolderSize:(NSString *)folderPath
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(getDatastoreSize:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getDatastoreSize:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 
 + (BOOL)requiresMainQueueSetup
 {