capacitor-secure-storage-plugin 0.13.0 → 0.14.0

package/CapacitorSecureStoragePlugin.podspec

@@ -13,6 +13,5 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
-  s.dependency 'SwiftKeychainWrapper'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -10,21 +10,15 @@ let package = Package(
             targets: ["SecureStoragePlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
-        .package(url: "https://github.com/jrendel/SwiftKeychainWrapper.git", from: "4.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
     ],
     targets: [
         .target(
             name: "SecureStoragePlugin",
             dependencies: [
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm"),
-                .product(name: "SwiftKeychainWrapper", package: "SwiftKeychainWrapper")
+                .product(name: "Cordova", package: "capacitor-swift-pm")
             ],
-            path: "ios/Sources/SecureStoragePlugin"),
-        .testTarget(
-            name: "SecureStoragePluginTests",
-            dependencies: ["SecureStoragePlugin"],
-            path: "ios/Tests/SecureStoragePluginTests")
+            path: "ios/Sources/SecureStoragePlugin")
     ]
 )

package/README.md

@@ -6,12 +6,18 @@ Capacitor plugin for storing string values securly on iOS and Android.
 
 ## How to install
 
-For Capacitor v7
+For Capacitor v8
 
 ```bash
 npm install capacitor-secure-storage-plugin
 ```
 
+For Capacitor v7 - install with fixed version 0.12.0
+
+```bash
+npm install capacitor-secure-storage-plugin@0.12.0
+```
+
 For Capacitor v6 - install with fixed version 0.10.0
 
 ```bash
@@ -182,24 +188,29 @@ async getUsername(key: string) {
 
 ### iOS
 
-This plugin uses SwiftKeychainWrapper under the hood for iOS.
+Values are stored in the iOS Keychain as generic passwords under the `cap_sec` service and are not synced to iCloud.
+
+Values are accessible only after the device has been unlocked for the first time after a reboot. Any keychain failure other than a missing key (e.g. reading while the app runs in the background before the first unlock) rejects with message `Keychain error <OSStatus>: <description>` and `code` set to the OSStatus, e.g. `-25308` (`errSecInteractionNotAllowed`). Only a really missing key rejects with `Item with given key does not exist`.
 
 After reinstalling an app, the data stored in the keychain are not deleted automatically. To clear the data the following code has to be added to AppDelegate.swift. This is just an example, there are multiple ways how it can be achieved.
 
 ```swift
-import SwiftKeychainWrapper
+import Security
 
 
 if !UserDefaults.standard.bool(forKey: "firstTimeLaunchOccurred") {
-    let keychainWrapper = KeychainWrapper(serviceName: "cap_sec")
-    keychainWrapper.removeAllKeys()
+    let query: [String: Any] = [
+        kSecClass as String: kSecClassGenericPassword,
+        kSecAttrService as String: "cap_sec"
+    ]
+    SecItemDelete(query as CFDictionary)
 
     UserDefaults.standard.set(true, forKey: "firstTimeLaunchOccurred")
 }
 ```
 
 > **Warning**
-> Up to version v0.4.0 there was standard keychain used. Since v0.5.0 there is separate keychain wrapper, so keys() method returns only keys set in v0.5.0 or higher version.
+> Since v0.14.0 values saved by v0.4.0 or older (stored in the standard keychain) are no longer read. Upgrade through v0.13.0 first and read the values to migrate them.
 
 ### Android
 

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,OAAO,sBACX,SAAQ,SAAS;IADnB;;QAGE,WAAM,GAAG,UAAU,CAAC;QAyCZ,cAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAC/C,iBAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IAzCC,GAAG,CAAC,OAAwB;QAC1B,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAChE,OAAO,KAAK,KAAK,IAAI;YACnB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;gBACd,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC;YACJ,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC3D,CAAC;IACD,GAAG,CAAC,OAAuC;QACzC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,CAAC,OAAwB;QAC7B,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACtD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACzC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,WAAW;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3C,CAAC;CAIF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\nimport type { SecureStoragePluginPlugin } from './definitions';\n\nexport class SecureStoragePluginWeb\n  extends WebPlugin\n  implements SecureStoragePluginPlugin {\n  PREFIX = 'cap_sec_';\n\n  get(options: { key: string }): Promise<{ value: string }> {\n    const value = localStorage.getItem(this.addPrefix(options.key));\n    return value !== null\n      ? Promise.resolve({\n          value: atob(value),\n        })\n      : Promise.reject('Item with given key does not exist');\n  }\n  set(options: { key: string; value: string }): Promise<{ value: boolean }> {\n    localStorage.setItem(this.addPrefix(options.key), btoa(options.value));\n    return Promise.resolve({ value: true });\n  }\n  remove(options: { key: string }): Promise<{ value: boolean }> {\n    if (localStorage.getItem(this.addPrefix(options.key))) {\n      localStorage.removeItem(this.addPrefix(options.key));\n      return Promise.resolve({ value: true });\n    } else {\n      return Promise.reject('Item with given key does not exist');\n    }\n  }\n  clear(): Promise<{ value: boolean }> {\n    for (const key in localStorage) {\n      if (key.indexOf(this.PREFIX) === 0) {\n        localStorage.removeItem(key);\n      }\n    }\n    return Promise.resolve({ value: true });\n  }\n  keys(): Promise<{ value: string[] }> {\n    const keys = Object.keys(localStorage)\n      .filter(k => k.indexOf(this.PREFIX) === 0)\n      .map(this.removePrefix);\n    return Promise.resolve({ value: keys });\n  }\n\n  getPlatform(): Promise<{ value: string }> {\n    return Promise.resolve({ value: 'web' });\n  }\n\n  private addPrefix = (key: string) => this.PREFIX + key;\n  private removePrefix = (key: string) => key.replace(this.PREFIX, '');\n}\n"]}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,OAAO,sBACX,SAAQ,SAAS;IADnB;;QAGE,WAAM,GAAG,UAAU,CAAC;QAyCZ,cAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAC/C,iBAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IAzCC,GAAG,CAAC,OAAwB;QAC1B,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAChE,OAAO,KAAK,KAAK,IAAI;YACnB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;gBACd,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC;YACJ,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC3D,CAAC;IACD,GAAG,CAAC,OAAuC;QACzC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,CAAC,OAAwB;QAC7B,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACtD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACzC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,WAAW;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3C,CAAC;CAIF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type { SecureStoragePluginPlugin } from './definitions';\n\nexport class SecureStoragePluginWeb\n  extends WebPlugin\n  implements SecureStoragePluginPlugin {\n  PREFIX = 'cap_sec_';\n\n  get(options: { key: string }): Promise<{ value: string }> {\n    const value = localStorage.getItem(this.addPrefix(options.key));\n    return value !== null\n      ? Promise.resolve({\n          value: atob(value),\n        })\n      : Promise.reject('Item with given key does not exist');\n  }\n  set(options: { key: string; value: string }): Promise<{ value: boolean }> {\n    localStorage.setItem(this.addPrefix(options.key), btoa(options.value));\n    return Promise.resolve({ value: true });\n  }\n  remove(options: { key: string }): Promise<{ value: boolean }> {\n    if (localStorage.getItem(this.addPrefix(options.key))) {\n      localStorage.removeItem(this.addPrefix(options.key));\n      return Promise.resolve({ value: true });\n    } else {\n      return Promise.reject('Item with given key does not exist');\n    }\n  }\n  clear(): Promise<{ value: boolean }> {\n    for (const key in localStorage) {\n      if (key.indexOf(this.PREFIX) === 0) {\n        localStorage.removeItem(key);\n      }\n    }\n    return Promise.resolve({ value: true });\n  }\n  keys(): Promise<{ value: string[] }> {\n    const keys = Object.keys(localStorage)\n      .filter(k => k.indexOf(this.PREFIX) === 0)\n      .map(this.removePrefix);\n    return Promise.resolve({ value: keys });\n  }\n\n  getPlatform(): Promise<{ value: string }> {\n    return Promise.resolve({ value: 'web' });\n  }\n\n  private addPrefix = (key: string) => this.PREFIX + key;\n  private removePrefix = (key: string) => key.replace(this.PREFIX, '');\n}\n"]}

package/dist/plugin.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SecureStoragePlugin = registerPlugin('SecureStoragePlugin', {\n    web: () => import('./web').then(m => new m.SecureStoragePluginWeb()),\n});\nexport * from './definitions';\nexport { SecureStoragePlugin };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class SecureStoragePluginWeb extends WebPlugin {\n    constructor() {\n        super(...arguments);\n        this.PREFIX = 'cap_sec_';\n        this.addPrefix = (key) => this.PREFIX + key;\n        this.removePrefix = (key) => key.replace(this.PREFIX, '');\n    }\n    get(options) {\n        const value = localStorage.getItem(this.addPrefix(options.key));\n        return value !== null\n            ? Promise.resolve({\n                value: atob(value),\n            })\n            : Promise.reject('Item with given key does not exist');\n    }\n    set(options) {\n        localStorage.setItem(this.addPrefix(options.key), btoa(options.value));\n        return Promise.resolve({ value: true });\n    }\n    remove(options) {\n        if (localStorage.getItem(this.addPrefix(options.key))) {\n            localStorage.removeItem(this.addPrefix(options.key));\n            return Promise.resolve({ value: true });\n        }\n        else {\n            return Promise.reject('Item with given key does not exist');\n        }\n    }\n    clear() {\n        for (const key in localStorage) {\n            if (key.indexOf(this.PREFIX) === 0) {\n                localStorage.removeItem(key);\n            }\n        }\n        return Promise.resolve({ value: true });\n    }\n    keys() {\n        const keys = Object.keys(localStorage)\n            .filter(k => k.indexOf(this.PREFIX) === 0)\n            .map(this.removePrefix);\n        return Promise.resolve({ value: keys });\n    }\n    getPlatform() {\n        return Promise.resolve({ value: 'web' });\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;AACK,MAAC,mBAAmB,GAAGA,mBAAc,CAAC,qBAAqB,EAAE;AAClE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,sBAAsB,EAAE,CAAC;AACxE,CAAC;;ACFM,MAAM,sBAAsB,SAASC,cAAS,CAAC;AACtD,IAAI,WAAW,GAAG;AAClB,QAAQ,KAAK,CAAC,GAAG,SAAS,CAAC;AAC3B,QAAQ,IAAI,CAAC,MAAM,GAAG,UAAU;AAChC,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,MAAM,GAAG,GAAG;AACnD,QAAQ,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;AACjE,IAAI;AACJ,IAAI,GAAG,CAAC,OAAO,EAAE;AACjB,QAAQ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACvE,QAAQ,OAAO,KAAK,KAAK;AACzB,cAAc,OAAO,CAAC,OAAO,CAAC;AAC9B,gBAAgB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;AAClC,aAAa;AACb,cAAc,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;AAClE,IAAI;AACJ,IAAI,GAAG,CAAC,OAAO,EAAE;AACjB,QAAQ,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC/C,IAAI;AACJ,IAAI,MAAM,CAAC,OAAO,EAAE;AACpB,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;AAC/D,YAAY,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAChE,YAAY,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACnD,QAAQ;AACR,aAAa;AACb,YAAY,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;AACvE,QAAQ;AACR,IAAI;AACJ,IAAI,KAAK,GAAG;AACZ,QAAQ,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;AACxC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;AAChD,gBAAgB,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;AAC5C,YAAY;AACZ,QAAQ;AACR,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC/C,IAAI;AACJ,IAAI,IAAI,GAAG;AACX,QAAQ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY;AAC7C,aAAa,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;AACrD,aAAa,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;AACnC,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC/C,IAAI;AACJ,IAAI,WAAW,GAAG;AAClB,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAChD,IAAI;AACJ;;;;;;;;;"}
+{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SecureStoragePlugin = registerPlugin('SecureStoragePlugin', {\n    web: () => import('./web').then(m => new m.SecureStoragePluginWeb()),\n});\nexport * from './definitions';\nexport { SecureStoragePlugin };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class SecureStoragePluginWeb extends WebPlugin {\n    constructor() {\n        super(...arguments);\n        this.PREFIX = 'cap_sec_';\n        this.addPrefix = (key) => this.PREFIX + key;\n        this.removePrefix = (key) => key.replace(this.PREFIX, '');\n    }\n    get(options) {\n        const value = localStorage.getItem(this.addPrefix(options.key));\n        return value !== null\n            ? Promise.resolve({\n                value: atob(value),\n            })\n            : Promise.reject('Item with given key does not exist');\n    }\n    set(options) {\n        localStorage.setItem(this.addPrefix(options.key), btoa(options.value));\n        return Promise.resolve({ value: true });\n    }\n    remove(options) {\n        if (localStorage.getItem(this.addPrefix(options.key))) {\n            localStorage.removeItem(this.addPrefix(options.key));\n            return Promise.resolve({ value: true });\n        }\n        else {\n            return Promise.reject('Item with given key does not exist');\n        }\n    }\n    clear() {\n        for (const key in localStorage) {\n            if (key.indexOf(this.PREFIX) === 0) {\n                localStorage.removeItem(key);\n            }\n        }\n        return Promise.resolve({ value: true });\n    }\n    keys() {\n        const keys = Object.keys(localStorage)\n            .filter(k => k.indexOf(this.PREFIX) === 0)\n            .map(this.removePrefix);\n        return Promise.resolve({ value: keys });\n    }\n    getPlatform() {\n        return Promise.resolve({ value: 'web' });\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;AACK,MAAC,mBAAmB,GAAGA,mBAAc,CAAC,qBAAqB,EAAE;AAClE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,sBAAsB,EAAE,CAAC;AACxE,CAAC;;ACFM,MAAM,sBAAsB,SAASC,cAAS,CAAC;AACtD,IAAI,WAAW,GAAG;AAClB,QAAQ,KAAK,CAAC,GAAG,SAAS,CAAC;AAC3B,QAAQ,IAAI,CAAC,MAAM,GAAG,UAAU;AAChC,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,MAAM,GAAG,GAAG;AACnD,QAAQ,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;AACjE,IAAI;AACJ,IAAI,GAAG,CAAC,OAAO,EAAE;AACjB,QAAQ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACvE,QAAQ,OAAO,KAAK,KAAK;AACzB,cAAc,OAAO,CAAC,OAAO,CAAC;AAC9B,gBAAgB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;AAClC,aAAa;AACb,cAAc,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;AAClE,IAAI;AACJ,IAAI,GAAG,CAAC,OAAO,EAAE;AACjB,QAAQ,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC/C,IAAI;AACJ,IAAI,MAAM,CAAC,OAAO,EAAE;AACpB,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;AAC/D,YAAY,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAChE,YAAY,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACnD,QAAQ;AACR,aAAa;AACb,YAAY,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;AACvE,QAAQ;AACR,IAAI;AACJ,IAAI,KAAK,GAAG;AACZ,QAAQ,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;AACxC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;AAChD,gBAAgB,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;AAC5C,YAAY;AACZ,QAAQ;AACR,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC/C,IAAI;AACJ,IAAI,IAAI,GAAG;AACX,QAAQ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY;AAC7C,aAAa,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;AACrD,aAAa,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;AACnC,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC/C,IAAI;AACJ,IAAI,WAAW,GAAG;AAClB,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAChD,IAAI;AACJ;;;;;;;"}

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SecureStoragePlugin = registerPlugin('SecureStoragePlugin', {\n    web: () => import('./web').then(m => new m.SecureStoragePluginWeb()),\n});\nexport * from './definitions';\nexport { SecureStoragePlugin };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class SecureStoragePluginWeb extends WebPlugin {\n    constructor() {\n        super(...arguments);\n        this.PREFIX = 'cap_sec_';\n        this.addPrefix = (key) => this.PREFIX + key;\n        this.removePrefix = (key) => key.replace(this.PREFIX, '');\n    }\n    get(options) {\n        const value = localStorage.getItem(this.addPrefix(options.key));\n        return value !== null\n            ? Promise.resolve({\n                value: atob(value),\n            })\n            : Promise.reject('Item with given key does not exist');\n    }\n    set(options) {\n        localStorage.setItem(this.addPrefix(options.key), btoa(options.value));\n        return Promise.resolve({ value: true });\n    }\n    remove(options) {\n        if (localStorage.getItem(this.addPrefix(options.key))) {\n            localStorage.removeItem(this.addPrefix(options.key));\n            return Promise.resolve({ value: true });\n        }\n        else {\n            return Promise.reject('Item with given key does not exist');\n        }\n    }\n    clear() {\n        for (const key in localStorage) {\n            if (key.indexOf(this.PREFIX) === 0) {\n                localStorage.removeItem(key);\n            }\n        }\n        return Promise.resolve({ value: true });\n    }\n    keys() {\n        const keys = Object.keys(localStorage)\n            .filter(k => k.indexOf(this.PREFIX) === 0)\n            .map(this.removePrefix);\n        return Promise.resolve({ value: keys });\n    }\n    getPlatform() {\n        return Promise.resolve({ value: 'web' });\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,mBAAmB,GAAGA,mBAAc,CAAC,qBAAqB,EAAE;IAClE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,sBAAsB,EAAE,CAAC;IACxE,CAAC;;ICFM,MAAM,sBAAsB,SAASC,cAAS,CAAC;IACtD,IAAI,WAAW,GAAG;IAClB,QAAQ,KAAK,CAAC,GAAG,SAAS,CAAC;IAC3B,QAAQ,IAAI,CAAC,MAAM,GAAG,UAAU;IAChC,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,MAAM,GAAG,GAAG;IACnD,QAAQ,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IACjE,IAAI;IACJ,IAAI,GAAG,CAAC,OAAO,EAAE;IACjB,QAAQ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvE,QAAQ,OAAO,KAAK,KAAK;IACzB,cAAc,OAAO,CAAC,OAAO,CAAC;IAC9B,gBAAgB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;IAClC,aAAa;IACb,cAAc,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;IAClE,IAAI;IACJ,IAAI,GAAG,CAAC,OAAO,EAAE;IACjB,QAAQ,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9E,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI;IACJ,IAAI,MAAM,CAAC,OAAO,EAAE;IACpB,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;IAC/D,YAAY,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChE,YAAY,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnD,QAAQ;IACR,aAAa;IACb,YAAY,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;IACvE,QAAQ;IACR,IAAI;IACJ,IAAI,KAAK,GAAG;IACZ,QAAQ,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;IACxC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;IAChD,gBAAgB,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;IAC5C,YAAY;IACZ,QAAQ;IACR,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI;IACJ,IAAI,IAAI,GAAG;IACX,QAAQ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY;IAC7C,aAAa,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IACrD,aAAa,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IACnC,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI;IACJ,IAAI,WAAW,GAAG;IAClB,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAChD,IAAI;IACJ;;;;;;;;;;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SecureStoragePlugin = registerPlugin('SecureStoragePlugin', {\n    web: () => import('./web').then(m => new m.SecureStoragePluginWeb()),\n});\nexport * from './definitions';\nexport { SecureStoragePlugin };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class SecureStoragePluginWeb extends WebPlugin {\n    constructor() {\n        super(...arguments);\n        this.PREFIX = 'cap_sec_';\n        this.addPrefix = (key) => this.PREFIX + key;\n        this.removePrefix = (key) => key.replace(this.PREFIX, '');\n    }\n    get(options) {\n        const value = localStorage.getItem(this.addPrefix(options.key));\n        return value !== null\n            ? Promise.resolve({\n                value: atob(value),\n            })\n            : Promise.reject('Item with given key does not exist');\n    }\n    set(options) {\n        localStorage.setItem(this.addPrefix(options.key), btoa(options.value));\n        return Promise.resolve({ value: true });\n    }\n    remove(options) {\n        if (localStorage.getItem(this.addPrefix(options.key))) {\n            localStorage.removeItem(this.addPrefix(options.key));\n            return Promise.resolve({ value: true });\n        }\n        else {\n            return Promise.reject('Item with given key does not exist');\n        }\n    }\n    clear() {\n        for (const key in localStorage) {\n            if (key.indexOf(this.PREFIX) === 0) {\n                localStorage.removeItem(key);\n            }\n        }\n        return Promise.resolve({ value: true });\n    }\n    keys() {\n        const keys = Object.keys(localStorage)\n            .filter(k => k.indexOf(this.PREFIX) === 0)\n            .map(this.removePrefix);\n        return Promise.resolve({ value: keys });\n    }\n    getPlatform() {\n        return Promise.resolve({ value: 'web' });\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,mBAAmB,GAAGA,mBAAc,CAAC,qBAAqB,EAAE;IAClE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,sBAAsB,EAAE,CAAC;IACxE,CAAC;;ICFM,MAAM,sBAAsB,SAASC,cAAS,CAAC;IACtD,IAAI,WAAW,GAAG;IAClB,QAAQ,KAAK,CAAC,GAAG,SAAS,CAAC;IAC3B,QAAQ,IAAI,CAAC,MAAM,GAAG,UAAU;IAChC,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,MAAM,GAAG,GAAG;IACnD,QAAQ,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IACjE,IAAI;IACJ,IAAI,GAAG,CAAC,OAAO,EAAE;IACjB,QAAQ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvE,QAAQ,OAAO,KAAK,KAAK;IACzB,cAAc,OAAO,CAAC,OAAO,CAAC;IAC9B,gBAAgB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;IAClC,aAAa;IACb,cAAc,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;IAClE,IAAI;IACJ,IAAI,GAAG,CAAC,OAAO,EAAE;IACjB,QAAQ,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9E,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI;IACJ,IAAI,MAAM,CAAC,OAAO,EAAE;IACpB,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;IAC/D,YAAY,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChE,YAAY,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnD,QAAQ;IACR,aAAa;IACb,YAAY,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC;IACvE,QAAQ;IACR,IAAI;IACJ,IAAI,KAAK,GAAG;IACZ,QAAQ,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;IACxC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;IAChD,gBAAgB,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;IAC5C,YAAY;IACZ,QAAQ;IACR,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI;IACJ,IAAI,IAAI,GAAG;IACX,QAAQ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY;IAC7C,aAAa,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IACrD,aAAa,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IACnC,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC/C,IAAI;IACJ,IAAI,WAAW,GAAG;IAClB,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAChD,IAAI;IACJ;;;;;;;;;;;"}

package/ios/Sources/SecureStoragePlugin/Keychain.swift

@@ -0,0 +1,113 @@
+import Foundation
+import Security
+
+/// Keychain operation failed for a reason other than a missing item,
+/// e.g. `errSecInteractionNotAllowed` when the device was not unlocked since reboot.
+struct KeychainError: Error {
+    let status: OSStatus
+
+    var message: String {
+        let description = SecCopyErrorMessageString(status, nil) as String? ?? "Unknown error"
+        return "Keychain error \(status): \(description)"
+    }
+}
+
+/// Minimal generic-password keychain store.
+///
+/// Items are stored in exactly the same shape SwiftKeychainWrapper used (account and generic
+/// attributes as UTF-8 `Data`, value as UTF-8 bytes, non-synchronizable), so items written
+/// by earlier plugin versions stay readable. Do not change the item shape without a migration.
+///
+/// Missing items are reported by `nil` / `false`; every other failure throws `KeychainError`.
+struct Keychain {
+    let service: String
+
+    func set(_ value: String, forKey key: String) throws {
+        let attributes: [String: Any] = [
+            kSecValueData as String: Data(value.utf8),
+            kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock
+        ]
+        let query = itemQuery(forKey: key)
+
+        var status = SecItemAdd(query.merging(attributes) { $1 } as CFDictionary, nil)
+        if status == errSecDuplicateItem {
+            // Accessibility must not be part of the match, otherwise items stored with
+            // a different accessibility by older versions could never be overwritten.
+            status = SecItemUpdate(query as CFDictionary, attributes as CFDictionary)
+        }
+        try check(status)
+    }
+
+    func string(forKey key: String) throws -> String? {
+        var query = itemQuery(forKey: key)
+        query[kSecMatchLimit as String] = kSecMatchLimitOne
+        query[kSecReturnData as String] = true
+
+        var result: AnyObject?
+        let status = SecItemCopyMatching(query as CFDictionary, &result)
+        if status == errSecItemNotFound {
+            return nil
+        }
+        try check(status)
+        guard let data = result as? Data, let value = String(data: data, encoding: .utf8) else {
+            throw KeychainError(status: errSecDecode)
+        }
+        return value
+    }
+
+    /// Returns `false` when there was nothing to remove.
+    func remove(forKey key: String) throws -> Bool {
+        let status = SecItemDelete(itemQuery(forKey: key) as CFDictionary)
+        if status == errSecItemNotFound {
+            return false
+        }
+        try check(status)
+        return true
+    }
+
+    func removeAll() throws {
+        let status = SecItemDelete(serviceQuery() as CFDictionary)
+        if status != errSecItemNotFound {
+            try check(status)
+        }
+    }
+
+    func allKeys() throws -> [String] {
+        var query = serviceQuery()
+        query[kSecReturnAttributes as String] = true
+        query[kSecMatchLimit as String] = kSecMatchLimitAll
+
+        var result: AnyObject?
+        let status = SecItemCopyMatching(query as CFDictionary, &result)
+        if status == errSecItemNotFound {
+            return []
+        }
+        try check(status)
+        let items = result as? [[String: Any]] ?? []
+        return items.compactMap { item in
+            (item[kSecAttrAccount as String] as? Data).flatMap { String(data: $0, encoding: .utf8) }
+        }
+    }
+
+    private func check(_ status: OSStatus) throws {
+        if status != errSecSuccess {
+            throw KeychainError(status: status)
+        }
+    }
+
+    private func serviceQuery() -> [String: Any] {
+        [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecAttrService as String: service
+        ]
+    }
+
+    private func itemQuery(forKey key: String) -> [String: Any] {
+        let encodedKey = Data(key.utf8)
+        var query = serviceQuery()
+        query[kSecAttrAccount as String] = encodedKey
+        query[kSecAttrGeneric as String] = encodedKey
+        query[kSecAttrSynchronizable as String] = false
+        return query
+    }
+}

package/ios/Sources/SecureStoragePlugin/SecureStoragePlugin.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Capacitor
-import SwiftKeychainWrapper
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
@@ -8,124 +7,78 @@ import SwiftKeychainWrapper
  */
 @objc(SecureStoragePlugin)
 public class SecureStoragePlugin: CAPPlugin, CAPBridgedPlugin {
-    public let identifier = "SecureStoragePlugin" 
-    public let jsName = "SecureStoragePlugin" 
+    public let identifier = "SecureStoragePlugin"
+    public let jsName = "SecureStoragePlugin"
     public let pluginMethods: [CAPPluginMethod] = [
         CAPPluginMethod(name: "set", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "get", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "keys", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "remove", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "clear", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getPlatform", returnType: CAPPluginReturnPromise),
-    ] 
-    var keychainwrapper: KeychainWrapper = KeychainWrapper.init(serviceName: "cap_sec")
-    
+        CAPPluginMethod(name: "getPlatform", returnType: CAPPluginReturnPromise)
+    ]
+    // `var` so tests can point the plugin at a test-only keychain service.
+    var keychain = Keychain(service: "cap_sec")
+
     @objc func set(_ call: CAPPluginCall) {
         let key = call.getString("key") ?? ""
         let value = call.getString("value") ?? ""
-        let saveSuccessful: Bool = keychainwrapper.set(value, forKey: key, withAccessibility: .afterFirstUnlock)
-        if(saveSuccessful) {
-            call.resolve([
-                "value": saveSuccessful
-            ])
-        }
-        else {
-            call.reject("error")
+        run(call) {
+            try keychain.set(value, forKey: key)
+            call.resolve(["value": true])
         }
     }
-    
+
     @objc func get(_ call: CAPPluginCall) {
         let key = call.getString("key") ?? ""
-        let hasValueDedicated = keychainwrapper.hasValue(forKey: key)
-        let hasValueStandard = KeychainWrapper.standard.hasValue(forKey: key)
-        
-        // copy standard value to dedicated and remove standard key
-        if (hasValueStandard && !hasValueDedicated) {
-            let syncValueSuccessful: Bool = keychainwrapper.set(
-                KeychainWrapper.standard.string(forKey: key) ?? "",
-                forKey: key,
-                withAccessibility: .afterFirstUnlock
-            )
-            let removeValueSuccessful: Bool = KeychainWrapper.standard.removeObject(forKey: key)
-            if (!syncValueSuccessful || !removeValueSuccessful) {
-                call.reject("error")
+        run(call) {
+            if let value = try keychain.string(forKey: key) {
+                call.resolve(["value": value])
+            } else {
+                call.reject(Self.notFoundMessage)
             }
         }
-        
-        if(hasValueDedicated || hasValueStandard) {
-            call.resolve([
-                "value": keychainwrapper.string(forKey: key) ?? ""
-            ])
-        }
-        else {
-            call.reject("Item with given key does not exist")
-        }
     }
-    
+
     @objc func keys(_ call: CAPPluginCall) {
-        let keys = keychainwrapper.allKeys();
-        call.resolve([
-            "value": Array(keys)
-        ])
+        run(call) {
+            call.resolve(["value": try keychain.allKeys()])
+        }
     }
-    
+
     @objc func remove(_ call: CAPPluginCall) {
         let key = call.getString("key") ?? ""
-        let hasValueDedicated = keychainwrapper.hasValue(forKey: key)
-        let hasValueStandard = KeychainWrapper.standard.hasValue(forKey: key)
-        
-        if(hasValueDedicated || hasValueStandard) {
-            KeychainWrapper.standard.removeObject(forKey: key);
-            let removeDedicatedSuccessful: Bool = keychainwrapper.removeObject(forKey: key)
-            if(removeDedicatedSuccessful) {
-                call.resolve([
-                    "value": removeDedicatedSuccessful
-                ])
+        run(call) {
+            if try keychain.remove(forKey: key) {
+                call.resolve(["value": true])
+            } else {
+                call.reject(Self.notFoundMessage)
             }
-            else {
-                call.reject("Remove failed")
-            }
-        }
-        else {
-            call.reject("Item with given key does not exist")
         }
     }
-    
+
     @objc func clear(_ call: CAPPluginCall) {
-        let keys = keychainwrapper.allKeys();
-        // cleanup standard keychain wrapper keys
-        
-        if(keys.count == 0) {
-            call.resolve([
-                "value": true
-            ])
-        }
-        else {            
-            for key in keys {
-                let hasValueStandard = KeychainWrapper.standard.hasValue(forKey: key)
-                if (hasValueStandard) {
-                    let removeStandardSuccessful = KeychainWrapper.standard.removeObject(forKey: key)
-                    if (!removeStandardSuccessful) {
-                        call.reject("error")
-                    }
-                }
-            }
-            
-            let clearSuccessful: Bool = keychainwrapper.removeAllKeys()
-            if(clearSuccessful) {
-                call.resolve([
-                    "value": clearSuccessful
-                ])
-            }
-            else {
-                call.reject("error")
-            }
+        run(call) {
+            try keychain.removeAll()
+            call.resolve(["value": true])
         }
     }
-    
+
     @objc func getPlatform(_ call: CAPPluginCall) {
-        call.resolve([
-            "value": "ios"
-        ])
+        call.resolve(["value": "ios"])
+    }
+
+    static let notFoundMessage = "Item with given key does not exist"
+
+    /// Rejects with the keychain's message and OSStatus as code, so JS can tell
+    /// e.g. a locked device (-25308) from a missing key.
+    private func run(_ call: CAPPluginCall, _ body: () throws -> Void) {
+        do {
+            try body()
+        } catch let error as KeychainError {
+            call.reject(error.message, String(error.status), error)
+        } catch {
+            call.reject(error.localizedDescription, nil, error)
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-secure-storage-plugin",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Securely store secrets such as usernames, passwords, tokens, certificates or other sensitive information (strings) on iOS & Android",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -11,7 +11,6 @@
     "android/build.gradle",
     "dist/",
     "ios/Sources",
-    "ios/Tests",
     "Package.swift",
     "CapacitorSecureStoragePlugin.podspec"
   ],
@@ -36,7 +35,7 @@
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
     "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
-    "eslint": "eslint . --ext ts",
+    "eslint": "eslint",
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api SecureStoragePluginPlugin --output-readme README.md --output-json dist/docs.json",
@@ -46,31 +45,28 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^8.0.0",
-    "@capacitor/cli": "^8.0.0",
-    "@capacitor/core": "^8.0.0",
+    "@capacitor/android": "^8.6.2",
+    "@capacitor/cli": "^8.6.2",
+    "@capacitor/core": "^8.6.2",
     "@capacitor/docgen": "^0.3.1",
-    "@capacitor/ios": "^8.0.0",
-    "@ionic/eslint-config": "^0.4.0",
+    "@capacitor/ios": "^8.6.2",
+    "@ionic/eslint-config": "^0.5.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
-    "eslint": "^8.57.1",
-    "prettier": "^3.6.2",
-    "prettier-plugin-java": "^2.7.7",
-    "release-it": "^17.2.1",
-    "rimraf": "^6.1.0",
-    "rollup": "^4.53.2",
+    "eslint": "^10.14.0",
+    "prettier": "^3.10.1",
+    "prettier-plugin-java": "^2.11.0",
+    "release-it": "^21.1.2",
+    "rimraf": "^6.1.4",
+    "rollup": "^4.68.3",
     "swiftlint": "^2.0.0",
-    "typescript": "^5.9.3"
+    "typescript": "~6.0.3"
   },
   "peerDependencies": {
     "@capacitor/core": ">=8.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
-  "eslintConfig": {
-    "extends": "@ionic/eslint-config/recommended"
-  },
   "capacitor": {
     "ios": {
       "src": "ios"

package/ios/Tests/SecureStoragePluginTests/SecureStoragePluginTests.swift

@@ -1,247 +0,0 @@
-import XCTest
-import Capacitor
-import SwiftKeychainWrapper
-
-@testable import Plugin
-
-class PluginTests: XCTestCase {
-    
-    func setupDedicatedWrapper() -> KeychainWrapper {
-        let wrapper = KeychainWrapper.init(serviceName: "cap_sec")
-        wrapper.removeAllKeys()
-        return wrapper
-    }
-    
-    func testSet() {
-        let key = "key"
-        let value = "Hello, World!"
-        let valueModified = "Modified"
-        let keychainwrapper = setupDedicatedWrapper()
-        KeychainWrapper.standard.set(value, forKey: key)
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key,
-            "value": valueModified
-            ], success: { (result, call) in
-                let resultValue = result!.data?["value"] as? Bool
-                XCTAssertTrue(resultValue ?? false)
-                // dedicated keychain wrapper
-                let dedicatedValue = keychainwrapper.string(forKey: key)
-                XCTAssertEqual(valueModified, dedicatedValue)
-                // standard keychain wrapper should not be modified
-                let standardValue = KeychainWrapper.standard.string(forKey: key)
-                XCTAssertEqual(value, standardValue)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.set(call!)
-    }
-    
-    func testGet() {
-        let key = "key"
-        let value = "Hello, World!"
-        let keychainwrapper = setupDedicatedWrapper()
-        keychainwrapper.set(value, forKey: key)
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-            ], success: { (result, call) in
-                let resultValue = result!.data?["value"] as? String
-                XCTAssertEqual(value, resultValue)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.get(call!)
-    }
-    
-    func testGetCopy() {
-        let key = "key"
-        let value = "Hello, World!"
-        let keychainwrapper = setupDedicatedWrapper()
-        
-        KeychainWrapper.standard.set(value, forKey: key)
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-            ], success: { (result, call) in
-                let resultValue = result!.data?["value"] as? String
-                XCTAssertEqual(value, resultValue)
-                let dedicatedValue = keychainwrapper.string(forKey: key)
-                XCTAssertEqual(value, dedicatedValue)
-                let standardValue = KeychainWrapper.standard.string(forKey: key)
-                XCTAssertNil(standardValue)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.get(call!)
-    }
-    
-    func testKeys() {
-        let key = "key"
-        let key2 = "key2"
-        let value = "value"
-
-        let plugin = SecureStoragePlugin()
-
-        let keychainwrapper = setupDedicatedWrapper()
-        keychainwrapper.set(value, forKey: key)
-        keychainwrapper.set(value, forKey: key2)
-
-
-        let callOne = CAPPluginCall(callbackId: "test", options: [:],
-                                    success: { (result, call) in
-                let resultValue = result!.data?["value"] as? Array<String>
-                XCTAssertEqual(2, resultValue!.count)
-            XCTAssertTrue(resultValue!.contains(key))
-            XCTAssertTrue(resultValue!.contains(key2))
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        plugin.keys(callOne!)
-    }
-    
-    func testNonExistingGet() {
-        let key = "keyNonExisting"
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-            ], success: { (result, call) in
-                XCTFail("Error shouldn't have been called")
-        }, error: { (err) in
-            XCTAssertNotNil(err)
-        })
-        
-        plugin.get(call!)
-    }
-    
-    func testNonExistingRemoveBoth() {
-        let key = "keyNonExisting"
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-        ], success: { (result, call) in
-            XCTFail("Error shouldn't have been called")
-        }, error: { (err) in
-            XCTAssertNotNil(err)
-        })
-        
-        plugin.remove(call!)
-    }
-    
-    func testRemoveBoth() {
-        let key = "key"
-        let value = "Hello, World!"
-        // prefill dedicated keychain wrapper
-        let keychainwrapper = setupDedicatedWrapper()
-        keychainwrapper.set(value, forKey: key)
-        // prefill standard keychain wrapper
-        KeychainWrapper.standard.set(value, forKey: key)
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-            ], success: { (result, call) in
-                let resultValue = result!.data?["value"] as? Bool
-                XCTAssertTrue(resultValue ?? false)
-                // dedicated keychain wrapper
-                let dedicatedValue = keychainwrapper.string(forKey: key)
-                XCTAssertNil(dedicatedValue)
-                // standard keychain wrapper
-                let standardValueRemoved = KeychainWrapper.standard.string(forKey: key)
-                XCTAssertNil(standardValueRemoved)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.remove(call!)
-    }
-    
-    // same as testRemoveBoth, but don't prefill standard wrapper
-    func testRemove() {
-        let key = "key"
-        let value = "Hello, World!"
-        // prefill dedicated keychain wrapper
-        let keychainwrapper = setupDedicatedWrapper()
-        keychainwrapper.set(value, forKey: key)
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-            ], success: { (result, call) in
-                let resultValue = result!.data?["value"] as? Bool
-                XCTAssertTrue(resultValue ?? false)
-                // dedicated keychain wrapper
-                let dedicatedValue = keychainwrapper.string(forKey: key)
-                XCTAssertNil(dedicatedValue)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.remove(call!)
-    }
-    
-    func testClear() {
-        let key = "key"
-        let value = "Hello, World!"
-        let standardOnlyKey = "standard key"
-        let standardOnlyValue = "standard value"
-        // prefill dedicated keychain wrapper
-        let keychainwrapper = setupDedicatedWrapper()
-        keychainwrapper.set(value, forKey: key)
-        keychainwrapper.set(value + "2", forKey: key + "2")
-        // prefill standard keychain wrapper
-        KeychainWrapper.standard.set(value, forKey: key)
-        KeychainWrapper.standard.set(standardOnlyValue, forKey: standardOnlyKey)
-        
-        let plugin = SecureStoragePlugin()
-        
-        let call = CAPPluginCall(callbackId: "test", options: [
-            "key": key
-            ], success: { (result, call) in
-                let resultValue = result!.data?["value"] as? Bool
-                XCTAssertTrue(resultValue ?? false)
-                // key present in dedicated and standard wrapper removed
-                let dedicatedValue = keychainwrapper.string(forKey: key)
-                XCTAssertNil(dedicatedValue)
-                let dedicatedValue2 = keychainwrapper.string(forKey: key + "2")
-                XCTAssertNil(dedicatedValue2)
-                let standardValue = KeychainWrapper.standard.string(forKey: key)
-                XCTAssertNil(standardValue)
-                // key only defined in standard wrapper still present
-                let standardValue2 = KeychainWrapper.standard.string(forKey: standardOnlyKey)
-                XCTAssertEqual(standardOnlyValue, standardValue2)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.clear(call!)
-    }
-    
-    func testGetPlatform() {
-        let plugin = SecureStoragePlugin()
-        let call = CAPPluginCall(callbackId: "test",
-                                 success: { (result, call) in
-                let resultValue = result!.data?["value"] as? String
-                XCTAssertEqual("ios", resultValue)
-        }, error: { (err) in
-            XCTFail("Error shouldn't have been called")
-        })
-        
-        plugin.getPlatform(call!)
-    }
-}