@capacitor-community/sqlite 3.5.0 → 3.5.1

package/ios/Plugin/CapacitorSQLite.swift

@@ -231,6 +231,32 @@ enum CapacitorSQLiteError: Error {
     // swiftlint:enable no_space_in_method_call
     // swiftlint:enable function_body_length
 
+    // MARK: - ClearEncryptionSecret
+
+    @objc public func clearEncryptionSecret() throws {
+        if isInit {
+            if isEncryption {
+                do {
+                    // close all connections
+                    try closeAllConnections()
+                    // set encryption secret
+                    try UtilsSecret
+                        .clearEncryptionSecret(prefix: prefixKeychain,
+                                               databaseLocation: databaseLocation)
+                    return
+                } catch UtilsSecretError.clearEncryptionSecret(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 {

package/ios/Plugin/CapacitorSQLitePlugin.m

@@ -42,4 +42,5 @@ CAP_PLUGIN(CapacitorSQLitePlugin, "CapacitorSQLite",
            CAP_PLUGIN_METHOD(isSecretStored, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setEncryptionSecret, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(changeEncryptionSecret, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(clearEncryptionSecret, CAPPluginReturnPromise);
 )

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -123,6 +123,26 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
     }
 
+    // MARK: - ClearEncryptionSecret
+
+    @objc func clearEncryptionSecret(_ call: CAPPluginCall) {
+
+        do {
+            try implementation?.clearEncryptionSecret()
+            retHandler.rResult(call: call)
+            return
+        } catch CapacitorSQLiteError.failed(let message) {
+            let msg = "ClearEncryptionSecret: \(message)"
+            retHandler.rResult(call: call, message: msg)
+            return
+        } catch let error {
+            retHandler.rResult(
+                call: call,
+                message: "ClearEncryptionSecret: \(error)")
+            return
+        }
+    }
+
     // MARK: - CreateConnection
 
     @objc func createConnection(_ call: CAPPluginCall) {

package/ios/Plugin/Database.swift

@@ -467,7 +467,8 @@ class Database {
             if !isExists {
                 // check if there are tables with last_modified column
                 let isLastModified: Bool = try UtilsJson.isLastModified(mDB: self)
-                if isLastModified {
+                let isSqlDeleted: Bool = try UtilsJson.isSqlDeleted(mDB: self)
+                if isLastModified && isSqlDeleted {
                     let date = Date()
                     let syncTime: Int = Int(date.timeIntervalSince1970)
                     var stmt: String = "CREATE TABLE IF NOT EXISTS "
@@ -486,6 +487,8 @@ class Database {
             }
         } catch UtilsJsonError.isLastModified(let message) {
             throw DatabaseError.createSyncTable(message: message)
+        } catch UtilsJsonError.isSqlDeleted(let message) {
+            throw DatabaseError.createSyncTable(message: message)
         } catch UtilsJsonError.tableNotExists(let message) {
             throw DatabaseError.createSyncTable(message: message)
         } catch DatabaseError.executeSQL(let message) {

package/ios/Plugin/ImportExportJson/ImportFromJson.swift

@@ -186,12 +186,15 @@ class ImportFromJson {
 
     // MARK: - ImportFromJson - CreateTableSchema
 
+    // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     class func createTableSchema(mSchema: [JsonColumn],
                                  tableName: String, mode: String)
     -> [String] {
         var statements: [String] = []
         var stmt: String
         var isLastModified: Bool = false
+        var isSqlDeleted: Bool = false
         stmt = "CREATE TABLE IF NOT EXISTS "
         stmt.append(tableName)
         stmt.append(" (")
@@ -201,6 +204,9 @@ class ImportFromJson {
                     if jSchColumn == "last_modified" {
                         isLastModified = true
                     }
+                    if jSchColumn == "sql_deleted" {
+                        isSqlDeleted = true
+                    }
                     stmt.append(jSchColumn)
                 }
             }
@@ -222,7 +228,7 @@ class ImportFromJson {
         }
         stmt.append(");")
         statements.append(stmt)
-        if isLastModified {
+        if isLastModified && isSqlDeleted {
             // create trigger last_modified associated with the table
             let triggerName: String = tableName + "_trigger_last_modified"
             stmt = "CREATE TRIGGER IF NOT EXISTS "
@@ -240,6 +246,8 @@ class ImportFromJson {
         }
         return statements
     }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
 
     // MARK: - ImportFromJson - CreateTableIndexes
 

package/ios/Plugin/Utils/UtilsJson.swift

@@ -18,6 +18,7 @@ enum UtilsJsonError: Error {
     case validateTriggers(message: String)
     case validateViews(message: String)
     case isLastModified(message: String)
+    case isSqlDeleted(message: String)
     case checkUpdate(message: String)
     case checkValues(message: String)}
 
@@ -81,6 +82,33 @@ class UtilsJson {
         return ret
     }
 
+    // MARK: - ImportFromJson - IsSqlDeleted
+
+    class func isSqlDeleted(mDB: Database) throws -> Bool {
+        var msg: String = "Error SqlDeleted: "
+        if !mDB.isDBOpen() {
+            msg.append("Database not opened")
+            throw UtilsJsonError.isSqlDeleted(message: msg)
+        }
+        var ret: Bool = false
+        do {
+            let tableList: [String] = try UtilsDrop.getTablesNames(mDB: mDB)
+            for table in tableList {
+                let namesTypes: JsonNamesTypes = try getTableColumnNamesTypes(mDB: mDB,
+                                                                              tableName: table)
+                if namesTypes.names.contains("sql_deleted") {
+                    ret = true
+                    break
+                }
+            }
+        } catch UtilsJsonError.getTableColumnNamesTypes(let message) {
+            throw UtilsJsonError.isSqlDeleted(message: message)
+        } catch UtilsDropError.getTablesNamesFailed(let message) {
+            throw UtilsJsonError.isSqlDeleted(message: message)
+        }
+        return ret
+    }
+
     // MARK: - ImportFromJson - IsViewExists
 
     class func isViewExists(mDB: Database, viewName: String)
@@ -117,9 +145,9 @@ class UtilsJson {
     throws -> JsonNamesTypes {
         var ret: JsonNamesTypes = JsonNamesTypes(names: [], types: [])
         var msg: String = "Error: getTableColumnNamesTypes "
-        var query: String = "PRAGMA table_info("
+        var query: String = "PRAGMA table_info('"
         query.append(tableName)
-        query.append(");")
+        query.append("');")
         do {
             var resQuery =  try mDB.selectSQL(sql: query, values: [])
             if resQuery.count > 0 {

package/ios/Plugin/Utils/UtilsSQLCipher.swift

@@ -487,7 +487,9 @@ class UtilsSQLCipher {
         var sqlStmt = sql
         do {
             let isLast: Bool = try UtilsJson.isLastModified(mDB: mDB)
-            if isLast {
+            let isDel: Bool = try UtilsJson.isSqlDeleted(mDB: mDB)
+            if isLast && isDel {
+                // Replace DELETE by UPDATE and set sql_deleted to 1
                 if let range: Range<String.Index> = sql
                     .range(of: "WHERE", options: .caseInsensitive) {
                     let index: Int = sql
@@ -515,6 +517,8 @@ class UtilsSQLCipher {
             throw UtilsSQLCipherError.deleteSQL(message: message)
         } catch UtilsJsonError.isLastModified(let message) {
             throw UtilsSQLCipherError.deleteSQL(message: message)
+        } catch UtilsJsonError.isSqlDeleted(let message) {
+            throw UtilsSQLCipherError.deleteSQL(message: message)
         }
     }
 

package/ios/Plugin/Utils/UtilsSecret.swift

@@ -13,7 +13,8 @@ enum UtilsSecretError: Error {
     case setPassphrase(message: String)
     case changePassphrase(message: String)
     case setEncryptionSecret(message: String)
-    case  changeEncryptionSecret(message: String)
+    case changeEncryptionSecret(message: String)
+    case clearEncryptionSecret(message: String)
 }
 
 let oldAccount: String = "CapacitorSQLitePlugin"
@@ -240,4 +241,22 @@ class UtilsSecret {
     }
     // swiftlint:enable function_body_length
 
+    // MARK: - ClearEncryptionSecret
+
+    class func clearEncryptionSecret(prefix: String, databaseLocation: String) throws {
+        do {
+            if prefix.isEmpty {
+                let msg: String = "keychain prefix must not be empty"
+                throw UtilsSecretError.setEncryptionSecret(message: msg)
+            }
+            // clear encrypted passphrase
+            let account = "\(prefix)_\(oldAccount)"
+            if !getPassphrase(account: account).isEmpty {
+                try setPassphrase(account: account, passphrase: "")
+            }
+        } catch UtilsSecretError.setPassphrase(let message) {
+            throw UtilsSecretError.clearEncryptionSecret(message: message)
+        }
+
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,16 +55,16 @@
     "prepublishOnly": "npm run build && npm run build-electron && npm run docgen"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.5.0",
-    "@capacitor/core": "^3.5.0",
+    "@capacitor/android": "^3.5.1",
+    "@capacitor/core": "^3.5.1",
     "@capacitor/docgen": "^0.0.17",
-    "@capacitor/ios": "^3.5.0",
+    "@capacitor/ios": "^3.5.1",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
-    "electron": "^14.2.4",
+    "electron": "^15.5.5",
     "eslint": "^7.11.0",
     "prettier": "~2.2.0",
     "prettier-plugin-java": "~1.0.0",
@@ -93,6 +93,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^1.5.1"
+    "jeep-sqlite": "^1.5.2"
   }
 }