diff options
| -rw-r--r-- | src/lib/nostr.ts | 7 | ||||
| -rw-r--r-- | src/routes/(app)/nsec/+server.ts | 7 | ||||
| -rw-r--r-- | src/routes/(app)/settings/nostr/+page.svelte | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts index 69e21286..2e993f9d 100644 --- a/src/lib/nostr.ts +++ b/src/lib/nostr.ts @@ -75,8 +75,13 @@ export const getPrivateKey = async (user: User): Promise<Uint8Array> => { // /me no longer returns the encrypted key; /login decrypts it into the // sk cookie instead. user.nsec is only present on a fresh login response. + // Sessions without either (nostr or older logins) fetch it with the + // password. const sk = browser && cookies.get("sk"); - const { nsec } = user; + let { nsec } = user; + + if (!sk && !nsec && user.hasnsec) + ({ nsec } = await post("/nsec", { password: await getPassword() })); if (sk) { k = hexToBytes(sk); diff --git a/src/routes/(app)/nsec/+server.ts b/src/routes/(app)/nsec/+server.ts new file mode 100644 index 00000000..ceead0d5 --- /dev/null +++ b/src/routes/(app)/nsec/+server.ts @@ -0,0 +1,7 @@ +import { json } from "@sveltejs/kit"; +import { auth, post } from "$lib/utils"; + +export async function POST({ cookies, request }) { + const result = await post("/nsec", await request.json(), auth(cookies)); + return json(result); +} diff --git a/src/routes/(app)/settings/nostr/+page.svelte b/src/routes/(app)/settings/nostr/+page.svelte index 4ce153e4..3fe6e445 100644 --- a/src/routes/(app)/settings/nostr/+page.svelte +++ b/src/routes/(app)/settings/nostr/+page.svelte @@ -268,7 +268,7 @@ {/if} </div> -{#if user.hasnsec} +{#if user.hasnsec || user.nsec} <div class="space-y-2"> <label for="seedphrase" class="font-bold" >{$t("user.settings.nostrKeys")}</label |