@capacitor-community/sqlite 4.6.1-1 → 4.6.1

package/ios/Plugin/CapacitorSQLite.swift

@@ -258,6 +258,32 @@ enum CapacitorSQLiteError: Error {
         }
     }
 
+    // MARK: - CheckEncryptionSecret
+
+    @objc public func checkEncryptionSecret(passphrase: String) throws ->  NSNumber {
+        if isInit {
+            if isEncryption {
+                do {
+                    // close all connections
+                    try closeAllConnections()
+                    // check encryption secret
+                    let res: NSNumber = try UtilsSecret
+                        .checkEncryptionSecret(prefix: prefixKeychain,
+                                               passphrase: passphrase)
+                    return res
+                } catch UtilsSecretError.checkEncryptionSecret(let message) {
+                    throw CapacitorSQLiteError.failed(message: message)
+                } catch let error {
+                    throw CapacitorSQLiteError.failed(message: "\(error)")
+                }
+            } else {
+                throw CapacitorSQLiteError.failed(message: "No Encryption set in capacitor.config")
+            }
+        } else {
+            throw CapacitorSQLiteError.failed(message: initMessage)
+        }
+    }
+
     // MARK: - getNCDatabasePath
 
     @objc public func getNCDatabasePath(_ folderPath: String, dbName: String ) throws -> String {
@@ -1244,6 +1270,7 @@ enum CapacitorSQLiteError: Error {
     throws -> [Int: [String: Any]] {
         if isInit {
             var upgDict: [String: Any] = [:]
+            var upgVersionDict: [Int: [String: Any]] = [:]
             for dict in upgrade {
                 let keys = dict.keys
                 if !(keys.contains("toVersion")) || !(keys.contains("statements")) {
@@ -1254,13 +1281,12 @@ enum CapacitorSQLiteError: Error {
                 for (key, value) in dict {
                     upgDict[key] = value
                 }
+                guard let toVersion = upgDict["toVersion"] as? Int else {
+                    let msg: String = "toVersion key must be an Int"
+                    throw CapacitorSQLiteError.failed(message: msg)
+                }
+                upgVersionDict[toVersion] =  upgDict
             }
-            guard let toVersion = upgDict["toVersion"] as? Int else {
-                let msg: String = "toVersion key must be an Int"
-                throw CapacitorSQLiteError.failed(message: msg)
-            }
-            let upgVersionDict: [Int: [String: Any]] =
-                [toVersion: upgDict]
             return upgVersionDict
         } else {
             throw CapacitorSQLiteError.failed(message: initMessage)

package/ios/Plugin/CapacitorSQLitePlugin.m

@@ -45,4 +45,5 @@ CAP_PLUGIN(CapacitorSQLitePlugin, "CapacitorSQLite",
            CAP_PLUGIN_METHOD(changeEncryptionSecret, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(clearEncryptionSecret, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getFromHTTPRequest, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(checkEncryptionSecret, CAPPluginReturnPromise);
 )

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -143,6 +143,37 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
     }
 
+    // MARK: - CheckEncryptionSecret
+
+    @objc func checkEncryptionSecret(_ call: CAPPluginCall) {
+
+        guard let passphrase = call.options["passphrase"] as? String else {
+            retHandler.rResult(
+                call: call,
+                message: "CheckEncryptionSecret: Must provide a passphrase")
+            return
+        }
+        do {
+            let res = try implementation?
+                .checkEncryptionSecret(passphrase: passphrase)
+            var bRes: Bool = false
+            if res == 1 {
+                bRes = true
+            }
+            retHandler.rResult(call: call, ret: bRes)
+            return
+        } catch CapacitorSQLiteError.failed(let message) {
+            let msg = "CheckEncryptionSecret: \(message)"
+            retHandler.rResult(call: call, message: msg)
+            return
+        } catch let error {
+            retHandler.rResult(
+                call: call,
+                message: "CheckEncryptionSecret: \(error)")
+            return
+        }
+    }
+
     // MARK: - CreateConnection
 
     @objc func createConnection(_ call: CAPPluginCall) {

package/ios/Plugin/Utils/UtilsSecret.swift

@@ -15,6 +15,7 @@ enum UtilsSecretError: Error {
     case setEncryptionSecret(message: String)
     case changeEncryptionSecret(message: String)
     case clearEncryptionSecret(message: String)
+    case checkEncryptionSecret(message: String)
 }
 
 let oldAccount: String = "CapacitorSQLitePlugin"
@@ -259,4 +260,29 @@ class UtilsSecret {
         }
 
     }
+
+    // MARK: - CheckEncryptionSecret
+
+    class func checkEncryptionSecret(prefix: String, passphrase: String) throws -> NSNumber {
+        var ret: NSNumber = 0
+        if prefix.isEmpty {
+            let msg: String = "keychain prefix must not be empty"
+            throw UtilsSecretError.checkEncryptionSecret(message: msg)
+        }
+        if passphrase.isEmpty {
+            let msg: String = "passphrase must not be empty"
+            throw UtilsSecretError.checkEncryptionSecret(message: msg)
+        }
+        // get encrypted passphrase
+        let account = "\(prefix)_\(oldAccount)"
+        let storedPassPhrase = getPassphrase(account: account)
+        if storedPassPhrase.isEmpty {
+            let msg: String = "no passphrase stored in keychain"
+            throw UtilsSecretError.checkEncryptionSecret(message: msg)
+        }
+        if storedPassPhrase == passphrase {
+            ret = 1
+        }
+        return ret
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "4.6.1-1",
+  "version": "4.6.1",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.6.9"
+    "jeep-sqlite": "^1.7.0"
   }
 }