Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions extension/js/common/api/shared/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,7 @@ export class Api {
}

/** @deprecated should use ajax() */
public static async ajaxWithJquery<T extends ResFmt, RT = unknown>(
req: Ajax,
resFmt: T,
formattedData: FormData | string | undefined = undefined
): Promise<FetchResult<T, RT>> {
public static async ajaxWithJquery<T extends ResFmt, RT = unknown>(req: Ajax, resFmt: T, formattedData?: FormData | string): Promise<FetchResult<T, RT>> {
let data: BodyInit | undefined = formattedData;
const headersInit: Dict<string> = req.headers ?? {};

Expand Down
9 changes: 2 additions & 7 deletions extension/js/common/core/crypto/pgp/openpgp-key.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,8 @@ export class OpenPGPKey {
throw new Error('Key does not have a fingerprint and cannot be parsed.');
}
const algoInfo = opgpKey.keyPacket.getAlgorithmInfo();
const {
encryptionKey = undefined,
encryptionKeyIgnoringExpiration = undefined,
signingKey = undefined,
signingKeyIgnoringExpiration = undefined,
expiration = undefined,
} = await OpenPGPKey.getSigningAndEncryptionKeys(opgpKey);
const { encryptionKey, encryptionKeyIgnoringExpiration, signingKey, signingKeyIgnoringExpiration, expiration } =
await OpenPGPKey.getSigningAndEncryptionKeys(opgpKey);
const missingPrivateKeyForSigning = signingKeyIgnoringExpiration?.keyPacket
? OpenPGPKey.arePrivateParamsMissing(signingKeyIgnoringExpiration.keyPacket)
: false;
Expand Down
Loading
Loading