suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TS: add declaration for verify with CleartextMessage input (#1640)

Browse Source 
Also, make `VerifyMessageResult` generic. This change should be backwards
compatible since a default type is set.
This commit is contained in:
larabr 2023-05-15 16:21:05 +02:00 committed by GitHub
parent 29d2b701c9
commit 1eb0b42387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openpgp.d.ts vendored
View File

@ -228,18 +228,17 @@ export function decrypt<T extends MaybeStream<Data>>(options: DecryptOptions & {
string string
}>; }>;
export function verify<T extends MaybeStream<Data>>(options: VerifyOptions & { message: Message<T>, format: 'binary' }): Promise<VerifyMessageResult & { export function verify(options: VerifyOptions & { message: CleartextMessage, format?: 'utf8' }): Promise<VerifyMessageResult<string>>;
data: export function verify<T extends MaybeStream<Data>>(options: VerifyOptions & { message: Message<T>, format: 'binary' }): Promise<VerifyMessageResult<
T extends WebStream<infer X> ? WebStream<Uint8Array> : T extends WebStream<infer X> ? WebStream<Uint8Array> :
T extends NodeStream<infer X> ? NodeStream<Uint8Array> : T extends NodeStream<infer X> ? NodeStream<Uint8Array> :
Uint8Array Uint8Array
}>; >>;
export function verify<T extends MaybeStream<Data>>(options: VerifyOptions & { message: Message<T> }): Promise<VerifyMessageResult & { export function verify<T extends MaybeStream<Data>>(options: VerifyOptions & { message: Message<T> }): Promise<VerifyMessageResult<
data:
T extends WebStream<infer X> ? WebStream<string> : T extends WebStream<infer X> ? WebStream<string> :
T extends NodeStream<infer X> ? NodeStream<string> : T extends NodeStream<infer X> ? NodeStream<string> :
string string
}>; >>;
/** Class that represents an OpenPGP message. Can be an encrypted message, signed message, compressed message or literal message /** Class that represents an OpenPGP message. Can be an encrypted message, signed message, compressed message or literal message
*/ */
@ -721,8 +720,8 @@ interface DecryptMessageResult {
filename: string; filename: string;
} }
interface VerifyMessageResult { interface VerifyMessageResult<T extends MaybeStream<Data> = MaybeStream<Data>> {
data: MaybeStream<Data>; data: T;
signatures: VerificationResult[]; signatures: VerificationResult[];
} }

6
test/typescript/definitions.ts
View File

@ -113,6 +113,12 @@ import {
// Sign cleartext message (armored) // Sign cleartext message (armored)
const cleartextMessage = await createCleartextMessage({ text: 'hello' }); const cleartextMessage = await createCleartextMessage({ text: 'hello' });
const verificationResult = await verify({ message: cleartextMessage, verificationKeys: publicKey });
const verifiedCleartextData: string = verificationResult.data;
expect(verifiedCleartextData).to.equal(cleartextMessage.getText());
// @ts-expect-error Binary output not available for cleartext messages
try { await verify({ message: cleartextMessage, verificationKeys: publicKey, format: 'binary' }) } catch (e) {}
const clearSignedArmor = await sign({ signingKeys: privateKeys, message: cleartextMessage }); const clearSignedArmor = await sign({ signingKeys: privateKeys, message: cleartextMessage });
expect(clearSignedArmor).to.include('-----BEGIN PGP SIGNED MESSAGE-----'); expect(clearSignedArmor).to.include('-----BEGIN PGP SIGNED MESSAGE-----');
const clearSignedObject: CleartextMessage = await sign({ signingKeys: privateKeys, message: cleartextMessage, format: 'object' }); const clearSignedObject: CleartextMessage = await sign({ signingKeys: privateKeys, message: cleartextMessage, format: 'object' });