moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dont-encrypt-settings' into 'main' 

Don't encrypt settings_store

See merge request soapbox-pub/ditto!321
This commit is contained in:
Alex Gleason 2024-05-26 17:37:09 +00:00
parent d6727d2d09 a66df583fb
commit 3f9908449b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/controllers/api/accounts.ts
View File

@ -66,8 +66,11 @@ const verifyCredentialsController: AppController = async (c) => {
: await accountFromPubkey(pubkey, { withSource: true }); : await accountFromPubkey(pubkey, { withSource: true });
if (settingsStore) { if (settingsStore) {
const data = await signer.nip44!.decrypt(pubkey, settingsStore.content); try {
account.pleroma.settings_store = JSON.parse(data); account.pleroma.settings_store = JSON.parse(settingsStore.content);
} catch {
// Ignore
}
} }
return c.json(account); return c.json(account);
@ -288,7 +291,7 @@ const updateCredentialsController: AppController = async (c) => {
await createEvent({ await createEvent({
kind: 30078, kind: 30078,
tags: [['d', 'pub.ditto.pleroma_settings_store']], tags: [['d', 'pub.ditto.pleroma_settings_store']],
content: await signer.nip44!.encrypt(pubkey, JSON.stringify(settingsStore)), content: JSON.stringify(settingsStore),
}, c); }, c);
} }