diff --git a/package.json b/package.json index 1ab1f73490..7a41853f6d 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,6 @@ "@capawesome/capacitor-background-task": "^2.0.0", "@excalidraw/excalidraw": "0.12.0", "@hugotomazi/capacitor-navigation-bar": "^2.0.0", - "@kanru/rage-wasm": "^0.3.0", "@logseq/capacitor-file-sync": "0.0.14", "@logseq/react-tweet-embed": "1.3.1-1", "@sentry/react": "^6.18.2", diff --git a/public/index.html b/public/index.html index 1e9b028904..e349699235 100644 --- a/public/index.html +++ b/public/index.html @@ -53,7 +53,6 @@ - diff --git a/resources/electron.html b/resources/electron.html index 9fed5e4143..92cbab5289 100644 --- a/resources/electron.html +++ b/resources/electron.html @@ -54,7 +54,6 @@ const portal = new MagicPortal(worker); - diff --git a/resources/index.html b/resources/index.html index 8b59a2801f..996a771bc2 100644 --- a/resources/index.html +++ b/resources/index.html @@ -53,7 +53,6 @@ const portal = new MagicPortal(worker); - diff --git a/shadow-cljs.edn b/shadow-cljs.edn index a40bd34193..5d191e6cea 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -16,9 +16,6 @@ :code-editor {:entries [frontend.extensions.code] :depends-on #{:main}} - :age-encryption - {:entries [frontend.extensions.age-encryption] - :depends-on #{:main}} :excalidraw {:entries [frontend.extensions.excalidraw] :depends-on #{:main}} @@ -83,9 +80,6 @@ :code-editor {:entries [frontend.extensions.code] :depends-on #{:main}} - :age-encryption - {:entries [frontend.extensions.age-encryption] - :depends-on #{:main}} :excalidraw {:entries [frontend.extensions.excalidraw] :depends-on #{:main}} diff --git a/src/electron/electron/core.cljs b/src/electron/electron/core.cljs index 8b616105f9..28994be9fb 100644 --- a/src/electron/electron/core.cljs +++ b/src/electron/electron/core.cljs @@ -137,7 +137,7 @@ ;; TODO: ugly, replace with ls-files and filter with ".map" _ (p/all (map (fn [file] (. fs removeSync (path/join static-dir "js" (str file ".map")))) - ["main.js" "code-editor.js" "excalidraw.js" "age-encryption.js"]))] + ["main.js" "code-editor.js" "excalidraw.js"]))] (send-to-renderer :notification diff --git a/src/main/frontend/encrypt.cljs b/src/main/frontend/encrypt.cljs index 62f6281278..fe92fa45c5 100644 --- a/src/main/frontend/encrypt.cljs +++ b/src/main/frontend/encrypt.cljs @@ -4,7 +4,6 @@ [frontend.util :as util] [promesa.core :as p] [electron.ipc :as ipc] - [shadow.loader :as loader] [frontend.mobile.util :as mobile-util])) (defn encrypt-with-passphrase @@ -22,10 +21,7 @@ :data) :else - (p/let [lazy-encrypt-with-user-passphrase (resolve 'frontend.extensions.age-encryption/encrypt-with-user-passphrase) - content (utf8/encode content) - encrypted (@lazy-encrypt-with-user-passphrase passphrase content true)] - (utf8/decode encrypted)))) + nil)) (defn decrypt-with-passphrase [passphrase content] @@ -42,8 +38,4 @@ :data) :else - (p/let [_ (loader/load :age-encryption) - lazy-decrypt-with-user-passphrase (resolve 'frontend.extensions.age-encryption/decrypt-with-user-passphrase) - content (utf8/encode content) - decrypted (lazy-decrypt-with-user-passphrase passphrase content)] - (utf8/decode decrypted)))) + nil)) diff --git a/src/main/frontend/extensions/age_encryption.cljs b/src/main/frontend/extensions/age_encryption.cljs deleted file mode 100644 index 0b0be977ea..0000000000 --- a/src/main/frontend/extensions/age_encryption.cljs +++ /dev/null @@ -1,23 +0,0 @@ -(ns frontend.extensions.age-encryption - (:require ["regenerator-runtime/runtime"] ;; required for async npm module - ["@kanru/rage-wasm" :as rage])) - -(defn keygen - [] - (rage/keygen)) - -(defn encrypt-with-x25519 - [public-key content armor] - (rage/encrypt_with_x25519 public-key content armor)) - -(defn decrypt-with-x25519 - [secret-key content] - (rage/decrypt_with_x25519 secret-key content)) - -(defn encrypt-with-user-passphrase - [passphrase content armor] - (rage/encrypt_with_user_passphrase passphrase content armor)) - -(defn decrypt-with-user-passphrase - [passphrase content] - (rage/decrypt_with_user_passphrase passphrase content)) diff --git a/yarn.lock b/yarn.lock index ddfb1c2386..3ab36cf62f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -487,11 +487,6 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@kanru/rage-wasm@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@kanru/rage-wasm/-/rage-wasm-0.3.0.tgz#de96b1fda1f781ff401d43b50d0f95b7338c4399" - integrity sha512-2LMRS27nNJPqFNpRQL7kXG0kgBeIPo63KM6u0Xu6Es5XIS7LP4MFtdHkCg8Pt7IhMM7GuOa2YnzAZgKBxE1lcw== - "@logseq/capacitor-file-sync@0.0.14": version "0.0.14" resolved "https://registry.yarnpkg.com/@logseq/capacitor-file-sync/-/capacitor-file-sync-0.0.14.tgz#f358f42e95e0578c2853477a66491c8f221a7c15"