marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 19:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved types for readCertificatesFromOptions

Browse Source
This commit is contained in:
Alexander Cerutti
2019-12-12 23:04:15 +01:00
parent 54865f537b
commit 5bae211316
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/parser.ts
View File

@@ -231,6 +231,8 @@ export function getModelBufferContents(model: BundleUnit): PartitionedBundle {
* @param options * @param options
*/ */
type flatCertificates = Omit<Certificates, "signerKey"> & { signerKey: string; [key: string]: string };
export async function readCertificatesFromOptions(options: Certificates): Promise<FinalCertificates> { export async function readCertificatesFromOptions(options: Certificates): Promise<FinalCertificates> {
if (!(options && Object.keys(options).length && isValid(options, "certificatesSchema"))) { if (!(options && Object.keys(options).length && isValid(options, "certificatesSchema"))) {
throw new Error(formatMessage("CP_NO_CERTS")); throw new Error(formatMessage("CP_NO_CERTS"));
@@ -240,11 +242,13 @@ export async function readCertificatesFromOptions(options: Certificates): Promis
// all the real contents and don't care of passphrase // all the real contents and don't care of passphrase
const flattenedDocs = Object.assign({}, options, { const flattenedDocs = Object.assign({}, options, {
signerKey: ( signerKey: (
typeof options.signerKey === "string" options.signerKey && typeof options.signerKey === "string" &&
? options.signerKey options.signerKey || (
: options.signerKey.keyFile options.signerKey &&
options.signerKey.keyFile
) )
}); )
}) as flatCertificates;
// We read the contents // We read the contents
const rawContentsPromises = Object.keys(flattenedDocs) const rawContentsPromises = Object.keys(flattenedDocs)