commit 898acd5231ac6f25f007cd46cc11f5b2c11d92e9
parent f1bb171ba02682e0b1557a8b2c39ae3ea6950ed4
Author: triesap <137732411+triesap@users.noreply.github.com>
Date: Sun, 25 Aug 2024 11:46:15 +0000
Add keystore
Diffstat:
6 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-dialog')
implementation project(':radroots-capacitor-sqlite')
+ implementation project(':radroots-capacitor-secure-storage')
}
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -7,3 +7,6 @@ project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/
include ':radroots-capacitor-sqlite'
project(':radroots-capacitor-sqlite').projectDir = new File('../../../packages/capacitor-sqlite/android')
+
+include ':radroots-capacitor-secure-storage'
+project(':radroots-capacitor-secure-storage').projectDir = new File('../../../packages/capacitor-secure-storage/android')
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -13,6 +13,7 @@ def capacitor_pods
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog'
pod 'RadrootsCapacitorSqlite', :path => '../../../../packages/capacitor-sqlite'
+ pod 'RadrootsCapacitorSecureStorage', :path => '../../../../packages/capacitor-secure-storage'
end
target 'App' do
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -4,6 +4,10 @@ PODS:
- CapacitorCordova (6.1.2)
- CapacitorDialog (6.0.1):
- Capacitor
+ - KeychainSwift (21.0.0)
+ - RadrootsCapacitorSecureStorage (6.0.1):
+ - Capacitor
+ - KeychainSwift (~> 21.0)
- RadrootsCapacitorSqlite (6.0.1):
- Capacitor
- SQLCipher
@@ -19,10 +23,12 @@ DEPENDENCIES:
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog`)"
+ - RadrootsCapacitorSecureStorage (from `../../../../packages/capacitor-secure-storage`)
- RadrootsCapacitorSqlite (from `../../../../packages/capacitor-sqlite`)
SPEC REPOS:
trunk:
+ - KeychainSwift
- SQLCipher
- ZIPFoundation
@@ -33,6 +39,8 @@ EXTERNAL SOURCES:
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios"
CapacitorDialog:
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog"
+ RadrootsCapacitorSecureStorage:
+ :path: "../../../../packages/capacitor-secure-storage"
RadrootsCapacitorSqlite:
:path: "../../../../packages/capacitor-sqlite"
@@ -40,10 +48,12 @@ SPEC CHECKSUMS:
Capacitor: 679f9673fdf30597493a6362a5d5bf233d46abc2
CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
CapacitorDialog: ad752191fdb22a8d0ac199b0754b8a021d86dbf9
+ KeychainSwift: 4a71a45c802fd9e73906457c2dcbdbdc06c9419d
+ RadrootsCapacitorSecureStorage: d95a1648c105ddf18a1b0612528e0ce1f77b789e
RadrootsCapacitorSqlite: 11b1be8786af151612ee8e058d16f4979c2e3b1c
SQLCipher: 77fbe633cd84db04b07876dd50766b4924b57d61
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
-PODFILE CHECKSUM: dd63ec13f036d53db3e3d0a7f2163fe002556b23
+PODFILE CHECKSUM: abddc1680d6f1adb6422262db160c058b623a4d3
COCOAPODS: 1.15.2
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
"@capacitor/ios": "^6.0.0",
"@ionic/pwa-elements": "^3.3.0",
"@radroots/capacitor-sqlite": "workspace:*",
+ "@radroots/capacitor-secure-storage": "workspace:*",
"@radroots/client": "workspace:*",
"@radroots/jeep-sqlite": "workspace:*",
"@radroots/svelte-lib": "workspace:*",
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -6,6 +6,7 @@
import LayoutWindow from "$lib/components/layout-window.svelte";
import {
app_config,
+ app_key,
app_lo,
app_pwa_polyfills,
app_render,
@@ -64,7 +65,11 @@
app_config.subscribe(async (app_config) => {
try {
if (!app_config) return;
- $app_sqlite = !!(await cl.db.connect(PUBLIC_DATABASE_NAME));
+ app_sqlite.set(!!(await cl.db.connect(PUBLIC_DATABASE_NAME)));
+
+ const nostr_key = await cl.keystore.get(`nostr:key`);
+ if(typeof nostr_key === `string` && nostr_key) app_key.set(nostr_key);
+ console.log(`nostr_key `, nostr_key);
} catch (e) {
console.log(`(app_config) error `, e);
} finally {
