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

Merge branch 'rm-x-nostr-sign' into 'main' 

Remove X-Nostr-Sign header support

See merge request soapbox-pub/ditto!132
This commit is contained in:
Alex Gleason 2024-04-05 22:42:31 +00:00
parent 4b2b658685 55ba4a3a9b
commit 8801debb1a
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/signers/APISigner.ts
View File

@ -12,7 +12,7 @@ import { createAdminEvent } from '@/utils/api.ts';
* Sign Nostr event using the app context. * Sign Nostr event using the app context.
* *
* - If a secret key is provided, it will be used to sign the event. * - If a secret key is provided, it will be used to sign the event.
* - If `X-Nostr-Sign` is passed, it will use NIP-46 to sign the event. * - Otherwise, it will use NIP-46 to sign the event.
*/ */
export class APISigner implements NostrSigner { export class APISigner implements NostrSigner {
#c: AppContext; #c: AppContext;
@ -34,23 +34,16 @@ export class APISigner implements NostrSigner {
async signEvent(event: Omit<NostrEvent, 'id' | 'pubkey' | 'sig'>): Promise<NostrEvent> { async signEvent(event: Omit<NostrEvent, 'id' | 'pubkey' | 'sig'>): Promise<NostrEvent> {
const seckey = this.#c.get('seckey'); const seckey = this.#c.get('seckey');
const header = this.#c.req.header('x-nostr-sign');
if (seckey) { if (seckey) {
this.#console.debug(`Signing Event<${event.kind}> with secret key`); this.#console.debug(`Signing Event<${event.kind}> with secret key`);
return new NSecSigner(seckey).signEvent(event); return new NSecSigner(seckey).signEvent(event);
} }
if (header) {
this.#console.debug(`Signing Event<${event.kind}> with NIP-46`); this.#console.debug(`Signing Event<${event.kind}> with NIP-46`);
return await this.#signNostrConnect(event); return await this.#signNostrConnect(event);
} }
throw new HTTPException(400, {
res: this.#c.json({ id: 'ditto.sign', error: 'Unable to sign event' }, 400),
});
}
/** Sign event with NIP-46, waiting in the background for the signed event. */ /** Sign event with NIP-46, waiting in the background for the signed event. */
async #signNostrConnect(event: Omit<NostrEvent, 'id' | 'pubkey' | 'sig'>): Promise<NostrEvent> { async #signNostrConnect(event: Omit<NostrEvent, 'id' | 'pubkey' | 'sig'>): Promise<NostrEvent> {
const pubkey = this.#c.get('pubkey'); const pubkey = this.#c.get('pubkey');