capacitor-secure-storage-plugin 0.6.2 → 0.6.4-testing

package/CapacitorSecureStoragePlugin.podspec

@@ -1,13 +1,18 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
 Pod::Spec.new do |s|
   s.name = 'CapacitorSecureStoragePlugin'
-  s.version = '0.6.2'
-  s.summary = 'securely store secrets such as usernames, passwords, tokens, certificates or other sensitive information (strings) on iOS & Android'
-  s.license = 'MIT'
-  s.homepage = 'https://github.com/martinkasa/capacitor-secure-storage-plugin.git'
-  s.author = 'martinkasa'
-  s.source = { :git => 'https://github.com/martinkasa/capacitor-secure-storage-plugin.git', :tag => s.version.to_s }
+  s.version = package['version']
+  s.summary = package['description']
+  s.license = package['license']
+  s.homepage = package['repository']['url']
+  s.author = package['author']
+  s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '12.0'
   s.dependency 'Capacitor'
   s.dependency 'SwiftKeychainWrapper'
-end 
+  s.swift_version = '5.1'
+end

package/README.md

@@ -42,9 +42,9 @@ First line is needed because of web part of the plugin (current behavior of Capa
 
 ### Android
 
-In Android you have to register plugins manually in MainActivity class of your app.
+In Android with Capacitor v2 you have to register plugins manually in MainActivity class of your app.
 
-https://capacitor.ionicframework.com/docs/plugins/android/#export-to-capacitor
+https://capacitorjs.com/docs/v2/plugins/android#export-to-capacitor
 
 ```
 import com.whitestein.securestorage.SecureStoragePlugin;

package/android/build.gradle

@@ -1,7 +1,8 @@
 ext {
-    junitVersion =  project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.12'
-    androidxJunitVersion =  project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.1'
-    androidxEspressoCoreVersion =  project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.2.0'
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.1'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.2.0'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.2'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.3.0'
 }
 
 buildscript {
@@ -10,17 +11,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 29
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 29
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -34,18 +35,23 @@ android {
     lintOptions {
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {
     google()
-    jcenter()
     mavenCentral()
+    jcenter()
 }
 
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,3 @@
-
-  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.whitestein.securestorage.capacitorsecurestorageplugin">
-  </manifest>
-  
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.whitestein.securestorage">
+</manifest>

package/android/src/main/java/com/whitestein/securestorage/{SecureStoragePlugin.java → SecureStoragePluginPlugin.java}

@@ -1,7 +1,6 @@
 package com.whitestein.securestorage;
 
 import android.content.Context;
-
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.NativePlugin;
@@ -9,12 +8,12 @@ import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
-
 import java.nio.charset.Charset;
 import java.util.Set;
 
-@CapacitorPlugin()
-public class SecureStoragePlugin extends Plugin {
+@CapacitorPlugin(name = "SecureStoragePlugin")
+public class SecureStoragePluginPlugin extends Plugin {
+
     private PasswordStorageHelper passwordStorageHelper;
 
     @Override
@@ -27,43 +26,52 @@ public class SecureStoragePlugin extends Plugin {
         this.passwordStorageHelper = new PasswordStorageHelper(context);
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void set(PluginCall call) {
         String key = call.getString("key");
         String value = call.getString("value");
+        if(value == null) {
+            value = "";
+        }
+
         try {
-            call.resolve(this._set(key,value));
+            call.resolve(this._set(key, value));
         } catch (Exception exception) {
             call.reject(exception.getMessage(), exception);
         }
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void get(PluginCall call) {
         String key = call.getString("key");
         try {
-          call.resolve(this._get(key));
+            call.resolve(this._get(key));
         } catch (Exception exception) {
             call.reject(exception.getMessage(), exception);
         }
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void keys(PluginCall call) {
         call.resolve(this._keys());
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void remove(PluginCall call) {
         String key = call.getString("key");
         try {
-            call.resolve(this._remove(key));
+            if(this.has(key)) {
+                call.resolve(this._remove(key));
+            }
+            else {
+                call.reject("Item with given key does not exist");
+            }
         } catch (Exception exception) {
             call.reject(exception.getMessage(), exception);
         }
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void clear(PluginCall call) {
         try {
             call.resolve(this._clear());
@@ -72,7 +80,7 @@ public class SecureStoragePlugin extends Plugin {
         }
     }
 
-    @PluginMethod()
+    @PluginMethod
     public void getPlatform(PluginCall call) {
         call.resolve(this._getPlatform());
     }
@@ -84,9 +92,18 @@ public class SecureStoragePlugin extends Plugin {
         return ret;
     }
 
+    public boolean has(String key) throws Exception {
+        byte[] buffer = this.passwordStorageHelper.getData(key);
+        if (buffer != null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public JSObject _get(String key) throws Exception {
         byte[] buffer = this.passwordStorageHelper.getData(key);
-        if (buffer != null && buffer.length > 0) {
+        if (buffer != null) {
             String value = new String(buffer, Charset.forName("UTF-8"));
             JSObject ret = new JSObject();
             ret.put("value", value);
@@ -122,5 +139,4 @@ public class SecureStoragePlugin extends Plugin {
         ret.put("value", "android");
         return ret;
     }
-
 }

package/dist/docs.json

@@ -0,0 +1,93 @@
+{
+  "api": {
+    "name": "SecureStoragePluginPlugin",
+    "slug": "securestoragepluginplugin",
+    "docs": "",
+    "tags": [],
+    "methods": [
+      {
+        "name": "get",
+        "signature": "(options: { key: string; }) => Promise<{ value: string; }>",
+        "parameters": [
+          {
+            "name": "options",
+            "docs": "",
+            "type": "{ key: string; }"
+          }
+        ],
+        "returns": "Promise<{ value: string; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "get"
+      },
+      {
+        "name": "set",
+        "signature": "(options: { key: string; value: string; }) => Promise<{ value: boolean; }>",
+        "parameters": [
+          {
+            "name": "options",
+            "docs": "",
+            "type": "{ key: string; value: string; }"
+          }
+        ],
+        "returns": "Promise<{ value: boolean; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "set"
+      },
+      {
+        "name": "remove",
+        "signature": "(options: { key: string; }) => Promise<{ value: boolean; }>",
+        "parameters": [
+          {
+            "name": "options",
+            "docs": "",
+            "type": "{ key: string; }"
+          }
+        ],
+        "returns": "Promise<{ value: boolean; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "remove"
+      },
+      {
+        "name": "clear",
+        "signature": "() => Promise<{ value: boolean; }>",
+        "parameters": [],
+        "returns": "Promise<{ value: boolean; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "clear"
+      },
+      {
+        "name": "keys",
+        "signature": "() => Promise<{ value: string[]; }>",
+        "parameters": [],
+        "returns": "Promise<{ value: string[]; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "keys"
+      },
+      {
+        "name": "getPlatform",
+        "signature": "() => Promise<{ value: string; }>",
+        "parameters": [],
+        "returns": "Promise<{ value: string; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "getplatform"
+      }
+    ],
+    "properties": []
+  },
+  "interfaces": [],
+  "enums": [],
+  "typeAliases": [],
+  "pluginConfigs": []
+}

package/dist/esm/definitions.js

@@ -1 +1,2 @@
+export {};
 //# sourceMappingURL=definitions.js.map

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":""}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface SecureStoragePluginPlugin {\n  get(options: { key: string }): Promise<{ value: string }>;\n  set(options: { key: string; value: string }): Promise<{ value: boolean }>;\n  remove(options: { key: string }): Promise<{ value: boolean }>;\n  clear(): Promise<{ value: boolean }>;\n  keys(): Promise<{ value: string[] }>;\n  getPlatform(): Promise<{ value: string }>;\n}\n"]}

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import { registerPlugin } from '@capacitor/core';
 const SecureStoragePlugin = registerPlugin('SecureStoragePlugin', {
-    web: () => import('./web').then((m) => new m.SecureStoragePluginWeb()),
+    web: () => import('./web').then(m => new m.SecureStoragePluginWeb()),
 });
 export * from './definitions';
 export { SecureStoragePlugin };

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,MAAM,mBAAmB,GAAG,cAAc,CAA4B,qBAAqB,EAAE;IAC3F,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,sBAAsB,EAAE,CAAC;CACvE,CAAC,CAAC;AAEH,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,MAAM,mBAAmB,GAAG,cAAc,CACxC,qBAAqB,EACrB;IACE,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,sBAAsB,EAAE,CAAC;CACrE,CACF,CAAC;AAEF,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,CAAC","sourcesContent":["import { registerPlugin } from '@capacitor/core';\n\nimport type { SecureStoragePluginPlugin } from './definitions';\n\nconst SecureStoragePlugin = registerPlugin<SecureStoragePluginPlugin>(\n  'SecureStoragePlugin',\n  {\n    web: () => import('./web').then(m => new m.SecureStoragePluginWeb()),\n  },\n);\n\nexport * from './definitions';\nexport { SecureStoragePlugin };\n"]}

package/dist/esm/web.d.ts

@@ -1,8 +1,7 @@
 import { WebPlugin } from '@capacitor/core';
-import { SecureStoragePluginPlugin } from './definitions';
+import type { SecureStoragePluginPlugin } from './definitions';
 export declare class SecureStoragePluginWeb extends WebPlugin implements SecureStoragePluginPlugin {
     PREFIX: string;
-    constructor();
     get(options: {
         key: string;
     }): Promise<{
@@ -29,6 +28,5 @@ export declare class SecureStoragePluginWeb extends WebPlugin implements SecureS
         value: string;
     }>;
     private addPrefix;
+    private removePrefix;
 }
-declare const SecureStoragePlugin: SecureStoragePluginWeb;
-export { SecureStoragePlugin };

package/dist/esm/web.js

@@ -1,17 +1,16 @@
 import { WebPlugin } from '@capacitor/core';
 export class SecureStoragePluginWeb extends WebPlugin {
     constructor() {
-        super({
-            name: 'SecureStoragePlugin',
-            platforms: ['web'],
-        });
+        super(...arguments);
         this.PREFIX = 'cap_sec_';
         this.addPrefix = (key) => this.PREFIX + key;
+        this.removePrefix = (key) => key.replace(this.PREFIX, '');
     }
     get(options) {
-        return localStorage.getItem(this.addPrefix(options.key)) !== null
+        const value = localStorage.getItem(this.addPrefix(options.key));
+        return value !== null
             ? Promise.resolve({
-                value: atob(localStorage.getItem(this.addPrefix(options.key))),
+                value: atob(value),
             })
             : Promise.reject('Item with given key does not exist');
     }
@@ -20,8 +19,13 @@ export class SecureStoragePluginWeb extends WebPlugin {
         return Promise.resolve({ value: true });
     }
     remove(options) {
-        localStorage.removeItem(this.addPrefix(options.key));
-        return Promise.resolve({ value: true });
+        if (localStorage.getItem(this.addPrefix(options.key))) {
+            localStorage.removeItem(this.addPrefix(options.key));
+            return Promise.resolve({ value: true });
+        }
+        else {
+            return Promise.reject('Item with given key does not exist');
+        }
     }
     clear() {
         for (const key in localStorage) {
@@ -32,13 +36,13 @@ export class SecureStoragePluginWeb extends WebPlugin {
         return Promise.resolve({ value: true });
     }
     keys() {
-        const keys = Object.keys(localStorage).filter((k) => k.indexOf(this.PREFIX) === 0);
+        const keys = Object.keys(localStorage)
+            .filter(k => k.indexOf(this.PREFIX) === 0)
+            .map(this.removePrefix);
         return Promise.resolve({ value: keys });
     }
     getPlatform() {
         return Promise.resolve({ value: 'web' });
     }
 }
-const SecureStoragePlugin = new SecureStoragePluginWeb();
-export { SecureStoragePlugin };
 //# sourceMappingURL=web.js.map

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,sBAAuB,SAAQ,SAAS;IAEnD;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,qBAAqB;YAC3B,SAAS,EAAE,CAAC,KAAK,CAAC;SACnB,CAAC,CAAC;QALL,WAAM,GAAG,UAAU,CAAC;QAwCZ,cAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;IAlCvD,CAAC;IAED,GAAG,CAAC,OAAwB;QAC1B,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI;YAC/D,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;gBACd,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;aAC/D,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,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAClC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aAC9B;SACF;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,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACnF,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;CAGF;AAED,MAAM,mBAAmB,GAAG,IAAI,sBAAsB,EAAE,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"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;YACrD,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;SACzC;aAAM;YACL,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;SAC7D;IACH,CAAC;IACD,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAClC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aAC9B;SACF;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"]}

package/dist/plugin.cjs.js

@@ -0,0 +1,64 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var core = require('@capacitor/core');
+
+const SecureStoragePlugin = core.registerPlugin('SecureStoragePlugin', {
+    web: () => Promise.resolve().then(function () { return web; }).then(m => new m.SecureStoragePluginWeb()),
+});
+
+class SecureStoragePluginWeb extends core.WebPlugin {
+    constructor() {
+        super(...arguments);
+        this.PREFIX = 'cap_sec_';
+        this.addPrefix = (key) => this.PREFIX + key;
+        this.removePrefix = (key) => key.replace(this.PREFIX, '');
+    }
+    get(options) {
+        const value = localStorage.getItem(this.addPrefix(options.key));
+        return value !== null
+            ? Promise.resolve({
+                value: atob(value),
+            })
+            : Promise.reject('Item with given key does not exist');
+    }
+    set(options) {
+        localStorage.setItem(this.addPrefix(options.key), btoa(options.value));
+        return Promise.resolve({ value: true });
+    }
+    remove(options) {
+        if (localStorage.getItem(this.addPrefix(options.key))) {
+            localStorage.removeItem(this.addPrefix(options.key));
+            return Promise.resolve({ value: true });
+        }
+        else {
+            return Promise.reject('Item with given key does not exist');
+        }
+    }
+    clear() {
+        for (const key in localStorage) {
+            if (key.indexOf(this.PREFIX) === 0) {
+                localStorage.removeItem(key);
+            }
+        }
+        return Promise.resolve({ value: true });
+    }
+    keys() {
+        const keys = Object.keys(localStorage)
+            .filter(k => k.indexOf(this.PREFIX) === 0)
+            .map(this.removePrefix);
+        return Promise.resolve({ value: keys });
+    }
+    getPlatform() {
+        return Promise.resolve({ value: 'web' });
+    }
+}
+
+var web = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    SecureStoragePluginWeb: SecureStoragePluginWeb
+});
+
+exports.SecureStoragePlugin = SecureStoragePlugin;
+//# sourceMappingURL=plugin.cjs.js.map

package/dist/plugin.cjs.js.map

@@ -0,0 +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,CAAC;AAC5B,QAAQ,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;AACjC,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;AACpD,QAAQ,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAClE,KAAK;AACL,IAAI,GAAG,CAAC,OAAO,EAAE;AACjB,QAAQ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AACxE,QAAQ,OAAO,KAAK,KAAK,IAAI;AAC7B,cAAc,OAAO,CAAC,OAAO,CAAC;AAC9B,gBAAgB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;AAClC,aAAa,CAAC;AACd,cAAc,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;AACnE,KAAK;AACL,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,CAAC;AAC/E,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAChD,KAAK;AACL,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,CAAC;AACjE,YAAY,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACpD,SAAS;AACT,aAAa;AACb,YAAY,OAAO,OAAO,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC;AACxE,SAAS;AACT,KAAK;AACL,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,CAAC;AAC7C,aAAa;AACb,SAAS;AACT,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAChD,KAAK;AACL,IAAI,IAAI,GAAG;AACX,QAAQ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;AAC9C,aAAa,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACtD,aAAa,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACpC,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAChD,KAAK;AACL,IAAI,WAAW,GAAG;AAClB,QAAQ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AACjD,KAAK;AACL;;;;;;;;;"}

package/dist/plugin.js

@@ -0,0 +1,67 @@
+var capacitorSecureStoragePlugin = (function (exports, core) {
+    'use strict';
+
+    const SecureStoragePlugin = core.registerPlugin('SecureStoragePlugin', {
+        web: () => Promise.resolve().then(function () { return web; }).then(m => new m.SecureStoragePluginWeb()),
+    });
+
+    class SecureStoragePluginWeb extends core.WebPlugin {
+        constructor() {
+            super(...arguments);
+            this.PREFIX = 'cap_sec_';
+            this.addPrefix = (key) => this.PREFIX + key;
+            this.removePrefix = (key) => key.replace(this.PREFIX, '');
+        }
+        get(options) {
+            const value = localStorage.getItem(this.addPrefix(options.key));
+            return value !== null
+                ? Promise.resolve({
+                    value: atob(value),
+                })
+                : Promise.reject('Item with given key does not exist');
+        }
+        set(options) {
+            localStorage.setItem(this.addPrefix(options.key), btoa(options.value));
+            return Promise.resolve({ value: true });
+        }
+        remove(options) {
+            if (localStorage.getItem(this.addPrefix(options.key))) {
+                localStorage.removeItem(this.addPrefix(options.key));
+                return Promise.resolve({ value: true });
+            }
+            else {
+                return Promise.reject('Item with given key does not exist');
+            }
+        }
+        clear() {
+            for (const key in localStorage) {
+                if (key.indexOf(this.PREFIX) === 0) {
+                    localStorage.removeItem(key);
+                }
+            }
+            return Promise.resolve({ value: true });
+        }
+        keys() {
+            const keys = Object.keys(localStorage)
+                .filter(k => k.indexOf(this.PREFIX) === 0)
+                .map(this.removePrefix);
+            return Promise.resolve({ value: keys });
+        }
+        getPlatform() {
+            return Promise.resolve({ value: 'web' });
+        }
+    }
+
+    var web = /*#__PURE__*/Object.freeze({
+        __proto__: null,
+        SecureStoragePluginWeb: SecureStoragePluginWeb
+    });
+
+    exports.SecureStoragePlugin = SecureStoragePlugin;
+
+    Object.defineProperty(exports, '__esModule', { value: true });
+
+    return exports;
+
+})({}, capacitorExports);
+//# sourceMappingURL=plugin.js.map

package/dist/plugin.js.map

@@ -0,0 +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":"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"}

package/ios/Plugin/{Plugin.swift → SecureStoragePluginPlugin.swift}

@@ -13,7 +13,7 @@ public class SecureStoragePlugin: CAPPlugin {
     @objc func set(_ call: CAPPluginCall) {
         let key = call.getString("key") ?? ""
         let value = call.getString("value") ?? ""
-        let saveSuccessful: Bool = keychainwrapper.set(value, forKey: key)
+        let saveSuccessful: Bool = keychainwrapper.set(value, forKey: key, withAccessibility: .always)
         if(saveSuccessful) {
             call.resolve([
                 "value": saveSuccessful
@@ -33,7 +33,8 @@ public class SecureStoragePlugin: CAPPlugin {
         if (hasValueStandard && !hasValueDedicated) {
             let syncValueSuccessful: Bool = keychainwrapper.set(
                 KeychainWrapper.standard.string(forKey: key) ?? "",
-                forKey: key
+                forKey: key,
+                withAccessibility: .always
             )
             let removeValueSuccessful: Bool = KeychainWrapper.standard.removeObject(forKey: key)
             if (!syncValueSuccessful || !removeValueSuccessful) {
@@ -60,15 +61,23 @@ public class SecureStoragePlugin: CAPPlugin {
     
     @objc func remove(_ call: CAPPluginCall) {
         let key = call.getString("key") ?? ""
-        KeychainWrapper.standard.removeObject(forKey: key);
-        let removeDedicatedSuccessful: Bool = keychainwrapper.removeObject(forKey: key)
-        if(removeDedicatedSuccessful) {
-            call.resolve([
-                "value": removeDedicatedSuccessful
-            ])
+        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
+                ])
+            }
+            else {
+                call.reject("Remove failed")
+            }
         }
         else {
-            call.reject("error")
+            call.reject("Item with given key does not exist")
         }
     }